refs #5009

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@29718 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 81b86df71287487b91928ed8e5060a68d12bb5b4..532c053ab5836bd801472f23e21afdf001f7ba5d 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/NodeClass.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/NodeClass.java
@@ -36,6 +36,7 @@ public enum NodeClass {
        array_subscripts,\r
        declaration,\r
        class_definition,\r
+       class_specifier,\r
        array,\r
        primary,\r
        component_reference,\r

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 bd6fc87d7fbac312df4b75ba44ab02c3e4a94034..5bc59bcef96c0c7ee3fe2da44f34900d8d545eea 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Parser.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Parser.java
@@ -40,6 +40,17 @@ public class Parser {
        \r
        static Map<String, NodeClass> nodeNameMap = new HashMap<String, NodeClass>();\r
        \r
+       public String getPackagePath(SimpleNode n) {\r
+               SimpleNode parent = (SimpleNode)n.jjtGetParent();\r
+               if(parent == null) return "";\r
+               NodeClass nc = NodeClass.of(parent.toString());\r
+               if (nc == NodeClass.class_specifier) {\r
+                       return getPackagePath(parent) + parent.op + "."; \r
+               } else {\r
+                       return getPackagePath(parent); \r
+               }\r
+       }\r
+       \r
        public Object walk_(SimpleNode n, int indent, IFrame frame) {\r
 \r
                Model model = frame instanceof Model ? (Model)frame : null;\r
@@ -318,10 +329,13 @@ public class Parser {
                                }\r
                                return b.toString();\r
                        }\r
+               case class_specifier:\r
+                       return walk((SimpleNode)n.jjtGetChild(0), indent+2, frame);\r
                case class_definition:\r
                        if("function".equals(n.op)) {\r
                                SimpleNode child = (SimpleNode)n.jjtGetChild(0);\r
-                               String functionName = child.op;\r
+                               String packagePath = getPackagePath(child);\r
+                               String functionName = packagePath + child.op;\r
                                ArrayList<IStatement> stms2 = new ArrayList<IStatement>();\r
                                Function function = new Function(functionName, new StatementList(stms2));\r
                                ArrayList<Object> composition = (ArrayList<Object>)walk(child, indent+2, function);\r
@@ -392,6 +406,10 @@ public class Parser {
                                \r
                                return null;\r
                                \r
+                       } else if("package".equals(n.op)) {\r
+\r
+                               return walk((SimpleNode)n.jjtGetChild(0), indent+2, frame);\r
+\r
                        } else {\r
                                System.err.println("class_definition " + n.op);\r
                        }\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParser.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParser.java
index de6a2b2501c89ac425f6bbf506c750e48278c6a3..c50c60586559b38461a6834f24d3cba36ea9d273 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParser.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParser.java
@@ -218,10 +218,11 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
         break;\r
       case 37:\r
         jj_consume_token(37);\r
+                jjtn000.op = "package";\r
         break;\r
       case 26:\r
         jj_consume_token(26);\r
-                             jjtn000.op = "function";\r
+                                                         jjtn000.op = "function";\r
         break;\r
       case 17:\r
         jj_consume_token(17);\r
@@ -4658,31 +4659,31 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     if (jj_scan_token(62)) return true;\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_166()) jj_scanpos = xsp;\r
+    if (jj_3R_167()) jj_scanpos = xsp;\r
     if (jj_scan_token(63)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_129() {\r
+  private boolean jj_3R_130() {\r
     if (jj_scan_token(49)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_124() {\r
+  private boolean jj_3R_125() {\r
     if (jj_scan_token(75)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_153() {\r
+  private boolean jj_3R_154() {\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_161()) jj_scanpos = xsp;\r
+    if (jj_3R_162()) jj_scanpos = xsp;\r
     while (true) {\r
       xsp = jj_scanpos;\r
-      if (jj_3R_162()) { jj_scanpos = xsp; break; }\r
+      if (jj_3R_163()) { jj_scanpos = xsp; break; }\r
     }\r
     return false;\r
   }\r
@@ -4693,7 +4694,7 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_159() {\r
+  private boolean jj_3R_160() {\r
     if (jj_scan_token(58)) return true;\r
     return false;\r
   }\r
@@ -4703,7 +4704,7 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_150() {\r
+  private boolean jj_3R_151() {\r
     if (jj_scan_token(84)) return true;\r
     return false;\r
   }\r
@@ -4739,55 +4740,53 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_123() {\r
+  private boolean jj_3R_124() {\r
     if (jj_scan_token(74)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_146() {\r
-    if (jj_3R_155()) return true;\r
+  private boolean jj_3R_147() {\r
+    if (jj_3R_156()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_164() {\r
+  private boolean jj_3R_165() {\r
     if (jj_scan_token(70)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_145() {\r
+  private boolean jj_3R_146() {\r
     if (jj_scan_token(66)) return true;\r
-    if (jj_3R_154()) return true;\r
+    if (jj_3R_155()) return true;\r
     if (jj_scan_token(67)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_144() {\r
+  private boolean jj_3R_145() {\r
     if (jj_scan_token(62)) return true;\r
     if (jj_3R_47()) return true;\r
     if (jj_scan_token(63)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_142() {\r
-    if (jj_3R_152()) return true;\r
+  private boolean jj_3R_143() {\r
+    if (jj_3R_153()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_157() {\r
+  private boolean jj_3R_158() {\r
     if (jj_scan_token(87)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_143() {\r
-    if (jj_3R_153()) return true;\r
+  private boolean jj_3R_144() {\r
+    if (jj_3R_154()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_134() {\r
+  private boolean jj_3R_135() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_137()) {\r
-    jj_scanpos = xsp;\r
     if (jj_3R_138()) {\r
     jj_scanpos = xsp;\r
     if (jj_3R_139()) {\r
@@ -4806,6 +4805,8 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     jj_scanpos = xsp;\r
     if (jj_3R_146()) {\r
     jj_scanpos = xsp;\r
+    if (jj_3R_147()) {\r
+    jj_scanpos = xsp;\r
     if (jj_scan_token(35)) return true;\r
     }\r
     }\r
@@ -4820,182 +4821,182 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_137() {\r
+  private boolean jj_3R_138() {\r
     if (jj_scan_token(UNSIGNED_NUMBER)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_141() {\r
+  private boolean jj_3R_142() {\r
     if (jj_scan_token(33)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_140() {\r
+  private boolean jj_3R_141() {\r
     if (jj_scan_token(6)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_139() {\r
+  private boolean jj_3R_140() {\r
     if (jj_scan_token(STRING)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_138() {\r
+  private boolean jj_3R_139() {\r
     if (jj_scan_token(UNSIGNED_INTEGER)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_149() {\r
+  private boolean jj_3R_150() {\r
     if (jj_scan_token(83)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_128() {\r
+  private boolean jj_3R_129() {\r
     if (jj_scan_token(42)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_155() {\r
+  private boolean jj_3R_156() {\r
     if (jj_scan_token(64)) return true;\r
-    if (jj_3R_165()) return true;\r
+    if (jj_3R_166()) return true;\r
     if (jj_scan_token(65)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_135() {\r
-    if (jj_3R_147()) return true;\r
-    if (jj_3R_134()) return true;\r
+  private boolean jj_3R_136() {\r
+    if (jj_3R_148()) return true;\r
+    if (jj_3R_135()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_154() {\r
-    if (jj_3R_163()) return true;\r
+  private boolean jj_3R_155() {\r
+    if (jj_3R_164()) return true;\r
     Token xsp;\r
     while (true) {\r
       xsp = jj_scanpos;\r
-      if (jj_3R_164()) { jj_scanpos = xsp; break; }\r
+      if (jj_3R_165()) { jj_scanpos = xsp; break; }\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_158() {\r
+  private boolean jj_3R_159() {\r
     if (jj_3R_60()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_133() {\r
+  private boolean jj_3R_134() {\r
     if (jj_scan_token(79)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_152() {\r
+  private boolean jj_3R_153() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_158()) {\r
-    jj_scanpos = xsp;\r
     if (jj_3R_159()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_160()) return true;\r
+    if (jj_3R_160()) {\r
+    jj_scanpos = xsp;\r
+    if (jj_3R_161()) return true;\r
     }\r
     }\r
     if (jj_3R_74()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_122() {\r
+  private boolean jj_3R_123() {\r
     if (jj_scan_token(73)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_147() {\r
+  private boolean jj_3R_148() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_156()) {\r
+    if (jj_3R_157()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_157()) return true;\r
+    if (jj_3R_158()) return true;\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_156() {\r
+  private boolean jj_3R_157() {\r
     if (jj_scan_token(86)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_119() {\r
-    if (jj_3R_134()) return true;\r
+  private boolean jj_3R_120() {\r
+    if (jj_3R_135()) return true;\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_135()) jj_scanpos = xsp;\r
+    if (jj_3R_136()) jj_scanpos = xsp;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_120() {\r
-    if (jj_3R_136()) return true;\r
-    if (jj_3R_119()) return true;\r
+  private boolean jj_3R_121() {\r
+    if (jj_3R_137()) return true;\r
+    if (jj_3R_120()) return true;\r
     return false;\r
   }\r
 \r
   private boolean jj_3R_104() {\r
-    if (jj_3R_114()) return true;\r
+    if (jj_3R_115()) return true;\r
     if (jj_3R_103()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_113() {\r
-    if (jj_3R_118()) return true;\r
-    if (jj_3R_112()) return true;\r
+  private boolean jj_3R_114() {\r
+    if (jj_3R_119()) return true;\r
+    if (jj_3R_113()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_136() {\r
+  private boolean jj_3R_137() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_148()) {\r
-    jj_scanpos = xsp;\r
     if (jj_3R_149()) {\r
     jj_scanpos = xsp;\r
     if (jj_3R_150()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_151()) return true;\r
+    if (jj_3R_151()) {\r
+    jj_scanpos = xsp;\r
+    if (jj_3R_152()) return true;\r
     }\r
     }\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_148() {\r
+  private boolean jj_3R_149() {\r
     if (jj_scan_token(82)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_110() {\r
+  private boolean jj_3R_111() {\r
     if (jj_3R_60()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_112() {\r
-    if (jj_3R_119()) return true;\r
+  private boolean jj_3R_113() {\r
+    if (jj_3R_120()) return true;\r
     Token xsp;\r
     while (true) {\r
       xsp = jj_scanpos;\r
-      if (jj_3R_120()) { jj_scanpos = xsp; break; }\r
+      if (jj_3R_121()) { jj_scanpos = xsp; break; }\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_131() {\r
+  private boolean jj_3R_132() {\r
     if (jj_scan_token(56)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_118() {\r
+  private boolean jj_3R_119() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_132()) {\r
-    jj_scanpos = xsp;\r
     if (jj_3R_133()) {\r
     jj_scanpos = xsp;\r
+    if (jj_3R_134()) {\r
+    jj_scanpos = xsp;\r
     if (jj_scan_token(80)) {\r
     jj_scanpos = xsp;\r
     if (jj_scan_token(81)) return true;\r
@@ -5005,7 +5006,7 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_132() {\r
+  private boolean jj_3R_133() {\r
     if (jj_scan_token(78)) return true;\r
     return false;\r
   }\r
@@ -5016,40 +5017,40 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_117() {\r
+  private boolean jj_3R_118() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_130()) {\r
+    if (jj_3R_131()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_131()) return true;\r
+    if (jj_3R_132()) return true;\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_130() {\r
+  private boolean jj_3R_131() {\r
     if (jj_scan_token(32)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_111() {\r
-    if (jj_3R_118()) return true;\r
+  private boolean jj_3R_112() {\r
+    if (jj_3R_119()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_116() {\r
+  private boolean jj_3R_117() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_127()) {\r
-    jj_scanpos = xsp;\r
     if (jj_3R_128()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_129()) return true;\r
+    if (jj_3R_129()) {\r
+    jj_scanpos = xsp;\r
+    if (jj_3R_130()) return true;\r
     }\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_127() {\r
+  private boolean jj_3R_128() {\r
     if (jj_scan_token(5)) return true;\r
     return false;\r
   }\r
@@ -5057,16 +5058,16 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
   private boolean jj_3R_103() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_111()) jj_scanpos = xsp;\r
-    if (jj_3R_112()) return true;\r
+    if (jj_3R_112()) jj_scanpos = xsp;\r
+    if (jj_3R_113()) return true;\r
     while (true) {\r
       xsp = jj_scanpos;\r
-      if (jj_3R_113()) { jj_scanpos = xsp; break; }\r
+      if (jj_3R_114()) { jj_scanpos = xsp; break; }\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_115() {\r
+  private boolean jj_3R_116() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
     if (jj_scan_token(16)) {\r
@@ -5076,11 +5077,9 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_114() {\r
+  private boolean jj_3R_115() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_121()) {\r
-    jj_scanpos = xsp;\r
     if (jj_3R_122()) {\r
     jj_scanpos = xsp;\r
     if (jj_3R_123()) {\r
@@ -5089,7 +5088,9 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     jj_scanpos = xsp;\r
     if (jj_3R_125()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_126()) return true;\r
+    if (jj_3R_126()) {\r
+    jj_scanpos = xsp;\r
+    if (jj_3R_127()) return true;\r
     }\r
     }\r
     }\r
@@ -5098,7 +5099,7 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_121() {\r
+  private boolean jj_3R_122() {\r
     if (jj_scan_token(72)) return true;\r
     return false;\r
   }\r
@@ -5115,14 +5116,14 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_109() {\r
+  private boolean jj_3R_110() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_115()) jj_scanpos = xsp;\r
-    xsp = jj_scanpos;\r
     if (jj_3R_116()) jj_scanpos = xsp;\r
     xsp = jj_scanpos;\r
     if (jj_3R_117()) jj_scanpos = xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_118()) jj_scanpos = xsp;\r
     return false;\r
   }\r
 \r
@@ -5191,8 +5192,8 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
   }\r
 \r
   private boolean jj_3R_102() {\r
-    if (jj_3R_109()) return true;\r
     if (jj_3R_110()) return true;\r
+    if (jj_3R_111()) return true;\r
     return false;\r
   }\r
 \r
@@ -5399,6 +5400,11 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
+  private boolean jj_3R_109() {\r
+    if (jj_scan_token(26)) return true;\r
+    return false;\r
+  }\r
+\r
   private boolean jj_3R_106() {\r
     if (jj_scan_token(7)) return true;\r
     return false;\r
@@ -5438,13 +5444,13 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_108() {\r
-    if (jj_scan_token(26)) return true;\r
+  private boolean jj_3R_105() {\r
+    if (jj_scan_token(34)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_105() {\r
-    if (jj_scan_token(34)) return true;\r
+  private boolean jj_3R_108() {\r
+    if (jj_scan_token(37)) return true;\r
     return false;\r
   }\r
 \r
@@ -5467,10 +5473,10 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     jj_scanpos = xsp;\r
     if (jj_scan_token(38)) {\r
     jj_scanpos = xsp;\r
-    if (jj_scan_token(37)) {\r
-    jj_scanpos = xsp;\r
     if (jj_3R_108()) {\r
     jj_scanpos = xsp;\r
+    if (jj_3R_109()) {\r
+    jj_scanpos = xsp;\r
     if (jj_scan_token(17)) {\r
     jj_scanpos = xsp;\r
     if (jj_scan_token(95)) {\r
@@ -5531,7 +5537,7 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_173() {\r
+  private boolean jj_3R_174() {\r
     if (jj_3R_47()) return true;\r
     return false;\r
   }\r
@@ -5563,7 +5569,7 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_162() {\r
+  private boolean jj_3R_163() {\r
     if (jj_scan_token(68)) return true;\r
     if (jj_scan_token(IDENT)) return true;\r
     return false;\r
@@ -5601,7 +5607,7 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_126() {\r
+  private boolean jj_3R_127() {\r
     if (jj_scan_token(77)) return true;\r
     return false;\r
   }\r
@@ -5619,28 +5625,28 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_172() {\r
+  private boolean jj_3R_173() {\r
     if (jj_scan_token(69)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_168() {\r
+  private boolean jj_3R_169() {\r
     if (jj_scan_token(71)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_170() {\r
+  private boolean jj_3R_171() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_172()) {\r
+    if (jj_3R_173()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_173()) return true;\r
+    if (jj_3R_174()) return true;\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_161() {\r
-    if (jj_3R_167()) return true;\r
+  private boolean jj_3R_162() {\r
+    if (jj_3R_168()) return true;\r
     return false;\r
   }\r
 \r
@@ -5659,50 +5665,50 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_167() {\r
+  private boolean jj_3R_168() {\r
     if (jj_scan_token(66)) return true;\r
-    if (jj_3R_170()) return true;\r
+    if (jj_3R_171()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_125() {\r
+  private boolean jj_3R_126() {\r
     if (jj_scan_token(76)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_163() {\r
+  private boolean jj_3R_164() {\r
     if (jj_3R_47()) return true;\r
     Token xsp;\r
     while (true) {\r
       xsp = jj_scanpos;\r
-      if (jj_3R_168()) { jj_scanpos = xsp; break; }\r
+      if (jj_3R_169()) { jj_scanpos = xsp; break; }\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_174() {\r
+  private boolean jj_3R_175() {\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_3R_160() {\r
+  private boolean jj_3R_161() {\r
     if (jj_scan_token(46)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_171() {\r
-    if (jj_3R_174()) return true;\r
+  private boolean jj_3R_172() {\r
+    if (jj_3R_175()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_151() {\r
+  private boolean jj_3R_152() {\r
     if (jj_scan_token(85)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_169() {\r
-    if (jj_3R_171()) return true;\r
+  private boolean jj_3R_170() {\r
+    if (jj_3R_172()) return true;\r
     return false;\r
   }\r
 \r
@@ -5714,18 +5720,18 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_165() {\r
+  private boolean jj_3R_166() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
     if (jj_3_10()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_169()) return true;\r
+    if (jj_3R_170()) return true;\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_166() {\r
-    if (jj_3R_165()) return true;\r
+  private boolean jj_3R_167() {\r
+    if (jj_3R_166()) return true;\r
     return false;\r
   }\r
 \r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jj b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jj
index 839340c836286c052a48fc95e8e18be3c3ed53f8..6c8fb79101ced0ee43ef8a08b1a344422cc4baee 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jj
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jj
@@ -193,7 +193,7 @@ void class_definition() : {/*@bgen(jjtree) class_definition */
     ( "encapsulated" )?\r
     ( "partial" )?\r
     ( "class" { jjtn000.op = "class"; } | "model" { jjtn000.op = "model"; } | "record" | "block" | ( "expandable" )? "connector" | "type" |\r
-    "package" | "function" { jjtn000.op = "function"; } | "operator" | "operator function" | "operator record" )\r
+    "package" { jjtn000.op = "package"; } | "function" { jjtn000.op = "function"; } | "operator" | "operator function" | "operator record" )\r
     class_specifier()/*@bgen(jjtree)*/\r
     } catch (Throwable jjte000) {\r
       if (jjtc000) {\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jjt b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jjt
index c65900fd944a24e1ddbb7c09040be32c1f0d2826..977d83d7ce37f61b67ec5204c1041c8ec5ac6628 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jjt
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jjt
@@ -121,7 +121,7 @@ void class_definition() : {
     ( "encapsulated" )?\r
     ( "partial" )?\r
     ( "class" { jjtThis.op = "class"; } | "model" { jjtThis.op = "model"; } | "record" | "block" | ( "expandable" )? "connector" | "type" |\r
-    "package" | "function" { jjtThis.op = "function"; } | "operator" | "operator function" | "operator record" )\r
+    "package" { jjtThis.op = "package"; } | "function" { jjtThis.op = "function"; } | "operator" | "operator function" | "operator record" )\r
     class_specifier()\r
 }\r
 \r