Table support for []-brackets

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@18508 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 fdb2894b4347ac41759a786993901c6882304f8a..5a64a01e7997d63fd1185c38c7eedb06b065c950 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java
@@ -1,3 +1,14 @@
+/*******************************************************************************\r
+ * Copyright (c) 2010 Association for Decentralized Information Management in\r
+ * Industry THTH ry.\r
+ * All rights reserved. This program and the accompanying materials\r
+ * are made available under the terms of the Eclipse Public License v1.0\r
+ * which accompanies this distribution, and is available at\r
+ * http://www.eclipse.org/legal/epl-v10.html\r
+ *\r
+ * Contributors:\r
+ *     VTT Technical Research Centre of Finland - initial API and implementation\r
+ *******************************************************************************/\r
 /* Generated By:JavaCC: Do not edit this line. ExpressionParser.java */\r
 package org.simantics.sysdyn.expressionParser;\r
 \r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserConstants.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserConstants.java
index 8af224865537f2f5df3b67d5a86b17584a8c29ce..9f7b09b14de08ae0185430dc3c85a962802dce43 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserConstants.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserConstants.java
@@ -1,3 +1,14 @@
+/*******************************************************************************\r
+ * Copyright (c) 2010 Association for Decentralized Information Management in\r
+ * Industry THTH ry.\r
+ * All rights reserved. This program and the accompanying materials\r
+ * are made available under the terms of the Eclipse Public License v1.0\r
+ * which accompanies this distribution, and is available at\r
+ * http://www.eclipse.org/legal/epl-v10.html\r
+ *\r
+ * Contributors:\r
+ *     VTT Technical Research Centre of Finland - initial API and implementation\r
+ *******************************************************************************/\r
 /* Generated By:JavaCC: Do not edit this line. ExpressionParserConstants.java */\r
 package org.simantics.sysdyn.expressionParser;\r
 \r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserTokenManager.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserTokenManager.java
index 2ca8a9d64de915a6a3fe64c248395b5db33dc38f..89a1a1d761b0490a0df90cecbbbc1d2f5966874b 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserTokenManager.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserTokenManager.java
@@ -1,3 +1,14 @@
+/*******************************************************************************\r
+ * Copyright (c) 2010 Association for Decentralized Information Management in\r
+ * Industry THTH ry.\r
+ * All rights reserved. This program and the accompanying materials\r
+ * are made available under the terms of the Eclipse Public License v1.0\r
+ * which accompanies this distribution, and is available at\r
+ * http://www.eclipse.org/legal/epl-v10.html\r
+ *\r
+ * Contributors:\r
+ *     VTT Technical Research Centre of Finland - initial API and implementation\r
+ *******************************************************************************/\r
 /* Generated By:JavaCC: Do not edit this line. ExpressionParserTokenManager.java */\r
 package org.simantics.sysdyn.expressionParser;\r
 import java.util.Set;\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/ParseException.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/ParseException.java
index 7a1085d80049af3655d2909a9c933968f0f4bbb9..57f889b6b889b7f33ad1ce1024393d96e58ec7e4 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/ParseException.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/ParseException.java
@@ -1,3 +1,14 @@
+/*******************************************************************************\r
+ * Copyright (c) 2010 Association for Decentralized Information Management in\r
+ * Industry THTH ry.\r
+ * All rights reserved. This program and the accompanying materials\r
+ * are made available under the terms of the Eclipse Public License v1.0\r
+ * which accompanies this distribution, and is available at\r
+ * http://www.eclipse.org/legal/epl-v10.html\r
+ *\r
+ * Contributors:\r
+ *     VTT Technical Research Centre of Finland - initial API and implementation\r
+ *******************************************************************************/\r
 /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 5.0 */\r
 /* JavaCCOptions:KEEP_LINE_COL=null */\r
 package org.simantics.sysdyn.tableParser;\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/SimpleCharStream.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/SimpleCharStream.java
index 0915e7c21c7ba2c2896f5f68ce928dc4b423c0e3..70ba9d997e68041df7dd8581ada7ba069c84d952 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/SimpleCharStream.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/SimpleCharStream.java
@@ -1,3 +1,14 @@
+/*******************************************************************************\r
+ * Copyright (c) 2010 Association for Decentralized Information Management in\r
+ * Industry THTH ry.\r
+ * All rights reserved. This program and the accompanying materials\r
+ * are made available under the terms of the Eclipse Public License v1.0\r
+ * which accompanies this distribution, and is available at\r
+ * http://www.eclipse.org/legal/epl-v10.html\r
+ *\r
+ * Contributors:\r
+ *     VTT Technical Research Centre of Finland - initial API and implementation\r
+ *******************************************************************************/\r
 /* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 5.0 */\r
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */\r
 package org.simantics.sysdyn.tableParser;\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/TableParser.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/TableParser.java
