Fixed support for variable names with spaces.

refs #4424

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

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.java
index 7b0111abaf06a13f461362057739ee412603491d..913534fe8206805fae0fc4837dd30654616bbb6f 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.java
@@ -1110,13 +1110,17 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
   jjtn000.jjtSetFirstToken(getToken(1));\r
     try {\r
       jj_consume_token(IDENT);\r
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
-      case IDENT:\r
+      label_7:\r
+      while (true) {\r
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
+        case IDENT:\r
+          ;\r
+          break;\r
+        default:\r
+          jj_la1[27] = jj_gen;\r
+          break label_7;\r
+        }\r
         jj_consume_token(IDENT);\r
-        break;\r
-      default:\r
-        jj_la1[27] = jj_gen;\r
-        ;\r
       }\r
     } finally {\r
     if (jjtc000) {\r
@@ -1276,7 +1280,7 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
   jjtn000.jjtSetFirstToken(getToken(1));\r
     try {\r
       for_index();\r
-      label_7:\r
+      label_8:\r
       while (true) {\r
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
         case 69:\r
@@ -1284,7 +1288,7 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
           break;\r
         default:\r
           jj_la1[33] = jj_gen;\r
-          break label_7;\r
+          break label_8;\r
         }\r
         jj_consume_token(69);\r
         for_index();\r
@@ -1418,7 +1422,7 @@ void named_arguments() : {
         jj_la1[35] = jj_gen;\r
         ;\r
       }\r
-      label_8:\r
+      label_9:\r
       while (true) {\r
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
         case 69:\r
@@ -1426,7 +1430,7 @@ void named_arguments() : {
           break;\r
         default:\r
           jj_la1[36] = jj_gen;\r
-          break label_8;\r
+          break label_9;\r
         }\r
         jj_consume_token(69);\r
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
@@ -1483,7 +1487,7 @@ void named_arguments() : {
   jjtn000.jjtSetFirstToken(getToken(1));\r
     try {\r
       expression();\r
-      label_9:\r
+      label_10:\r
       while (true) {\r
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
         case 69:\r
@@ -1491,7 +1495,7 @@ void named_arguments() : {
           break;\r
         default:\r
           jj_la1[38] = jj_gen;\r
-          break label_9;\r
+          break label_10;\r
         }\r
         jj_consume_token(69);\r
         expression();\r
@@ -1527,7 +1531,7 @@ void named_arguments() : {
     try {\r
       jj_consume_token(64);\r
       subscript();\r
-      label_10:\r
+      label_11:\r
       while (true) {\r
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
         case 69:\r
@@ -1535,7 +1539,7 @@ void named_arguments() : {
           break;\r
         default:\r
           jj_la1[39] = jj_gen;\r
-          break label_10;\r
+          break label_11;\r
         }\r
         jj_consume_token(69);\r
         subscript();\r
@@ -1670,45 +1674,45 @@ void named_arguments() : {
     finally { jj_save(2, xla); }\r
   }\r
 \r
-  private boolean jj_3R_14() {\r
+  private boolean jj_3R_15() {\r
     if (jj_scan_token(66)) return true;\r
-    if (jj_3R_11()) return true;\r
+    if (jj_3R_12()) return true;\r
     return false;\r
   }\r
 \r
   private boolean jj_3_3() {\r
-    if (jj_3R_11()) return true;\r
     if (jj_3R_12()) return true;\r
+    if (jj_3R_13()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_12() {\r
+  private boolean jj_3R_13() {\r
     if (jj_scan_token(60)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_13() {\r
+  private boolean jj_3R_14() {\r
     if (jj_scan_token(IDENT)) return true;\r
     if (jj_scan_token(86)) return true;\r
     return false;\r
   }\r
 \r
   private boolean jj_3_2() {\r
-    if (jj_3R_13()) return true;\r
+    if (jj_3R_14()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_11() {\r
+  private boolean jj_3R_12() {\r
     if (jj_scan_token(IDENT)) return true;\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_14()) jj_scanpos = xsp;\r
+    if (jj_3R_15()) jj_scanpos = xsp;\r
     return false;\r
   }\r
 \r
   private boolean jj_3_1() {\r
-    if (jj_3R_11()) return true;\r
     if (jj_3R_12()) return true;\r
+    if (jj_3R_13()) return true;\r
     return false;\r
   }\r
 \r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.jj b/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.jj
index 16eab62e35bb4b6539926e273017f935cf443098..a3867bf7ed7e769926c8b0928315c7d751125ebd 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.jj
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.jj
@@ -863,7 +863,7 @@ void component_identity() : {/*@bgen(jjtree) component_identity */
 /*@egen*/\r
 } {/*@bgen(jjtree) component_identity */\r
   try {\r
-/*@egen*/\r  <IDENT> (<IDENT>)?/*@bgen(jjtree)*/\r
+/*@egen*/\r  <IDENT> (<IDENT>)*/*@bgen(jjtree)*/\r
   } finally {\r
     if (jjtc000) {\r
       jjtree.closeNodeScope(jjtn000, true);\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.jjt b/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.jjt
index c6428eecc3452a23ed9384876a4f20c4d7d87151..8c04b8d2f972f80d9ffef915c7da33ea9aa8db76 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.jjt
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.jjt
@@ -210,7 +210,7 @@ void component_reference() : {
 }\r
 \r
 void component_identity() : {\r
-} {\r  <IDENT> (<IDENT>)?\r
+} {\r  <IDENT> (<IDENT>)*\r
 }\r  \r
 \r
 void function_call_args() : {\r