Fix to different tab sizes, generated classes (refs #4448).

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@27903 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 b7bb6f4a8a00a7e242e9d7050a1104cd58b6fd72..a369e706e8aa9619437c1937c6ed757150cd3b9c 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java
@@ -72,6 +72,7 @@ public class ExpressionParser implements ExpressionParserConstants {
 // [ add_op ] -> ( add_op() )?\r
 // { add_op term } -> ( add_op() term() )*\r
   final public void expr() throws ParseException {\r
+        jj_input_stream.setTabSize(1);\r
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
     case 6:\r
     case 12:\r
@@ -966,16 +967,6 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_50() {\r
-    if (jj_3R_14()) return true;\r
-    Token xsp;\r
-    xsp = jj_scanpos;\r
-    if (jj_3R_55()) jj_scanpos = xsp;\r
-    xsp = jj_scanpos;\r
-    if (jj_3R_56()) jj_scanpos = xsp;\r
-    return false;\r
-  }\r
-\r
   private boolean jj_3R_35() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
@@ -998,6 +989,16 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
+  private boolean jj_3R_50() {\r
+    if (jj_3R_14()) return true;\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_55()) jj_scanpos = xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_56()) jj_scanpos = xsp;\r
+    return false;\r
+  }\r
+\r
   private boolean jj_3R_23() {\r
     if (jj_scan_token(67)) return true;\r
     if (jj_3R_22()) return true;\r
@@ -1047,14 +1048,6 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_12() {\r
-    if (jj_3R_14()) return true;\r
-    Token xsp;\r
-    xsp = jj_scanpos;\r
-    if (jj_3R_15()) jj_scanpos = xsp;\r
-    return false;\r
-  }\r
-\r
   private boolean jj_3R_24() {\r
     if (jj_3R_27()) return true;\r
     Token xsp;\r
@@ -1065,12 +1058,30 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
+  private boolean jj_3R_12() {\r
+    if (jj_3R_14()) return true;\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_15()) jj_scanpos = xsp;\r
+    return false;\r
+  }\r
+\r
   private boolean jj_3R_74() {\r
     if (jj_scan_token(69)) return true;\r
     if (jj_3R_73()) return true;\r
     return false;\r
   }\r
 \r
+  private boolean jj_3R_22() {\r
+    if (jj_3R_24()) return true;\r
+    Token xsp;\r
+    while (true) {\r
+      xsp = jj_scanpos;\r
+      if (jj_3R_25()) { jj_scanpos = xsp; break; }\r
+    }\r
+    return false;\r
+  }\r
+\r
   private boolean jj_3R_65() {\r
     if (jj_scan_token(69)) return true;\r
     if (jj_3R_53()) return true;\r
@@ -1093,16 +1104,6 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_22() {\r
-    if (jj_3R_24()) return true;\r
-    Token xsp;\r
-    while (true) {\r
-      xsp = jj_scanpos;\r
-      if (jj_3R_25()) { jj_scanpos = xsp; break; }\r
-    }\r
-    return false;\r
-  }\r
-\r
   private boolean jj_3R_76() {\r
     if (jj_3R_14()) return true;\r
     return false;\r
@@ -1139,11 +1140,6 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
-  private boolean jj_3_2() {\r
-    if (jj_3R_13()) return true;\r
-    return false;\r
-  }\r
-\r
   private boolean jj_3R_52() {\r
     if (jj_scan_token(68)) return true;\r
     if (jj_3R_51()) return true;\r
@@ -1165,6 +1161,11 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
+  private boolean jj_3_2() {\r
+    if (jj_3R_13()) return true;\r
+    return false;\r
+  }\r
+\r
   private boolean jj_3R_70() {\r
     if (jj_3R_73()) return true;\r
     Token xsp;\r
@@ -1241,11 +1242,6 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_54() {\r
-    if (jj_3R_53()) return true;\r
-    return false;\r
-  }\r
-\r
   private boolean jj_3R_14() {\r
     if (jj_scan_token(IDENT)) return true;\r
     Token xsp;\r
@@ -1254,9 +1250,8 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_68() {\r
-    if (jj_3R_12()) return true;\r
-    if (jj_3R_49()) return true;\r
+  private boolean jj_3R_54() {\r
+    if (jj_3R_53()) return true;\r
     return false;\r
   }\r
 \r
@@ -1266,12 +1261,9 @@ void named_arguments() : {
     return false;\r
   }\r
 \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_54()) jj_scanpos = xsp;\r
-    if (jj_scan_token(61)) return true;\r
+  private boolean jj_3R_68() {\r
+    if (jj_3R_12()) return true;\r
+    if (jj_3R_49()) return true;\r
     return false;\r
   }\r
 \r
@@ -1281,6 +1273,15 @@ void named_arguments() : {
     return false;\r
   }\r
 \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_54()) jj_scanpos = xsp;\r
+    if (jj_scan_token(61)) return true;\r
+    return false;\r
+  }\r
+\r
   private boolean jj_3R_46() {\r
     if (jj_scan_token(62)) return true;\r
     if (jj_3R_53()) return true;\r
@@ -1300,11 +1301,6 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_55() {\r
-    if (jj_3R_60()) return true;\r
-    return false;\r
-  }\r
-\r
   private boolean jj_3R_44() {\r
     if (jj_scan_token(60)) return true;\r
     if (jj_3R_16()) return true;\r
@@ -1312,6 +1308,11 @@ void named_arguments() : {
     return false;\r
   }\r
 \r
+  private boolean jj_3R_55() {\r
+    if (jj_3R_60()) return true;\r
+    return false;\r
+  }\r
+\r
   private boolean jj_3R_67() {\r
     if (jj_scan_token(67)) return true;\r
     return false;\r
@@ -1357,12 +1358,6 @@ void named_arguments() : {
     return false;\r
   }\r
 \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_39() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
@@ -1400,6 +1395,12 @@ void named_arguments() : {
     return false;\r
   }\r
 \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_60() {\r
     if (jj_scan_token(64)) return true;\r
     if (jj_3R_63()) return true;\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 77ae566a00604db4d065330882dd3d19c7e05c86..eb87c0d939c45040ad2996495739857f8906f646 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelParser.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelParser.java
@@ -47,6 +47,7 @@ public class ModelParser implements ModelParserConstants {
 // [ add_op ] -> ( add_op() )?\r
 // { add_op term } -> ( add_op() term() )*\r
   final public void parse() throws ParseException {\r
+        jj_input_stream.setTabSize(1);\r
     stored_definition();\r
     jj_consume_token(0);\r
   }\r
@@ -2684,11 +2685,6 @@ public class ModelParser implements ModelParserConstants {
     finally { jj_save(9, xla); }\r
   }\r
 \r
-  private boolean jj_3R_51() {\r
-    if (jj_scan_token(59)) return true;\r
-    return false;\r
-  }\r
-\r
   private boolean jj_3R_50() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
@@ -3579,6 +3575,11 @@ public class ModelParser implements ModelParserConstants {
     return false;\r
   }\r
 \r
+  private boolean jj_3R_51() {\r
+    if (jj_scan_token(59)) return true;\r
+    return false;\r
+  }\r
+\r
   /** Generated Token Manager. */\r
   public ModelParserTokenManager token_source;\r
   SimpleCharStream jj_input_stream;\r