Replaced "(" output_expression_list() ")" with "(" expression() ")". This allows...

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@26939 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 f833fdbdbc4b6a891f2f7afc60a80be6aab5f6e5..5f51ebbae8c3e4fb2672307b688c4118f6697dfa 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java
@@ -436,7 +436,7 @@ public class ExpressionParser implements ExpressionParserConstants {
           break;\r
         case 60:\r
           jj_consume_token(60);\r
-          output_expression_list();\r
+          expression();\r
           jj_consume_token(61);\r
           break;\r
         case 64:\r
@@ -880,12 +880,6 @@ void named_arguments() : {
     finally { jj_save(2, xla); }\r
   }\r
 \r
-  private boolean jj_3R_14() {\r
-    if (jj_scan_token(66)) return true;\r
-    if (jj_3R_12()) return true;\r
-    return false;\r
-  }\r
-\r
   private boolean jj_3R_13() {\r
     if (jj_scan_token(IDENT)) return true;\r
     if (jj_scan_token(86)) return true;\r
@@ -917,6 +911,12 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
+  private boolean jj_3R_14() {\r
+    if (jj_scan_token(66)) return true;\r
+    if (jj_3R_12()) return true;\r
+    return false;\r
+  }\r
+\r
   /** Generated Token Manager. */\r
   public ExpressionParserTokenManager token_source;\r
   SimpleCharStream jj_input_stream;\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 d8cdfc4633a589219b0aae384239ede4e186c995..722c09110798a5b9427ff372d3142798c1083181 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj
@@ -205,7 +205,8 @@ void primary() : {
     name() function_call_args()\r  {\r    functionCall = null;\r
   }    \r
   | component_reference(null)\r
-  | "(" output_expression_list() ")"\r
+  /*| "(" output_expression_list() ")"*/ // Not needed, replaced with following:\r
+  | "(" expression() ")"\r
   | "[" expression_list() ( ";" expression_list() )* "]"\r
   | "{" function_arguments() "}"\r
   | "end"\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 ee3f2c7c35430d5fea6fc2b4264c346bfd67c30c..3933d5e39cb64f3ce89fb509bc3bc6f839687b12 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelParser.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelParser.java
@@ -2251,7 +2251,7 @@ public class ModelParser implements ModelParserConstants {
           break;\r
         case 62:\r
           jj_consume_token(62);\r
-          output_expression_list();\r
+          expression();\r
           jj_consume_token(63);\r
           break;\r
         case 66:\r
@@ -2705,13 +2705,6 @@ public class ModelParser implements ModelParserConstants {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_41() {\r
-    Token xsp;\r
-    xsp = jj_scanpos;\r
-    if (jj_3R_48()) jj_scanpos = xsp;\r
-    return false;\r
-  }\r
-\r
   private boolean jj_3R_50() {\r
     if (jj_scan_token(59)) return true;\r
     return false;\r
@@ -2758,29 +2751,21 @@ public class ModelParser implements ModelParserConstants {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_130() {\r
-    if (jj_3R_45()) return true;\r
-    return false;\r
-  }\r
-\r
-  private boolean jj_3R_122() {\r
-    if (jj_scan_token(71)) return true;\r
-    Token xsp;\r
-    xsp = jj_scanpos;\r
-    if (jj_3R_126()) jj_scanpos = xsp;\r
-    return false;\r
-  }\r
-\r
-  private boolean jj_3R_128() {\r
+  private boolean jj_3R_124() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
     if (jj_scan_token(69)) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_130()) return true;\r
+    if (jj_3R_126()) return true;\r
     }\r
     return false;\r
   }\r
 \r
+  private boolean jj_3R_120() {\r
+    if (jj_scan_token(71)) return true;\r
+    return false;\r
+  }\r
+\r
   private boolean jj_3R_91() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
@@ -2789,18 +2774,13 @@ public class ModelParser implements ModelParserConstants {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_123() {\r
-    if (jj_scan_token(71)) return true;\r
-    return false;\r
-  }\r
-\r
-  private boolean jj_3R_125() {\r
+  private boolean jj_3R_122() {\r
     if (jj_scan_token(66)) return true;\r
-    if (jj_3R_128()) return true;\r
+    if (jj_3R_124()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_120() {\r
+  private boolean jj_3R_119() {\r
     if (jj_scan_token(68)) return true;\r
     if (jj_scan_token(IDENT)) return true;\r
     return false;\r
@@ -2821,29 +2801,19 @@ public class ModelParser implements ModelParserConstants {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_121() {\r
-    if (jj_3R_45()) return true;\r
-    return false;\r
-  }\r
-\r
-  private boolean jj_3R_115() {\r
+  private boolean jj_3R_114() {\r
     if (jj_3R_45()) return true;\r
     Token xsp;\r
     while (true) {\r
       xsp = jj_scanpos;\r
-      if (jj_3R_123()) { jj_scanpos = xsp; break; }\r
+      if (jj_3R_120()) { jj_scanpos = xsp; break; }\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_114() {\r
-    Token xsp;\r
-    xsp = jj_scanpos;\r
-    if (jj_3R_121()) jj_scanpos = xsp;\r
-    while (true) {\r
-      xsp = jj_scanpos;\r
-      if (jj_3R_122()) { jj_scanpos = xsp; break; }\r
-    }\r
+  private boolean jj_3R_125() {\r
+    if (jj_scan_token(IDENT)) return true;\r
+    if (jj_scan_token(88)) return true;\r
     return false;\r
   }\r
 \r
@@ -2861,12 +2831,6 @@ public class ModelParser implements ModelParserConstants {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_129() {\r
-    if (jj_scan_token(IDENT)) return true;\r
-    if (jj_scan_token(88)) return true;\r
-    return false;\r
-  }\r
-\r
   private boolean jj_3_2() {\r
     if (jj_scan_token(IDENT)) return true;\r
     if (jj_scan_token(88)) return true;\r
@@ -2881,18 +2845,18 @@ public class ModelParser implements ModelParserConstants {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_127() {\r
-    if (jj_3R_129()) return true;\r
+  private boolean jj_3R_123() {\r
+    if (jj_3R_125()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_119() {\r
-    if (jj_3R_125()) return true;\r
+  private boolean jj_3R_118() {\r
+    if (jj_3R_122()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_124() {\r
-    if (jj_3R_127()) return true;\r
+  private boolean jj_3R_121() {\r
+    if (jj_3R_123()) return true;\r
     return false;\r
   }\r
 \r
@@ -2901,12 +2865,12 @@ public class ModelParser implements ModelParserConstants {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_117() {\r
+  private boolean jj_3R_116() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
     if (jj_3_9()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_124()) return true;\r
+    if (jj_3R_121()) return true;\r
     }\r
     return false;\r
   }\r
@@ -2919,8 +2883,8 @@ public class ModelParser implements ModelParserConstants {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_118() {\r
-    if (jj_3R_117()) return true;\r
+  private boolean jj_3R_117() {\r
+    if (jj_3R_116()) return true;\r
     return false;\r
   }\r
 \r
@@ -2928,7 +2892,7 @@ public class ModelParser implements ModelParserConstants {
     if (jj_scan_token(62)) return true;\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_118()) jj_scanpos = xsp;\r
+    if (jj_3R_117()) jj_scanpos = xsp;\r
     if (jj_scan_token(63)) return true;\r
     return false;\r
   }\r
@@ -2980,15 +2944,15 @@ public class ModelParser implements ModelParserConstants {
     if (jj_scan_token(68)) jj_scanpos = xsp;\r
     if (jj_scan_token(IDENT)) return true;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_119()) jj_scanpos = xsp;\r
+    if (jj_3R_118()) jj_scanpos = xsp;\r
     while (true) {\r
       xsp = jj_scanpos;\r
-      if (jj_3R_120()) { jj_scanpos = xsp; break; }\r
+      if (jj_3R_119()) { jj_scanpos = xsp; break; }\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_116() {\r
+  private boolean jj_3R_115() {\r
     if (jj_scan_token(70)) return true;\r
     return false;\r
   }\r
@@ -3058,31 +3022,31 @@ public class ModelParser implements ModelParserConstants {
 \r
   private boolean jj_3R_109() {\r
     if (jj_scan_token(64)) return true;\r
-    if (jj_3R_117()) return true;\r
+    if (jj_3R_116()) return true;\r
     if (jj_scan_token(65)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_104() {\r
-    if (jj_scan_token(56)) return true;\r
-    return false;\r
-  }\r
-\r
   private boolean jj_3R_108() {\r
     if (jj_scan_token(66)) return true;\r
-    if (jj_3R_115()) return true;\r
+    if (jj_3R_114()) return true;\r
     Token xsp;\r
     while (true) {\r
       xsp = jj_scanpos;\r
-      if (jj_3R_116()) { jj_scanpos = xsp; break; }\r
+      if (jj_3R_115()) { jj_scanpos = xsp; break; }\r
     }\r
     if (jj_scan_token(67)) return true;\r
     return false;\r
   }\r
 \r
+  private boolean jj_3R_104() {\r
+    if (jj_scan_token(56)) return true;\r
+    return false;\r
+  }\r
+\r
   private boolean jj_3R_107() {\r
     if (jj_scan_token(62)) return true;\r
-    if (jj_3R_114()) return true;\r
+    if (jj_3R_45()) return true;\r
     if (jj_scan_token(63)) return true;\r
     return false;\r
   }\r
@@ -3537,6 +3501,13 @@ public class ModelParser implements ModelParserConstants {
     return false;\r
   }\r
 \r
+  private boolean jj_3R_41() {\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_48()) jj_scanpos = xsp;\r
+    return false;\r
+  }\r
+\r
   /** Generated Token Manager. */\r
   public ModelParserTokenManager token_source;\r
   SimpleCharStream jj_input_stream;\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 dfd52941c6dad9ded412d6bd153936bb2418434b..8cf3a5b7f97af5e9ccd4fe70d3462d7bec6603fe 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelicaParser.jj
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelicaParser.jj
@@ -638,7 +638,8 @@ void primary() : {
   | "true"\r
   |   LOOKAHEAD( (name()|"der"|"initial") "(" ) (name()|"der"|"initial") function_call_args()\r
   | component_reference()\r
-  | "(" output_expression_list() ")"\r
+  /* | "(" output_expression_list() ")" */ // Not needed, replaced with following:\r
+  | "(" expression() ")"\r
   | "[" expression_list() ( ";" expression_list() )* "]"\r
   | "{" function_arguments() "}"\r
   | "end"\r