From: villberg <villberg@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Wed, 25 Jun 2014 08:42:20 +0000 (+0000)
Subject: refs #5019
X-Git-Tag: v1.29.0~256
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=dfa99c2bcb012dc73ba2a5a9c89adc313508077d;p=simantics%2Fsysdyn.git

refs #5019

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@29733 ac1ea38d-2e2b-0410-8846-a27921b304fc
---

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/NodeClass.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/NodeClass.java
index 532c053a..8d2e49a0 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/NodeClass.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/NodeClass.java
@@ -33,6 +33,7 @@ public enum NodeClass {
 	subscript_2,
 	component_clause,
 	component_declaration,
+	component_list,
 	array_subscripts,
 	declaration,
 	class_definition,
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Parser.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Parser.java
index 5bc59bce..e2c722d7 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Parser.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Parser.java
@@ -257,9 +257,20 @@ public class Parser {
 			IExpression[] subscripts = (third instanceof IExpression[])? (IExpression[])third : null;
 			int declarationStart = (third instanceof IExpression[]) ? 3 : 2;
 			ArrayList<Object> clauses = new ArrayList<Object>();
-			for(int i=declarationStart;i<n.jjtGetNumChildren();i++) {
+			
+			ArrayList<Declaration> declarations2 = new ArrayList<Declaration>();
+			if(third instanceof ArrayList) {
+				ArrayList<Declaration> decls = (ArrayList<Declaration>)third;
+				declarations2.addAll(decls);
+			} else {
+				for(int i=declarationStart;i<n.jjtGetNumChildren();i++) {
+					Declaration decl = (Declaration)walk((SimpleNode)n.jjtGetChild(i), indent+2, frame);
+					declarations2.add(decl);
+				}
+			}
+			
+			for(Declaration decl : declarations2) {
 				
-				Declaration decl = (Declaration)walk((SimpleNode)n.jjtGetChild(i), indent+2, frame);
 				if(subscripts != null)
 					decl.variable.subscripts = subscripts;
 				
@@ -299,6 +310,16 @@ public class Parser {
 				}
 			}
 			return clauses;
+		case component_list:
+			if(n.jjtGetNumChildren() == 1)
+				return walk((SimpleNode)n.jjtGetChild(0), indent+2, frame);
+			else {
+				ArrayList<Declaration> result = new ArrayList<Declaration>();
+				for(int i=0;i<n.jjtGetNumChildren();i++) {
+					result.add((Declaration)walk((SimpleNode)n.jjtGetChild(i),indent+2, frame));
+				}
+				return result;
+			}
 		case component_declaration:
 			return (Declaration)walk((SimpleNode)n.jjtGetChild(0), indent+2, frame);
 		case array_subscripts: