Merged changes from SVN

[simantics/platform.git] / bundles / org.simantics.scl.compiler / src / org / simantics / scl / compiler / internal / parsing / parser / SCLParser.java

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.java
index bde7f10b4a46dc525b035823c454f124ad8433f2..ac61c901002bf20854505ed3f45419576468210e 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.java
@@ -13,7 +13,7 @@ public abstract class SCLParser {
     public static final boolean TRACE = false;\r
 \r
     private static final int INITIAL_CAPACITY = 16;\r
-    private static final int STATE_COUNT = 323;\r
+    private static final int STATE_COUNT = 324;\r
     private static final int TERMINAL_COUNT = 79;\r
     private static final int NONTERMINAL_COUNT = 49;\r
     private static final int PRODUCT_COUNT = 126;\r
@@ -21,7 +21,7 @@ public abstract class SCLParser {
     private static final int[] ACTION_ROW_ID = new int[STATE_COUNT];\r
     private static final int[] ACTION_COLUMN_ID = new int[TERMINAL_COUNT];\r
     private static final short[] ACTION_TABLE = new short[5508];\r
-    private static final int[] ERROR_TABLE = new int[798];\r
+    private static final int[] ERROR_TABLE = new int[800];\r
     private static final int[] GOTO_ROW_ID = new int[STATE_COUNT];\r
     private static final int[] GOTO_COLUMN_ID = new int[NONTERMINAL_COUNT];\r
     private static final short[] GOTO_TABLE = new short[1620];\r
@@ -362,19 +362,19 @@ public abstract class SCLParser {
         return parse(0);\r
     }\r
     public Object parseCommands() {\r
-        return parse(308);\r
+        return parse(309);\r
     }\r
     public Object parseImport() {\r
-        return parse(315);\r
+        return parse(316);\r
     }\r
     public Object parseType() {\r
-        return parse(317);\r
+        return parse(318);\r
     }\r
     public Object parseExp() {\r
-        return parse(319);\r
+        return parse(320);\r
     }\r
     public Object parseEquationBlock() {\r
-        return parse(321);\r
+        return parse(322);\r
     }\r
 \r
 \r
@@ -945,7 +945,7 @@ public abstract class SCLParser {
      */\r
     protected abstract Object reduceFieldDescription();\r
     /**\r
-     * statements ::= LBRACE statement (SEMICOLON statement)* RBRACE\r
+     * statements ::= LBRACE (statement (SEMICOLON (statement SEMICOLON)* statement)?)? RBRACE\r
      */\r
     protected abstract Object reduceStatements();\r
     /**\r