[parser] Improve handling of multiple interfaces in implements statement

fixes #324

ChangeLog

@@ -11,6 +11,11 @@
     * Fixed aspect parsing issue for Java 8 array constructor references.
     See https://bitbucket.org/jastadd/jastadd2/issues/323/parsing-of-array-constructor-references
 
+2020-05-08  Idriss Riouak <idriss.riouak@cs.lth.se>
+
+    * Improve parsing of multiple interfaces in implements statement.
+    See https://bitbucket.org/jastadd/jastadd2/issues/324/parsing-after-implements
+
 2019-11-29  Jesper Öqvist <jesper.oqvist@cs.lth.se>
 
     * Deprecated some old options: lazyMaps, private, traceVisitCheck,

src/javacc/jrag/Jrag.jjt

@@ -1434,20 +1434,15 @@ void CollectionContribution():
 
 void AspectAddInterface() :
 {
-  Token first, last;
   Token targetName;
-  SimpleNode nameList;
+  SimpleNode name;
 }
 {
-  targetName = <IDENTIFIER> { first = token; }
+  targetName = <IDENTIFIER>
   "implements"
-  nameList = TypeNameList()
+  name = ClassOrInterfaceType(){ root.addInterface(name, targetName.image, fileName); }
+  ( "," name = ClassOrInterfaceType() { root.addInterface(name, targetName.image, fileName); } )*
   ";"
-  {
-    last = token;
-    root.addInterface(nameList, targetName.image, fileName);
-  }
-
 }
 
 void AspectExtendInterface() :