Wrap lists with constructor if a constructor is defined in production…

… in JSGLR2 imploding
metaborg · Jun 18, 2018 · be4d632 · be4d632
1 parent d62e39f
commit be4d632
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/org.spoofax.jsglr2/src/main/java/org/spoofax/jsglr2/imploder/TokenizedTreeImploder.java b/org.spoofax.jsglr2/src/main/java/org/spoofax/jsglr2/imploder/TokenizedTreeImploder.java
@@ -154,9 +154,14 @@ protected Tree createContextFreeTerm(IProduction production, List<Tree> childAST
         IToken rightToken) {
         String constructor = production.constructor();
 
-        if(production.isList())
+        if(production.isList()) {
-            return treeFactory.createList(production.sort(), childASTs, leftToken, rightToken);
+        	Tree list = treeFactory.createList(production.sort(), childASTs, leftToken, rightToken);
-        else if(production.isOptional())
+
+        	if(constructor == null)
+        		return list;
+        	else
+        		return treeFactory.createNonTerminal(production.sort(), constructor, Arrays.asList(list), leftToken, rightToken);
+        } else if(production.isOptional())
             return treeFactory.createOptional(production.sort(), childASTs, leftToken, rightToken);
         else if(constructor != null)
             return treeFactory.createNonTerminal(production.sort(), constructor, childASTs, leftToken, rightToken);