index 174d08706e1678faf1278a6df4dd742922779859..a8f1dd226834253ec7b9a71b878d7625b39f1c0f 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/TableParser.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/TableParser.java
@@ -19,22 +19,19 @@ public class TableParser implements TableParserConstants {
   final public void table() throws ParseException {\r
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
     case 64:\r
-      jj_consume_token(64);\r
-      table_element();\r
-      label_1:\r
-      while (true) {\r
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
-        case 71:\r
-          ;\r
-          break;\r
-        default:\r
-          jj_la1[0] = jj_gen;\r
-          break label_1;\r
-        }\r
-        jj_consume_token(71);\r
-        table_element();\r
+    case 66:\r
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
+      case 64:\r
+        curlyTable();\r
+        break;\r
+      case 66:\r
+        bracketTable();\r
+        break;\r
+      default:\r
+        jj_la1[0] = jj_gen;\r
+        jj_consume_token(-1);\r
+        throw new ParseException();\r
       }\r
-      jj_consume_token(65);\r
       break;\r
     default:\r
       jj_la1[1] = jj_gen;\r
@@ -43,12 +40,52 @@ public class TableParser implements TableParserConstants {
     jj_consume_token(0);\r
   }\r
 \r
-  final public void table_element() throws ParseException {\r
+  final public void curlyTable() throws ParseException {\r
+    jj_consume_token(64);\r
     jj_consume_token(64);\r
+    table_element();\r
+    jj_consume_token(65);\r
+    label_1:\r
+    while (true) {\r
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
+      case 71:\r
+        ;\r
+        break;\r
+      default:\r
+        jj_la1[2] = jj_gen;\r
+        break label_1;\r
+      }\r
+      jj_consume_token(71);\r
+      jj_consume_token(64);\r
+      table_element();\r
+      jj_consume_token(65);\r
+    }\r
+    jj_consume_token(65);\r
+  }\r
+\r
+  final public void bracketTable() throws ParseException {\r
+    jj_consume_token(66);\r
+    table_element();\r
+    label_2:\r
+    while (true) {\r
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
+      case 70:\r
+        ;\r
+        break;\r
+      default:\r
+        jj_la1[3] = jj_gen;\r
+        break label_2;\r
+      }\r
+      jj_consume_token(70);\r
+      table_element();\r
+    }\r
+    jj_consume_token(67);\r
+  }\r
+\r
+  final public void table_element() throws ParseException {\r
     x_value();\r
     jj_consume_token(71);\r
     y_value();\r
-    jj_consume_token(65);\r
   }\r
 \r
   final public void x_value() throws ParseException {\r
@@ -73,7 +110,7 @@ public class TableParser implements TableParserConstants {
       jj_consume_token(SIGNED_NUMBER);\r
       break;\r
     default:\r
-      jj_la1[2] = jj_gen;\r
+      jj_la1[4] = jj_gen;\r
       jj_consume_token(-1);\r
       throw new ParseException();\r
     }\r
@@ -88,7 +125,7 @@ public class TableParser implements TableParserConstants {
   public Token jj_nt;\r
   private int jj_ntk;\r
   private int jj_gen;\r
-  final private int[] jj_la1 = new int[3];\r
+  final private int[] jj_la1 = new int[5];\r
   static private int[] jj_la1_0;\r
   static private int[] jj_la1_1;\r
   static private int[] jj_la1_2;\r
@@ -98,13 +135,13 @@ public class TableParser implements TableParserConstants {
       jj_la1_init_2();\r
    }\r
    private static void jj_la1_init_0() {\r
-      jj_la1_0 = new int[] {0x0,0x0,0x0,};\r
+      jj_la1_0 = new int[] {0x0,0x0,0x0,0x0,0x0,};\r
    }\r
    private static void jj_la1_init_1() {\r
-      jj_la1_1 = new int[] {0x0,0x0,0x0,};\r
+      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,};\r
    }\r
    private static void jj_la1_init_2() {\r
-      jj_la1_2 = new int[] {0x80,0x1,0x70000000,};\r
+      jj_la1_2 = new int[] {0x5,0x5,0x80,0x40,0x70000000,};\r
    }\r
 \r
   /** Constructor with InputStream. */\r
@@ -118,7 +155,7 @@ public class TableParser implements TableParserConstants {
     token = new Token();\r
     jj_ntk = -1;\r
     jj_gen = 0;\r
-    for (int i = 0; i < 3; i++) jj_la1[i] = -1;\r
+    for (int i = 0; i < 5; i++) jj_la1[i] = -1;\r
   }\r
 \r
   /** Reinitialise. */\r
@@ -132,7 +169,7 @@ public class TableParser implements TableParserConstants {
     token = new Token();\r
     jj_ntk = -1;\r
     jj_gen = 0;\r
-    for (int i = 0; i < 3; i++) jj_la1[i] = -1;\r
+    for (int i = 0; i < 5; i++) jj_la1[i] = -1;\r
   }\r
 \r
   /** Constructor. */\r
@@ -142,7 +179,7 @@ public class TableParser implements TableParserConstants {
     token = new Token();\r
     jj_ntk = -1;\r
     jj_gen = 0;\r
-    for (int i = 0; i < 3; i++) jj_la1[i] = -1;\r
+    for (int i = 0; i < 5; i++) jj_la1[i] = -1;\r
   }\r
 \r
   /** Reinitialise. */\r
@@ -152,7 +189,7 @@ public class TableParser implements TableParserConstants {
     token = new Token();\r
     jj_ntk = -1;\r
     jj_gen = 0;\r
-    for (int i = 0; i < 3; i++) jj_la1[i] = -1;\r
+    for (int i = 0; i < 5; i++) jj_la1[i] = -1;\r
   }\r
 \r
   /** Constructor with generated Token Manager. */\r
@@ -161,7 +198,7 @@ public class TableParser implements TableParserConstants {
     token = new Token();\r
     jj_ntk = -1;\r
     jj_gen = 0;\r
-    for (int i = 0; i < 3; i++) jj_la1[i] = -1;\r
+    for (int i = 0; i < 5; i++) jj_la1[i] = -1;\r
   }\r
 \r
   /** Reinitialise. */\r
@@ -170,7 +207,7 @@ public class TableParser implements TableParserConstants {
     token = new Token();\r
     jj_ntk = -1;\r
     jj_gen = 0;\r
-    for (int i = 0; i < 3; i++) jj_la1[i] = -1;\r
+    for (int i = 0; i < 5; i++) jj_la1[i] = -1;\r
   }\r
 \r
   private Token jj_consume_token(int kind) throws ParseException {\r
@@ -226,7 +263,7 @@ public class TableParser implements TableParserConstants {
       la1tokens[jj_kind] = true;\r
       jj_kind = -1;\r
     }\r
-    for (int i = 0; i < 3; i++) {\r
+    for (int i = 0; i < 5; i++) {\r
       if (jj_la1[i] == jj_gen) {\r
         for (int j = 0; j < 32; j++) {\r
           if ((jj_la1_0[i] & (1<<j)) != 0) {\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/TableParser.jj b/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/TableParser.jj
index cf6994b18acaf60a10b3b3562bd8788dd694fdea..74caa34c3de5c19a9dbf921aabca0aeeb5f8545c 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/TableParser.jj
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/TableParser.jj
@@ -68,12 +68,19 @@ TOKEN:
 \r
 void table() : {\r
 } {\r
-       ( "{" table_element() ( "," table_element() )* "}" )? <EOF>\r
+        ( curlyTable() | bracketTable())? <EOF>\r
 }\r
 \r
+void curlyTable() : {\r} {\r
+       ( "{" "{" table_element() "}" ( "," "{" table_element() "}" )* "}" )\r
+} \r\r
+void bracketTable() : {\r} {\r
+       ( "[" table_element() ( ";" table_element() )* "]" )\r
+}\r  \r
+\r
 void table_element() : {\r
 } {\r
-       "{" x_value() "," y_value() "}"\r
+       (x_value() "," y_value())\r
 } \r
 \r
 void x_value() : {\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/Token.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/Token.java
index 599df35d83cb701a600e4a9b6e3372c0da6f9cf8..e5636f307f9a75a4edaf8b58f667123cd6566ad9 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/Token.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/Token.java
@@ -1,3 +1,14 @@
+/*******************************************************************************\r
+ * Copyright (c) 2010 Association for Decentralized Information Management in\r
+ * Industry THTH ry.\r
+ * All rights reserved. This program and the accompanying materials\r
+ * are made available under the terms of the Eclipse Public License v1.0\r
+ * which accompanies this distribution, and is available at\r
+ * http://www.eclipse.org/legal/epl-v10.html\r
+ *\r
+ * Contributors:\r
+ *     VTT Technical Research Centre of Finland - initial API and implementation\r
+ *******************************************************************************/\r
 /* Generated By:JavaCC: Do not edit this line. Token.java Version 5.0 */\r
 /* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */\r
 package org.simantics.sysdyn.tableParser;\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/TokenMgrError.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/TokenMgrError.java
index d96d9779a596f66a787abd0a9df0a739825ac9b5..49dbdbf97a4215165328f296017bcd969160cf7b 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/TokenMgrError.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/TokenMgrError.java
@@ -1,3 +1,14 @@
+/*******************************************************************************\r
+ * Copyright (c) 2010 Association for Decentralized Information Management in\r
+ * Industry THTH ry.\r
+ * All rights reserved. This program and the accompanying materials\r
+ * are made available under the terms of the Eclipse Public License v1.0\r
+ * which accompanies this distribution, and is available at\r
+ * http://www.eclipse.org/legal/epl-v10.html\r
+ *\r
+ * Contributors:\r
+ *     VTT Technical Research Centre of Finland - initial API and implementation\r
+ *******************************************************************************/\r
 /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 5.0 */\r
 /* JavaCCOptions: */\r
 package org.simantics.sysdyn.tableParser;\r