From: miettinen <miettinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 28 Feb 2013 07:16:46 +0000 (+0000)
Subject: Added the compiled ModelParser java files (refs #4064)
X-Git-Tag: simantics-1.10.1~18
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=80a79ab5b5182518e802d32520447ea1c0888b13;p=simantics%2Fsysdyn.git

Added the compiled ModelParser java files (refs #4064)

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

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelParser.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelParser.java
index c61ea3fb..ee3f2c7c 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelParser.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelParser.java
@@ -1,8 +1,44 @@
 /* Generated By:JavaCC: Do not edit this line. ModelParser.java */
 package org.simantics.sysdyn.modelParser;
 
+import java.util.ArrayList;
+
 public class ModelParser implements ModelParserConstants {
 
+  private ArrayList<Parameter> inputs = new ArrayList<Parameter>();
+  private ArrayList<Parameter> outputs = new ArrayList<Parameter>();
+
+  private enum InterfaceVariableType
+  {
+    INPUT, OUTPUT, OTHER
+  }
+
+  public class Parameter
+  {
+    public String name;
+    public boolean optional;
+    public String description;
+    public String type;
+
+    public Parameter()
+    {
+      name = new String("");
+      optional = false;
+      description = null;
+      type = null;
+    }
+  }
+
+  public ArrayList<Parameter> getInputs()
+  {
+    return inputs;
+  }
+
+  public ArrayList<Parameter> getOutputs()
+  {
+    return outputs;
+  }
+
 /*** Parser ********************************************************/
 
 // https://javacc.dev.java.net/doc/javaccgrm.html
@@ -690,9 +726,12 @@ public class ModelParser implements ModelParserConstants {
 
 /*** Component Clause **********************************************/
   final public void component_clause() throws ParseException {
-                            boolean isInput = false;
-    isInput = type_prefix();
-    type_specifier();
+    InterfaceVariableType ioType = InterfaceVariableType.OTHER;
+    String typeSpecifier = "";
+    //String arraySubscripts = null;
+    ArrayList<Parameter> componentList = new ArrayList<Parameter>();
+    ioType = type_prefix();
+    typeSpecifier = type_specifier();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case 66:
       array_subscripts();
@@ -701,11 +740,22 @@ public class ModelParser implements ModelParserConstants {
       jj_la1[39] = jj_gen;
       ;
     }
-    component_list(isInput);
+    componentList = component_list();
+        if (ioType == InterfaceVariableType.INPUT) {
+            for (Parameter input : componentList) {
+                input.type = typeSpecifier;
+                inputs.add(input);
+            }
+        } else if (ioType == InterfaceVariableType.OUTPUT) {
+            for (Parameter output : componentList) {
+                output.type = typeSpecifier;
+                outputs.add(output);
+            }
+        }
   }
 
-  final public boolean type_prefix() throws ParseException {
-                          boolean isInput = false;
+  final public InterfaceVariableType type_prefix() throws ParseException {
+    InterfaceVariableType type = InterfaceVariableType.OTHER;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case 16:
     case 23:
@@ -756,10 +806,11 @@ public class ModelParser implements ModelParserConstants {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case 32:
         jj_consume_token(32);
+                 type = InterfaceVariableType.OUTPUT;
         break;
       case 56:
         jj_consume_token(56);
-                               isInput = true;
+                    type = InterfaceVariableType.INPUT;
         break;
       default:
         jj_la1[44] = jj_gen;
@@ -771,16 +822,23 @@ public class ModelParser implements ModelParserConstants {
       jj_la1[45] = jj_gen;
       ;
     }
-                {if (true) return isInput;}
+        {if (true) return type;}
     throw new Error("Missing return statement in function");
   }
 
-  final public void type_specifier() throws ParseException {
-    name();
+  final public String type_specifier() throws ParseException {
+    String ret = new String("");
+    ret = name();
+        {if (true) return ret;}
+    throw new Error("Missing return statement in function");
   }
 
-  final public void component_list(boolean isInput) throws ParseException {
-    component_declaration(isInput);
+  final public ArrayList<Parameter> component_list() throws ParseException {
+    ArrayList<Parameter> ret = new ArrayList<Parameter>();
+    Parameter temp;
+    //	component_declaration { "," component_declaration }
+            temp = component_declaration();
+                                         ret.add(temp);
     label_6:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -792,12 +850,18 @@ public class ModelParser implements ModelParserConstants {
         break label_6;
       }
       jj_consume_token(71);
-      component_declaration(isInput);
+      temp = component_declaration();
+                                           ret.add(temp);
     }
+            {if (true) return ret;}
+    throw new Error("Missing return statement in function");
   }
 
-  final public void component_declaration(boolean isInput) throws ParseException {
-    declaration(isInput);
+  final public Parameter component_declaration() throws ParseException {
+    Parameter ret;
+    String temp = "";
+    //	declaration [ conditional_attribute ] comment
+            ret = declaration();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case 31:
       conditional_attribute();
@@ -806,7 +870,9 @@ public class ModelParser implements ModelParserConstants {
       jj_la1[47] = jj_gen;
       ;
     }
-    comment();
+    ret.description = comment();
+        {if (true) return ret;}
+    throw new Error("Missing return statement in function");
   }
 
   final public void conditional_attribute() throws ParseException {
@@ -814,10 +880,11 @@ public class ModelParser implements ModelParserConstants {
     expression();
   }
 
-  final public void declaration(boolean isInput) throws ParseException {
-                                      String input_variable = null;
+  final public Parameter declaration() throws ParseException {
+    // Parameter here without comment yet.
+    Parameter ret = new Parameter();
     jj_consume_token(IDENT);
-                  if (isInput) input_variable = new String(token.image);
+                  ret.name = new String(token.image);
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case 66:
       array_subscripts();
@@ -830,21 +897,19 @@ public class ModelParser implements ModelParserConstants {
     case 62:
     case 88:
     case 89:
-      modification();
-                           input_variable = null;
+      ret.optional = modification();
       break;
     default:
       jj_la1[49] = jj_gen;
       ;
     }
-                if (input_variable != null)
-                {
-                  //System.out.println("collect: " + input_variable);
-                }
+                {if (true) return ret;}
+    throw new Error("Missing return statement in function");
   }
 
 /*** Modification **********************************************/
-  final public void modification() throws ParseException {
+  final public boolean modification() throws ParseException {
+    boolean optional = false;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case 62:
       class_modification();
@@ -861,16 +926,20 @@ public class ModelParser implements ModelParserConstants {
     case 88:
       jj_consume_token(88);
       expression();
+                             optional = true;
       break;
     case 89:
       jj_consume_token(89);
       expression();
+                              optional = true;
       break;
     default:
       jj_la1[51] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+            {if (true) return optional;}
+    throw new Error("Missing return statement in function");
   }
 
   final public void class_modification() throws ParseException {
@@ -1112,7 +1181,7 @@ public class ModelParser implements ModelParserConstants {
   }
 
   final public void component_declaration1() throws ParseException {
-    declaration(false);
+    declaration();
     comment();
   }
 
@@ -2220,16 +2289,19 @@ public class ModelParser implements ModelParserConstants {
     }
   }
 
-  final public void name() throws ParseException {
+  final public String name() throws ParseException {
+    String ret = new String("");
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case 68:
       jj_consume_token(68);
+                ret += ".";
       break;
     default:
       jj_la1[115] = jj_gen;
       ;
     }
     jj_consume_token(IDENT);
+                     ret += token.image;
     label_35:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2241,8 +2313,12 @@ public class ModelParser implements ModelParserConstants {
         break label_35;
       }
       jj_consume_token(68);
+                   ret += ".";
       jj_consume_token(IDENT);
+                     ret += token.image;
     }
+        {if (true) return ret;}
+    throw new Error("Missing return statement in function");
   }
 
   final public void component_reference() throws ParseException {
@@ -2510,8 +2586,10 @@ public class ModelParser implements ModelParserConstants {
     }
   }
 
-  final public void comment() throws ParseException {
-    string_comment();
+  final public String comment() throws ParseException {
+    String ret;
+    //	string_comment [ annotation ]
+            ret = string_comment();
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case 14:
       annotation();
@@ -2520,12 +2598,16 @@ public class ModelParser implements ModelParserConstants {
       jj_la1[132] = jj_gen;
       ;
     }
+            {if (true) return ret;}
+    throw new Error("Missing return statement in function");
   }
 
-  final public void string_comment() throws ParseException {
+  final public String string_comment() throws ParseException {
+    String ret = null;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case STRING:
       jj_consume_token(STRING);
+                     ret = new String(token.image);
       label_40:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2537,13 +2619,17 @@ public class ModelParser implements ModelParserConstants {
           break label_40;
         }
         jj_consume_token(78);
+                    ret += "+";
         jj_consume_token(STRING);
+                           ret += token.image;
       }
       break;
     default:
       jj_la1[134] = jj_gen;
       ;
     }
+            {if (true) return ret;}
+    throw new Error("Missing return statement in function");
   }
 
   final public void annotation() throws ParseException {
@@ -2614,276 +2700,153 @@ public class ModelParser implements ModelParserConstants {
     finally { jj_save(8, xla); }
   }
 
-  private boolean jj_3R_72() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(8)) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(11)) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(51)) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(27)) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_77()) {
-    jj_scanpos = xsp;
-    if (jj_3R_78()) return true;
-    }
-    return false;
-  }
-
-  private boolean jj_3R_71() {
-    if (jj_3R_76()) return true;
+  private boolean jj_3R_51() {
+    if (jj_3R_63()) return true;
     return false;
   }
 
-  private boolean jj_3R_64() {
+  private boolean jj_3R_41() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_70()) {
-    jj_scanpos = xsp;
-    if (jj_3R_71()) {
-    jj_scanpos = xsp;
-    if (jj_3R_72()) return true;
-    }
-    }
+    if (jj_3R_48()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_70() {
-    if (jj_3R_75()) return true;
+  private boolean jj_3R_50() {
+    if (jj_scan_token(59)) return true;
     return false;
   }
 
-  private boolean jj_3R_93() {
+  private boolean jj_3R_49() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(78)) {
+    if (jj_3_5()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(79)) {
+    if (jj_3R_60()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(80)) {
+    if (jj_3R_61()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(81)) return true;
+    if (jj_3R_62()) return true;
     }
     }
     }
     return false;
   }
 
-  private boolean jj_3R_74() {
-    if (jj_scan_token(9)) return true;
-    if (jj_3R_73()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_86() {
-    if (jj_3R_93()) return true;
+  private boolean jj_3_5() {
+    if (jj_scan_token(57)) return true;
+    if (jj_3R_43()) return true;
     return false;
   }
 
-  private boolean jj_3R_82() {
+  private boolean jj_3R_42() {
+    if (jj_3R_43()) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_86()) jj_scanpos = xsp;
-    if (jj_3R_87()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_88()) { jj_scanpos = xsp; break; }
+      if (jj_3R_49()) { jj_scanpos = xsp; break; }
     }
-    return false;
-  }
-
-  private boolean jj_3R_89() {
-    Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(72)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(73)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(74)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(75)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(76)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(77)) return true;
-    }
-    }
-    }
-    }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_54() {
-    if (jj_scan_token(69)) return true;
-    if (jj_3R_53()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_66() {
-    if (jj_scan_token(22)) return true;
-    if (jj_3R_65()) return true;
+    if (jj_3R_50()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_51()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_52() {
-    if (jj_3R_64()) return true;
+  private boolean jj_3R_126() {
+    if (jj_3R_45()) return true;
     return false;
   }
 
-  private boolean jj_3_7() {
-    if (jj_3R_44()) return true;
-    if (jj_scan_token(88)) return true;
+  private boolean jj_3R_130() {
     if (jj_3R_45()) return true;
     return false;
   }
 
-  private boolean jj_3R_79() {
-    if (jj_3R_82()) return true;
+  private boolean jj_3R_122() {
+    if (jj_scan_token(71)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_83()) jj_scanpos = xsp;
+    if (jj_3R_126()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_43() {
+  private boolean jj_3R_128() {
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_52()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_scan_token(69)) {
+    jj_scanpos = xsp;
+    if (jj_3R_130()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_73() {
+  private boolean jj_3R_91() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(12)) jj_scanpos = xsp;
-    if (jj_3R_79()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_65() {
-    if (jj_3R_73()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_74()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(50)) jj_scanpos = xsp;
+    if (jj_scan_token(44)) return true;
     return false;
   }
 
-  private boolean jj_3R_69() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(46)) jj_scanpos = xsp;
-    if (jj_scan_token(4)) return true;
+  private boolean jj_3R_123() {
+    if (jj_scan_token(71)) return true;
     return false;
   }
 
-  private boolean jj_3R_53() {
-    if (jj_3R_65()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_66()) { jj_scanpos = xsp; break; }
-    }
+  private boolean jj_3R_125() {
+    if (jj_scan_token(66)) return true;
+    if (jj_3R_128()) return true;
     return false;
   }
 
-  private boolean jj_3R_51() {
-    if (jj_3R_63()) return true;
+  private boolean jj_3R_120() {
+    if (jj_scan_token(68)) return true;
+    if (jj_scan_token(IDENT)) return true;
     return false;
   }
 
-  private boolean jj_3R_50() {
-    if (jj_scan_token(59)) return true;
+  private boolean jj_3R_58() {
+    if (jj_scan_token(71)) return true;
     return false;
   }
 
-  private boolean jj_3R_49() {
+  private boolean jj_3R_47() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3_5()) {
-    jj_scanpos = xsp;
-    if (jj_3R_60()) {
-    jj_scanpos = xsp;
-    if (jj_3R_61()) {
+    if (jj_3R_58()) {
     jj_scanpos = xsp;
-    if (jj_3R_62()) return true;
-    }
-    }
+    if (jj_3R_59()) return true;
     }
     return false;
   }
 
-  private boolean jj_3_5() {
-    if (jj_scan_token(57)) return true;
-    if (jj_3R_43()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_68() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(46)) jj_scanpos = xsp;
-    if (jj_scan_token(45)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_44() {
-    if (jj_3R_53()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_54()) jj_scanpos = xsp;
+  private boolean jj_3R_121() {
+    if (jj_3R_45()) return true;
     return false;
   }
 
-  private boolean jj_3R_42() {
-    if (jj_3R_43()) return true;
+  private boolean jj_3R_115() {
+    if (jj_3R_45()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_49()) { jj_scanpos = xsp; break; }
+      if (jj_3R_123()) { jj_scanpos = xsp; break; }
     }
-    xsp = jj_scanpos;
-    if (jj_3R_50()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_51()) jj_scanpos = xsp;
-    return false;
-  }
-
-  private boolean jj_3R_56() {
-    if (jj_scan_token(31)) return true;
-    if (jj_3R_45()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_55() {
-    if (jj_3R_44()) return true;
     return false;
   }
 
-  private boolean jj_3R_45() {
+  private boolean jj_3R_114() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_55()) {
-    jj_scanpos = xsp;
-    if (jj_3R_56()) return true;
+    if (jj_3R_121()) jj_scanpos = xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_122()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_90() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(50)) jj_scanpos = xsp;
-    if (jj_scan_token(44)) return true;
-    return false;
-  }
-
   private boolean jj_3_4() {
     if (jj_scan_token(IDENT)) return true;
     if (jj_scan_token(88)) return true;
@@ -2898,6 +2861,12 @@ public class ModelParser implements ModelParserConstants {
     return false;
   }
 
+  private boolean jj_3R_129() {
+    if (jj_scan_token(IDENT)) return true;
+    if (jj_scan_token(88)) return true;
+    return false;
+  }
+
   private boolean jj_3_2() {
     if (jj_scan_token(IDENT)) return true;
     if (jj_scan_token(88)) return true;
@@ -2912,39 +2881,59 @@ public class ModelParser implements ModelParserConstants {
     return false;
   }
 
-  private boolean jj_3R_59() {
-    if (jj_scan_token(21)) return true;
+  private boolean jj_3R_127() {
+    if (jj_3R_129()) return true;
     return false;
   }
 
-  private boolean jj_3R_63() {
-    if (jj_scan_token(14)) return true;
+  private boolean jj_3R_119() {
+    if (jj_3R_125()) return true;
     return false;
   }
 
-  private boolean jj_3R_48() {
-    if (jj_scan_token(STRING)) return true;
+  private boolean jj_3R_124() {
+    if (jj_3R_127()) return true;
     return false;
   }
 
-  private boolean jj_3R_41() {
+  private boolean jj_3R_111() {
+    if (jj_3R_57()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_117() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_48()) jj_scanpos = xsp;
+    if (jj_3_9()) {
+    jj_scanpos = xsp;
+    if (jj_3R_124()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_128() {
+  private boolean jj_3_9() {
     if (jj_3R_45()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_47()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_124() {
-    if (jj_3R_45()) return true;
+  private boolean jj_3R_118() {
+    if (jj_3R_117()) return true;
     return false;
   }
 
-  private boolean jj_3R_84() {
+  private boolean jj_3R_112() {
+    if (jj_scan_token(62)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_118()) jj_scanpos = xsp;
+    if (jj_scan_token(63)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_85() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(30)) jj_scanpos = xsp;
@@ -2959,7 +2948,7 @@ public class ModelParser implements ModelParserConstants {
     jj_scanpos = xsp;
     if (jj_scan_token(24)) {
     jj_scanpos = xsp;
-    if (jj_3R_90()) {
+    if (jj_3R_91()) {
     jj_scanpos = xsp;
     if (jj_scan_token(38)) {
     jj_scanpos = xsp;
@@ -2985,191 +2974,191 @@ public class ModelParser implements ModelParserConstants {
     return false;
   }
 
-  private boolean jj_3R_120() {
-    if (jj_scan_token(71)) return true;
+  private boolean jj_3R_113() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_124()) jj_scanpos = xsp;
-    return false;
-  }
-
-  private boolean jj_3R_126() {
-    Token xsp;
+    if (jj_scan_token(68)) jj_scanpos = xsp;
+    if (jj_scan_token(IDENT)) return true;
     xsp = jj_scanpos;
-    if (jj_scan_token(69)) {
-    jj_scanpos = xsp;
-    if (jj_3R_128()) return true;
+    if (jj_3R_119()) jj_scanpos = xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_120()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_121() {
-    if (jj_scan_token(71)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_123() {
-    if (jj_scan_token(66)) return true;
-    if (jj_3R_126()) return true;
+  private boolean jj_3R_116() {
+    if (jj_scan_token(70)) return true;
     return false;
   }
 
-  private boolean jj_3R_118() {
+  private boolean jj_3R_68() {
     if (jj_scan_token(68)) return true;
     if (jj_scan_token(IDENT)) return true;
     return false;
   }
 
-  private boolean jj_3R_58() {
-    if (jj_scan_token(71)) return true;
+  private boolean jj_3R_67() {
+    if (jj_scan_token(68)) return true;
     return false;
   }
 
-  private boolean jj_3R_47() {
+  private boolean jj_3R_57() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_58()) {
-    jj_scanpos = xsp;
-    if (jj_3R_59()) return true;
+    if (jj_3R_67()) jj_scanpos = xsp;
+    if (jj_scan_token(IDENT)) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_68()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_119() {
-    if (jj_3R_45()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_113() {
-    if (jj_3R_45()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_121()) { jj_scanpos = xsp; break; }
-    }
+  private boolean jj_3R_46() {
+    if (jj_3R_57()) return true;
     return false;
   }
 
-  private boolean jj_3R_112() {
+  private boolean jj_3_8() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_119()) jj_scanpos = xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_120()) { jj_scanpos = xsp; break; }
+    if (jj_3R_46()) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(58)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(46)) return true;
     }
+    }
+    if (jj_scan_token(62)) return true;
     return false;
   }
 
-  private boolean jj_3R_127() {
-    if (jj_scan_token(IDENT)) return true;
-    if (jj_scan_token(88)) return true;
+  private boolean jj_3R_110() {
+    if (jj_scan_token(87)) return true;
+    if (jj_3R_100()) return true;
     return false;
   }
 
-  private boolean jj_3R_109() {
+  private boolean jj_3R_93() {
     if (jj_3R_57()) return true;
     return false;
   }
 
-  private boolean jj_3R_125() {
-    if (jj_3R_127()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_117() {
-    if (jj_3R_123()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_122() {
-    if (jj_3R_125()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_115() {
+  private boolean jj_3R_101() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3_9()) {
+    if (jj_scan_token(86)) {
     jj_scanpos = xsp;
-    if (jj_3R_122()) return true;
+    if (jj_3R_110()) return true;
     }
     return false;
   }
 
-  private boolean jj_3_9() {
-    if (jj_3R_45()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_47()) jj_scanpos = xsp;
-    return false;
-  }
-
-  private boolean jj_3R_62() {
-    if (jj_3R_69()) return true;
+  private boolean jj_3R_109() {
+    if (jj_scan_token(64)) return true;
+    if (jj_3R_117()) return true;
+    if (jj_scan_token(65)) return true;
     return false;
   }
 
-  private boolean jj_3R_67() {
-    if (jj_scan_token(68)) return true;
-    if (jj_scan_token(IDENT)) return true;
+  private boolean jj_3R_104() {
+    if (jj_scan_token(56)) return true;
     return false;
   }
 
-  private boolean jj_3R_116() {
+  private boolean jj_3R_108() {
+    if (jj_scan_token(66)) return true;
     if (jj_3R_115()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_116()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(67)) return true;
     return false;
   }
 
-  private boolean jj_3R_102() {
-    if (jj_scan_token(56)) return true;
+  private boolean jj_3R_107() {
+    if (jj_scan_token(62)) return true;
+    if (jj_3R_114()) return true;
+    if (jj_scan_token(63)) return true;
     return false;
   }
 
-  private boolean jj_3R_114() {
-    if (jj_scan_token(70)) return true;
+  private boolean jj_3R_105() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_111()) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(58)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(46)) return true;
+    }
+    }
+    if (jj_3R_112()) return true;
     return false;
   }
 
-  private boolean jj_3R_110() {
-    if (jj_scan_token(62)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_116()) jj_scanpos = xsp;
-    if (jj_scan_token(63)) return true;
+  private boolean jj_3R_106() {
+    if (jj_3R_113()) return true;
     return false;
   }
 
-  private boolean jj_3R_92() {
-    if (jj_3R_57()) return true;
+  private boolean jj_3R_103() {
+    if (jj_scan_token(32)) return true;
     return false;
   }
 
-  private boolean jj_3R_111() {
+  private boolean jj_3R_99() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(68)) jj_scanpos = xsp;
-    if (jj_scan_token(IDENT)) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_117()) jj_scanpos = xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_118()) { jj_scanpos = xsp; break; }
+    if (jj_3R_103()) {
+    jj_scanpos = xsp;
+    if (jj_3R_104()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_98() {
+  private boolean jj_3R_100() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(32)) {
+    if (jj_scan_token(93)) {
     jj_scanpos = xsp;
-    if (jj_3R_102()) return true;
+    if (jj_scan_token(92)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(91)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(6)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(33)) {
+    jj_scanpos = xsp;
+    if (jj_3R_105()) {
+    jj_scanpos = xsp;
+    if (jj_3R_106()) {
+    jj_scanpos = xsp;
+    if (jj_3R_107()) {
+    jj_scanpos = xsp;
+    if (jj_3R_108()) {
+    jj_scanpos = xsp;
+    if (jj_3R_109()) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(35)) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
     }
     return false;
   }
 
-  private boolean jj_3R_97() {
+  private boolean jj_3R_98() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(5)) {
@@ -3182,7 +3171,7 @@ public class ModelParser implements ModelParserConstants {
     return false;
   }
 
-  private boolean jj_3R_96() {
+  private boolean jj_3R_97() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(16)) {
@@ -3192,122 +3181,183 @@ public class ModelParser implements ModelParserConstants {
     return false;
   }
 
-  private boolean jj_3R_91() {
+  private boolean jj_3R_92() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_96()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
     if (jj_3R_97()) jj_scanpos = xsp;
     xsp = jj_scanpos;
     if (jj_3R_98()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_99()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_57() {
+  private boolean jj_3R_95() {
+    if (jj_3R_100()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(68)) jj_scanpos = xsp;
-    if (jj_scan_token(IDENT)) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_67()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_101()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_46() {
-    if (jj_3R_57()) return true;
+  private boolean jj_3R_62() {
+    if (jj_3R_70()) return true;
     return false;
   }
 
-  private boolean jj_3R_61() {
-    if (jj_3R_68()) return true;
+  private boolean jj_3R_96() {
+    if (jj_3R_102()) return true;
+    if (jj_3R_95()) return true;
     return false;
   }
 
-  private boolean jj_3_8() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_46()) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(58)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(46)) return true;
-    }
-    }
-    if (jj_scan_token(62)) return true;
+  private boolean jj_3R_84() {
+    if (jj_3R_90()) return true;
+    if (jj_3R_83()) return true;
     return false;
   }
 
-  private boolean jj_3R_108() {
-    if (jj_scan_token(87)) return true;
-    if (jj_3R_99()) return true;
+  private boolean jj_3R_89() {
+    if (jj_3R_94()) return true;
+    if (jj_3R_88()) return true;
     return false;
   }
 
-  private boolean jj_3R_85() {
-    if (jj_3R_91()) return true;
-    if (jj_3R_92()) return true;
+  private boolean jj_3R_102() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(82)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(83)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(84)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(85)) return true;
+    }
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_100() {
+  private boolean jj_3R_88() {
+    if (jj_3R_95()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_96()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_94() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(86)) {
+    if (jj_scan_token(78)) {
     jj_scanpos = xsp;
-    if (jj_3R_108()) return true;
+    if (jj_scan_token(79)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(80)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(81)) return true;
+    }
+    }
     }
     return false;
   }
 
-  private boolean jj_3R_81() {
-    if (jj_3R_85()) return true;
+  private boolean jj_3R_75() {
+    if (jj_scan_token(9)) return true;
+    if (jj_3R_74()) return true;
     return false;
   }
 
-  private boolean jj_3R_107() {
-    if (jj_scan_token(64)) return true;
-    if (jj_3R_115()) return true;
-    if (jj_scan_token(65)) return true;
+  private boolean jj_3R_86() {
+    if (jj_3R_92()) return true;
+    if (jj_3R_93()) return true;
     return false;
   }
 
-  private boolean jj_3R_106() {
-    if (jj_scan_token(66)) return true;
-    if (jj_3R_113()) return true;
+  private boolean jj_3R_87() {
+    if (jj_3R_94()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_61() {
+    if (jj_3R_69()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_83() {
     Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_87()) jj_scanpos = xsp;
+    if (jj_3R_88()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_114()) { jj_scanpos = xsp; break; }
+      if (jj_3R_89()) { jj_scanpos = xsp; break; }
     }
-    if (jj_scan_token(67)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_105() {
-    if (jj_scan_token(62)) return true;
-    if (jj_3R_112()) return true;
-    if (jj_scan_token(63)) return true;
     return false;
   }
 
-  private boolean jj_3R_103() {
+  private boolean jj_3R_90() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_109()) {
+    if (jj_scan_token(72)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(58)) {
+    if (jj_scan_token(73)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(46)) return true;
+    if (jj_scan_token(74)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(75)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(76)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(77)) return true;
+    }
+    }
+    }
     }
     }
-    if (jj_3R_110()) return true;
     return false;
   }
 
-  private boolean jj_3R_104() {
-    if (jj_3R_111()) return true;
+  private boolean jj_3R_54() {
+    if (jj_scan_token(69)) return true;
+    if (jj_3R_53()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_66() {
+    if (jj_scan_token(22)) return true;
+    if (jj_3R_65()) return true;
+    return false;
+  }
+
+  private boolean jj_3_7() {
+    if (jj_3R_44()) return true;
+    if (jj_scan_token(88)) return true;
+    if (jj_3R_45()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_80() {
+    if (jj_3R_83()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_84()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_82() {
+    if (jj_3R_86()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_74() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(12)) jj_scanpos = xsp;
+    if (jj_3R_80()) return true;
     return false;
   }
 
@@ -3317,130 +3367,176 @@ public class ModelParser implements ModelParserConstants {
     return false;
   }
 
-  private boolean jj_3R_99() {
+  private boolean jj_3R_65() {
+    if (jj_3R_74()) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(93)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(92)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(91)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(6)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(33)) {
-    jj_scanpos = xsp;
-    if (jj_3R_103()) {
-    jj_scanpos = xsp;
-    if (jj_3R_104()) {
-    jj_scanpos = xsp;
-    if (jj_3R_105()) {
-    jj_scanpos = xsp;
-    if (jj_3R_106()) {
-    jj_scanpos = xsp;
-    if (jj_3R_107()) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(35)) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_75()) { jj_scanpos = xsp; break; }
     }
+    return false;
+  }
+
+  private boolean jj_3R_77() {
+    if (jj_scan_token(55)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_70() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(46)) jj_scanpos = xsp;
+    if (jj_scan_token(4)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_53() {
+    if (jj_3R_65()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_66()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
   private boolean jj_3R_76() {
-    if (jj_scan_token(55)) return true;
+    if (jj_scan_token(36)) return true;
     return false;
   }
 
-  private boolean jj_3R_94() {
-    if (jj_3R_99()) return true;
+  private boolean jj_3R_69() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_100()) jj_scanpos = xsp;
+    if (jj_scan_token(46)) jj_scanpos = xsp;
+    if (jj_scan_token(45)) return true;
     return false;
   }
 
-  private boolean jj_3R_95() {
-    if (jj_3R_101()) return true;
-    if (jj_3R_94()) return true;
+  private boolean jj_3R_44() {
+    if (jj_3R_53()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_54()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_78() {
+  private boolean jj_3R_79() {
     if (jj_scan_token(13)) return true;
     return false;
   }
 
-  private boolean jj_3R_83() {
-    if (jj_3R_89()) return true;
+  private boolean jj_3R_60() {
+    if (jj_scan_token(52)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_81() {
+    if (jj_3R_85()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_78() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_81()) {
+    jj_scanpos = xsp;
     if (jj_3R_82()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_88() {
-    if (jj_3R_93()) return true;
-    if (jj_3R_87()) return true;
+  private boolean jj_3R_56() {
+    if (jj_scan_token(31)) return true;
+    if (jj_3R_45()) return true;
     return false;
   }
 
-  private boolean jj_3R_75() {
-    if (jj_scan_token(36)) return true;
+  private boolean jj_3R_55() {
+    if (jj_3R_44()) return true;
     return false;
   }
 
-  private boolean jj_3R_101() {
+  private boolean jj_3R_45() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(82)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(83)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(84)) {
+    if (jj_3R_55()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(85)) return true;
-    }
-    }
+    if (jj_3R_56()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_60() {
-    if (jj_scan_token(52)) return true;
+  private boolean jj_3R_73() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(8)) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(11)) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(51)) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(27)) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_78()) {
+    jj_scanpos = xsp;
+    if (jj_3R_79()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_80() {
-    if (jj_3R_84()) return true;
+  private boolean jj_3R_72() {
+    if (jj_3R_77()) return true;
     return false;
   }
 
-  private boolean jj_3R_77() {
+  private boolean jj_3R_64() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_80()) {
+    if (jj_3R_71()) {
     jj_scanpos = xsp;
-    if (jj_3R_81()) return true;
+    if (jj_3R_72()) {
+    jj_scanpos = xsp;
+    if (jj_3R_73()) return true;
+    }
     }
     return false;
   }
 
-  private boolean jj_3R_87() {
-    if (jj_3R_94()) return true;
+  private boolean jj_3R_71() {
+    if (jj_3R_76()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_52() {
+    if (jj_3R_64()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_43() {
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_95()) { jj_scanpos = xsp; break; }
+      if (jj_3R_52()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
+  private boolean jj_3R_63() {
+    if (jj_scan_token(14)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_59() {
+    if (jj_scan_token(21)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_48() {
+    if (jj_scan_token(STRING)) return true;
+    return false;
+  }
+
   /** Generated Token Manager. */
   public ModelParserTokenManager token_source;
   SimpleCharStream jj_input_stream;
diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelParserTokenManager.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelParserTokenManager.java
index 5fbdba7f..19264f96 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelParserTokenManager.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelParserTokenManager.java
@@ -1,5 +1,6 @@
 /* Generated By:JavaCC: Do not edit this line. ModelParserTokenManager.java */
 package org.simantics.sysdyn.modelParser;
+import java.util.ArrayList;
 
 /** Token Manager. */
 public class ModelParserTokenManager implements ModelParserConstants