Fixed ^ and ^. handling in Sysdyn ModelParser (refs #4778).

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

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java
index bcb3d09e804a66dec1a1a60615ed2fb3bf3c6419..08ecdcb477a21a81679cdad6a0578d6354392bd0 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java
@@ -369,17 +369,16 @@ public class ExpressionParser implements ExpressionParserConstants {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
       case 84:\r
         jj_consume_token(84);\r
-        primary();\r
         break;\r
       case 85:\r
         jj_consume_token(85);\r
-        primary();\r
         break;\r
       default:\r
         jj_la1[15] = jj_gen;\r
         jj_consume_token(-1);\r
         throw new ParseException();\r
       }\r
+      primary();\r
       break;\r
     default:\r
       jj_la1[16] = jj_gen;\r
@@ -982,9 +981,9 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_74() {\r
+  private boolean jj_3R_72() {\r
     if (jj_scan_token(67)) return true;\r
-    if (jj_3R_73()) return true;\r
+    if (jj_3R_71()) return true;\r
     return false;\r
   }\r
 \r
@@ -1003,7 +1002,7 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_79() {\r
+  private boolean jj_3R_77() {\r
     if (jj_scan_token(41)) return true;\r
     if (jj_3R_16()) return true;\r
     return false;\r
@@ -1033,9 +1032,9 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_76() {\r
+  private boolean jj_3R_74() {\r
     if (jj_scan_token(69)) return true;\r
-    if (jj_3R_75()) return true;\r
+    if (jj_3R_73()) return true;\r
     return false;\r
   }\r
 \r
@@ -1049,38 +1048,38 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_67() {\r
+  private boolean jj_3R_65() {\r
     if (jj_scan_token(69)) return true;\r
-    if (jj_3R_55()) return true;\r
+    if (jj_3R_53()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_64() {\r
+  private boolean jj_3R_62() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_67()) {\r
+    if (jj_3R_65()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_68()) return true;\r
+    if (jj_3R_66()) return true;\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_58() {\r
+  private boolean jj_3R_56() {\r
     if (jj_scan_token(66)) return true;\r
-    if (jj_3R_52()) return true;\r
+    if (jj_3R_50()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_78() {\r
+  private boolean jj_3R_76() {\r
     if (jj_3R_14()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_75() {\r
+  private boolean jj_3R_73() {\r
     if (jj_3R_14()) return true;\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_79()) jj_scanpos = xsp;\r
+    if (jj_3R_77()) jj_scanpos = xsp;\r
     return false;\r
   }\r
 \r
@@ -1094,17 +1093,17 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_77() {\r
+  private boolean jj_3R_75() {\r
     if (jj_scan_token(UNSIGNED_INTEGER)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_73() {\r
+  private boolean jj_3R_71() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_77()) {\r
+    if (jj_3R_75()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_78()) return true;\r
+    if (jj_3R_76()) return true;\r
     }\r
     return false;\r
   }\r
@@ -1127,19 +1126,19 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_72() {\r
-    if (jj_3R_75()) return true;\r
+  private boolean jj_3R_70() {\r
+    if (jj_3R_73()) return true;\r
     Token xsp;\r
     while (true) {\r
       xsp = jj_scanpos;\r
-      if (jj_3R_76()) { jj_scanpos = xsp; break; }\r
+      if (jj_3R_74()) { jj_scanpos = xsp; break; }\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_54() {\r
+  private boolean jj_3R_52() {\r
     if (jj_scan_token(68)) return true;\r
-    if (jj_3R_53()) return true;\r
+    if (jj_3R_51()) return true;\r
     return false;\r
   }\r
 \r
@@ -1158,17 +1157,17 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_61() {\r
+  private boolean jj_3R_59() {\r
     if (jj_3R_16()) return true;\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_64()) jj_scanpos = xsp;\r
+    if (jj_3R_62()) jj_scanpos = xsp;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_66() {\r
+  private boolean jj_3R_64() {\r
     if (jj_scan_token(69)) return true;\r
-    if (jj_3R_65()) return true;\r
+    if (jj_3R_63()) return true;\r
     return false;\r
   }\r
 \r
@@ -1193,34 +1192,34 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_71() {\r
-    if (jj_3R_73()) return true;\r
+  private boolean jj_3R_69() {\r
+    if (jj_3R_71()) return true;\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_74()) jj_scanpos = xsp;\r
+    if (jj_3R_72()) jj_scanpos = xsp;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_60() {\r
+  private boolean jj_3R_58() {\r
     if (jj_3R_13()) return true;\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_63()) jj_scanpos = xsp;\r
+    if (jj_3R_61()) jj_scanpos = xsp;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_55() {\r
+  private boolean jj_3R_53() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_60()) {\r
+    if (jj_3R_58()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_61()) return true;\r
+    if (jj_3R_59()) return true;\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_56() {\r
-    if (jj_3R_55()) return true;\r
+  private boolean jj_3R_54() {\r
+    if (jj_3R_53()) return true;\r
     return false;\r
   }\r
 \r
@@ -1229,9 +1228,9 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_70() {\r
+  private boolean jj_3R_68() {\r
     if (jj_3R_12()) return true;\r
-    if (jj_3R_51()) return true;\r
+    if (jj_3R_49()) return true;\r
     return false;\r
   }\r
 \r
@@ -1253,39 +1252,33 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_51() {\r
+  private boolean jj_3R_49() {\r
     if (jj_scan_token(60)) return true;\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_56()) jj_scanpos = xsp;\r
+    if (jj_3R_54()) jj_scanpos = xsp;\r
     if (jj_scan_token(61)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_50() {\r
-    if (jj_scan_token(85)) return true;\r
-    if (jj_3R_41()) return true;\r
-    return false;\r
-  }\r
-\r
-  private boolean jj_3R_57() {\r
-    if (jj_3R_62()) return true;\r
+  private boolean jj_3R_55() {\r
+    if (jj_3R_60()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_69() {\r
+  private boolean jj_3R_67() {\r
     if (jj_scan_token(67)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_65() {\r
+  private boolean jj_3R_63() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_69()) {\r
+    if (jj_3R_67()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_70()) {\r
+    if (jj_3R_68()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_71()) return true;\r
+    if (jj_3R_69()) return true;\r
     }\r
     }\r
     return false;\r
@@ -1299,18 +1292,18 @@ void named_arguments() : {
 \r
   private boolean jj_3R_48() {\r
     if (jj_scan_token(62)) return true;\r
-    if (jj_3R_55()) return true;\r
+    if (jj_3R_53()) return true;\r
     if (jj_scan_token(63)) return true;\r
     return false;\r
   }\r
 \r
   private boolean jj_3R_47() {\r
     if (jj_scan_token(64)) return true;\r
-    if (jj_3R_53()) return true;\r
+    if (jj_3R_51()) return true;\r
     Token xsp;\r
     while (true) {\r
       xsp = jj_scanpos;\r
-      if (jj_3R_54()) { jj_scanpos = xsp; break; }\r
+      if (jj_3R_52()) { jj_scanpos = xsp; break; }\r
     }\r
     if (jj_scan_token(65)) return true;\r
     return false;\r
@@ -1324,23 +1317,23 @@ void named_arguments() : {
   }\r
 \r
   private boolean jj_3R_45() {\r
-    if (jj_3R_52()) return true;\r
+    if (jj_3R_50()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_59() {\r
+  private boolean jj_3R_57() {\r
     if (jj_scan_token(69)) return true;\r
     if (jj_3R_16()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_62() {\r
+  private boolean jj_3R_60() {\r
     if (jj_scan_token(64)) return true;\r
-    if (jj_3R_65()) return true;\r
+    if (jj_3R_63()) return true;\r
     Token xsp;\r
     while (true) {\r
       xsp = jj_scanpos;\r
-      if (jj_3R_66()) { jj_scanpos = xsp; break; }\r
+      if (jj_3R_64()) { jj_scanpos = xsp; break; }\r
     }\r
     if (jj_scan_token(65)) return true;\r
     return false;\r
@@ -1348,23 +1341,18 @@ void named_arguments() : {
 \r
   private boolean jj_3R_44() {\r
     if (jj_3R_12()) return true;\r
-    if (jj_3R_51()) return true;\r
-    return false;\r
-  }\r
-\r
-  private boolean jj_3R_49() {\r
-    if (jj_scan_token(84)) return true;\r
-    if (jj_3R_41()) return true;\r
+    if (jj_3R_49()) return true;\r
     return false;\r
   }\r
 \r
   private boolean jj_3R_42() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_49()) {\r
+    if (jj_scan_token(84)) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_50()) return true;\r
+    if (jj_scan_token(85)) return true;\r
     }\r
+    if (jj_3R_41()) return true;\r
     return false;\r
   }\r
 \r
@@ -1453,19 +1441,19 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_53() {\r
+  private boolean jj_3R_51() {\r
     if (jj_3R_16()) return true;\r
     Token xsp;\r
     while (true) {\r
       xsp = jj_scanpos;\r
-      if (jj_3R_59()) { jj_scanpos = xsp; break; }\r
+      if (jj_3R_57()) { jj_scanpos = xsp; break; }\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_63() {\r
+  private boolean jj_3R_61() {\r
     if (jj_scan_token(69)) return true;\r
-    if (jj_3R_55()) return true;\r
+    if (jj_3R_53()) return true;\r
     return false;\r
   }\r
 \r
@@ -1476,9 +1464,9 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_68() {\r
+  private boolean jj_3R_66() {\r
     if (jj_scan_token(21)) return true;\r
-    if (jj_3R_72()) return true;\r
+    if (jj_3R_70()) return true;\r
     return false;\r
   }\r
 \r
@@ -1516,13 +1504,13 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_52() {\r
+  private boolean jj_3R_50() {\r
     if (jj_3R_14()) return true;\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_57()) jj_scanpos = xsp;\r
+    if (jj_3R_55()) jj_scanpos = xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_58()) jj_scanpos = xsp;\r
+    if (jj_3R_56()) jj_scanpos = xsp;\r
     return false;\r
   }\r
 \r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj
index ce3b612684e5278444e2415d1c3e0d07f1f4953f..e3884cf9580f0e0404b6892c2cec104dd51f7cf4 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj
@@ -191,7 +191,7 @@ void term() : {
 \r
 void factor() : {\r
 } {\r
-       primary() ( "^" primary() | ".^" primary() )?\r
+       primary() ( ( "^" | ".^" ) primary() )?\r
 }\r
 \r
 void mul_op() : {\r

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 eb87c0d939c45040ad2996495739857f8906f646..5f89fce88f136ca1632d49a45e7f3f0c742a4670 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelParser.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelParser.java
@@ -2170,13 +2170,13 @@ public class ModelParser implements ModelParserConstants {
         break;\r
       case 87:\r
         jj_consume_token(87);\r
-        primary();\r
         break;\r
       default:\r
         jj_la1[108] = jj_gen;\r
         jj_consume_token(-1);\r
         throw new ParseException();\r
       }\r
+      primary();\r
       break;\r
     default:\r
       jj_la1[109] = jj_gen;\r
@@ -2727,22 +2727,22 @@ public class ModelParser implements ModelParserConstants {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_138() {\r
+  private boolean jj_3R_137() {\r
     if (jj_3R_46()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_136() {\r
+  private boolean jj_3R_135() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
     if (jj_scan_token(69)) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_138()) return true;\r
+    if (jj_3R_137()) return true;\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_132() {\r
+  private boolean jj_3R_131() {\r
     if (jj_scan_token(71)) return true;\r
     return false;\r
   }\r
@@ -2755,13 +2755,13 @@ public class ModelParser implements ModelParserConstants {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_134() {\r
+  private boolean jj_3R_133() {\r
     if (jj_scan_token(66)) return true;\r
-    if (jj_3R_136()) return true;\r
+    if (jj_3R_135()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_131() {\r
+  private boolean jj_3R_130() {\r
     if (jj_scan_token(68)) return true;\r
     if (jj_scan_token(IDENT)) return true;\r
     return false;\r
@@ -2787,12 +2787,12 @@ public class ModelParser implements ModelParserConstants {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_126() {\r
+  private boolean jj_3R_125() {\r
     if (jj_3R_46()) return true;\r
     Token xsp;\r
     while (true) {\r
       xsp = jj_scanpos;\r
-      if (jj_3R_132()) { jj_scanpos = xsp; break; }\r
+      if (jj_3R_131()) { jj_scanpos = xsp; break; }\r
     }\r
     return false;\r
   }\r
@@ -2802,7 +2802,7 @@ public class ModelParser implements ModelParserConstants {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_137() {\r
+  private boolean jj_3R_136() {\r
     if (jj_scan_token(IDENT)) return true;\r
     if (jj_scan_token(88)) return true;\r
     return false;\r
@@ -2836,32 +2836,32 @@ public class ModelParser implements ModelParserConstants {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_135() {\r
-    if (jj_3R_137()) return true;\r
+  private boolean jj_3R_134() {\r
+    if (jj_3R_136()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_130() {\r
-    if (jj_3R_134()) return true;\r
+  private boolean jj_3R_129() {\r
+    if (jj_3R_133()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_133() {\r
-    if (jj_3R_135()) return true;\r
+  private boolean jj_3R_132() {\r
+    if (jj_3R_134()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_124() {\r
+  private boolean jj_3R_123() {\r
     if (jj_3R_63()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_128() {\r
+  private boolean jj_3R_127() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
     if (jj_3_10()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_133()) return true;\r
+    if (jj_3R_132()) return true;\r
     }\r
     return false;\r
   }\r
@@ -2880,8 +2880,8 @@ public class ModelParser implements ModelParserConstants {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_129() {\r
-    if (jj_3R_128()) return true;\r
+  private boolean jj_3R_128() {\r
+    if (jj_3R_127()) return true;\r
     return false;\r
   }\r
 \r
@@ -2889,7 +2889,7 @@ public class ModelParser implements ModelParserConstants {
     if (jj_scan_token(62)) return true;\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_129()) jj_scanpos = xsp;\r
+    if (jj_3R_128()) jj_scanpos = xsp;\r
     if (jj_scan_token(63)) return true;\r
     return false;\r
   }\r
@@ -2935,21 +2935,21 @@ public class ModelParser implements ModelParserConstants {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_125() {\r
+  private boolean jj_3R_124() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
     if (jj_scan_token(68)) jj_scanpos = xsp;\r
     if (jj_scan_token(IDENT)) return true;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_130()) jj_scanpos = xsp;\r
+    if (jj_3R_129()) jj_scanpos = xsp;\r
     while (true) {\r
       xsp = jj_scanpos;\r
-      if (jj_3R_131()) { jj_scanpos = xsp; break; }\r
+      if (jj_3R_130()) { jj_scanpos = xsp; break; }\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_127() {\r
+  private boolean jj_3R_126() {\r
     if (jj_scan_token(70)) return true;\r
     return false;\r
   }\r
@@ -2996,12 +2996,6 @@ public class ModelParser implements ModelParserConstants {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_123() {\r
-    if (jj_scan_token(87)) return true;\r
-    if (jj_3R_113()) return true;\r
-    return false;\r
-  }\r
-\r
   private boolean jj_3R_106() {\r
     if (jj_3R_63()) return true;\r
     return false;\r
@@ -3012,8 +3006,9 @@ public class ModelParser implements ModelParserConstants {
     xsp = jj_scanpos;\r
     if (jj_scan_token(86)) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_123()) return true;\r
+    if (jj_scan_token(87)) return true;\r
     }\r
+    if (jj_3R_113()) return true;\r
     return false;\r
   }\r
 \r
@@ -3025,18 +3020,18 @@ public class ModelParser implements ModelParserConstants {
 \r
   private boolean jj_3R_122() {\r
     if (jj_scan_token(64)) return true;\r
-    if (jj_3R_128()) return true;\r
+    if (jj_3R_127()) return true;\r
     if (jj_scan_token(65)) return true;\r
     return false;\r
   }\r
 \r
   private boolean jj_3R_121() {\r
     if (jj_scan_token(66)) return true;\r
-    if (jj_3R_126()) return true;\r
+    if (jj_3R_125()) return true;\r
     Token xsp;\r
     while (true) {\r
       xsp = jj_scanpos;\r
-      if (jj_3R_127()) { jj_scanpos = xsp; break; }\r
+      if (jj_3R_126()) { jj_scanpos = xsp; break; }\r
     }\r
     if (jj_scan_token(67)) return true;\r
     return false;\r
@@ -3057,7 +3052,7 @@ public class ModelParser implements ModelParserConstants {
   private boolean jj_3R_118() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_124()) {\r
+    if (jj_3R_123()) {\r
     jj_scanpos = xsp;\r
     if (jj_scan_token(58)) {\r
     jj_scanpos = xsp;\r
@@ -3069,7 +3064,7 @@ public class ModelParser implements ModelParserConstants {
   }\r
 \r
   private boolean jj_3R_119() {\r
-    if (jj_3R_125()) return true;\r
+    if (jj_3R_124()) return true;\r
     return false;\r
   }\r
 \r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelicaParser.jj b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelicaParser.jj
index 04e39995d9fe22ca8264cc541f5cc80f242e00bc..e780b8a56ee219575bdf180cae69c3394c9b6cae 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelicaParser.jj
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelicaParser.jj
@@ -628,7 +628,7 @@ void mul_op() : {
 \r
 void factor() : {\r
 } {\r
-       primary() ( "^" | ".^" primary() )?\r
+       primary() ( ( "^" | ".^" ) primary() )?\r
 }\r
 \r
 void primary() : {\r