From: miettinen <miettinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Tue, 1 Oct 2013 06:25:37 +0000 (+0000)
Subject: Fix to different tab sizes, generated classes (refs #4448).
X-Git-Tag: 1.8.1~239
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=ddd0c09d3b7d51b98c4094ee5b6bf903b343eaeb;p=simantics%2Fsysdyn.git

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 b7bb6f4a..a369e706 100644
--- 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() )?
 // { add_op term } -> ( add_op() term() )*
   final public void expr() throws ParseException {
+        jj_input_stream.setTabSize(1);
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case 6:
     case 12:
@@ -966,16 +967,6 @@ void named_arguments() : {
     return false;
   }
 
-  private boolean jj_3R_50() {
-    if (jj_3R_14()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_55()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_56()) jj_scanpos = xsp;
-    return false;
-  }
-
   private boolean jj_3R_35() {
     Token xsp;
     xsp = jj_scanpos;
@@ -998,6 +989,16 @@ void named_arguments() : {
     return false;
   }
 
+  private boolean jj_3R_50() {
+    if (jj_3R_14()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_55()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_56()) jj_scanpos = xsp;
+    return false;
+  }
+
   private boolean jj_3R_23() {
     if (jj_scan_token(67)) return true;
     if (jj_3R_22()) return true;
@@ -1047,14 +1048,6 @@ void named_arguments() : {
     return false;
   }
 
-  private boolean jj_3R_12() {
-    if (jj_3R_14()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_15()) jj_scanpos = xsp;
-    return false;
-  }
-
   private boolean jj_3R_24() {
     if (jj_3R_27()) return true;
     Token xsp;
@@ -1065,12 +1058,30 @@ void named_arguments() : {
     return false;
   }
 
+  private boolean jj_3R_12() {
+    if (jj_3R_14()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_15()) jj_scanpos = xsp;
+    return false;
+  }
+
   private boolean jj_3R_74() {
     if (jj_scan_token(69)) return true;
     if (jj_3R_73()) return true;
     return false;
   }
 
+  private boolean jj_3R_22() {
+    if (jj_3R_24()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_25()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
   private boolean jj_3R_65() {
     if (jj_scan_token(69)) return true;
     if (jj_3R_53()) return true;
@@ -1093,16 +1104,6 @@ void named_arguments() : {
     return false;
   }
 
-  private boolean jj_3R_22() {
-    if (jj_3R_24()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_25()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
   private boolean jj_3R_76() {
     if (jj_3R_14()) return true;
     return false;
@@ -1139,11 +1140,6 @@ void named_arguments() : {
     return false;
   }
 
-  private boolean jj_3_2() {
-    if (jj_3R_13()) return true;
-    return false;
-  }
-
   private boolean jj_3R_52() {
     if (jj_scan_token(68)) return true;
     if (jj_3R_51()) return true;
@@ -1165,6 +1161,11 @@ void named_arguments() : {
     return false;
   }
 
+  private boolean jj_3_2() {
+    if (jj_3R_13()) return true;
+    return false;
+  }
+
   private boolean jj_3R_70() {
     if (jj_3R_73()) return true;
     Token xsp;
@@ -1241,11 +1242,6 @@ void named_arguments() : {
     return false;
   }
 
-  private boolean jj_3R_54() {
-    if (jj_3R_53()) return true;
-    return false;
-  }
-
   private boolean jj_3R_14() {
     if (jj_scan_token(IDENT)) return true;
     Token xsp;
@@ -1254,9 +1250,8 @@ void named_arguments() : {
     return false;
   }
 
-  private boolean jj_3R_68() {
-    if (jj_3R_12()) return true;
-    if (jj_3R_49()) return true;
+  private boolean jj_3R_54() {
+    if (jj_3R_53()) return true;
     return false;
   }
 
@@ -1266,12 +1261,9 @@ void named_arguments() : {
     return false;
   }
 
-  private boolean jj_3R_49() {
-    if (jj_scan_token(60)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_54()) jj_scanpos = xsp;
-    if (jj_scan_token(61)) return true;
+  private boolean jj_3R_68() {
+    if (jj_3R_12()) return true;
+    if (jj_3R_49()) return true;
     return false;
   }
 
@@ -1281,6 +1273,15 @@ void named_arguments() : {
     return false;
   }
 
+  private boolean jj_3R_49() {
+    if (jj_scan_token(60)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_54()) jj_scanpos = xsp;
+    if (jj_scan_token(61)) return true;
+    return false;
+  }
+
   private boolean jj_3R_46() {
     if (jj_scan_token(62)) return true;
     if (jj_3R_53()) return true;
@@ -1300,11 +1301,6 @@ void named_arguments() : {
     return false;
   }
 
-  private boolean jj_3R_55() {
-    if (jj_3R_60()) return true;
-    return false;
-  }
-
   private boolean jj_3R_44() {
     if (jj_scan_token(60)) return true;
     if (jj_3R_16()) return true;
@@ -1312,6 +1308,11 @@ void named_arguments() : {
     return false;
   }
 
+  private boolean jj_3R_55() {
+    if (jj_3R_60()) return true;
+    return false;
+  }
+
   private boolean jj_3R_67() {
     if (jj_scan_token(67)) return true;
     return false;
@@ -1357,12 +1358,6 @@ void named_arguments() : {
     return false;
   }
 
-  private boolean jj_3R_57() {
-    if (jj_scan_token(69)) return true;
-    if (jj_3R_16()) return true;
-    return false;
-  }
-
   private boolean jj_3R_39() {
     Token xsp;
     xsp = jj_scanpos;
@@ -1400,6 +1395,12 @@ void named_arguments() : {
     return false;
   }
 
+  private boolean jj_3R_57() {
+    if (jj_scan_token(69)) return true;
+    if (jj_3R_16()) return true;
+    return false;
+  }
+
   private boolean jj_3R_60() {
     if (jj_scan_token(64)) return true;
     if (jj_3R_63()) return true;
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 77ae566a..eb87c0d9 100644
--- 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() )?
 // { add_op term } -> ( add_op() term() )*
   final public void parse() throws ParseException {
+        jj_input_stream.setTabSize(1);
     stored_definition();
     jj_consume_token(0);
   }
@@ -2684,11 +2685,6 @@ public class ModelParser implements ModelParserConstants {
     finally { jj_save(9, xla); }
   }
 
-  private boolean jj_3R_51() {
-    if (jj_scan_token(59)) return true;
-    return false;
-  }
-
   private boolean jj_3R_50() {
     Token xsp;
     xsp = jj_scanpos;
@@ -3579,6 +3575,11 @@ public class ModelParser implements ModelParserConstants {
     return false;
   }
 
+  private boolean jj_3R_51() {
+    if (jj_scan_token(59)) return true;
+    return false;
+  }
+
   /** Generated Token Manager. */
   public ModelParserTokenManager token_source;
   SimpleCharStream jj_input_stream;