Merged changes from SVN

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

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLLexer.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLLexer.java
index e23a9a17c720c3704745d31b32aca11391f42c26..e3111279029743dda253292caf2b37508c5440fc 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLLexer.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLLexer.java
@@ -1,12 +1,12 @@
 /* The following code was generated by JFlex 1.6.1 */\r
 \r
-package org.simantics.scl.compiler.internal.parsing.parser;
-
-import org.simantics.scl.compiler.internal.parsing.Token;
-import org.simantics.scl.compiler.errors.Locations;
-import org.simantics.scl.compiler.internal.parsing.exceptions.SCLSyntaxErrorException;
-import gnu.trove.list.array.TIntArrayList;
-
+package org.simantics.scl.compiler.internal.parsing.parser;\r
+\r
+import org.simantics.scl.compiler.internal.parsing.Token;\r
+import org.simantics.scl.compiler.errors.Locations;\r
+import org.simantics.scl.compiler.internal.parsing.exceptions.SCLSyntaxErrorException;\r
+import gnu.trove.list.array.TIntArrayList;\r
+\r
 \r
 /**\r
  * This class is a scanner generated by \r
@@ -562,20 +562,20 @@ public class SCLLexer {
   private int zzFinalHighSurrogate = 0;\r
 \r
   /* user code: */\r
-    public SCLParserOptions options = SCLParserOptions.DEFAULT;
-    int stringStart;
-    TIntArrayList parenCountStack = new TIntArrayList(2);
-    int parenCount = 0;
-    TIntArrayList stateStack = new TIntArrayList(2);
-
-    StringBuffer string = new StringBuffer();
-    
-    private Token sym(int id) {
-        return new Token(id, yychar, yychar+yylength(), yytext());
-    }
-    private Token sym(int id, String text) {
-        return new Token(id, yychar, yychar+yylength(), text);
-    }
+    public SCLParserOptions options = SCLParserOptions.DEFAULT;\r
+    int stringStart;\r
+    TIntArrayList parenCountStack = new TIntArrayList(2);\r
+    int parenCount = 0;\r
+    TIntArrayList stateStack = new TIntArrayList(2);\r
+\r
+    StringBuffer string = new StringBuffer();\r
+    \r
+    private Token sym(int id) {\r
+        return new Token(id, yychar, yychar+yylength(), yytext());\r
+    }\r
+    private Token sym(int id, String text) {\r
+        return new Token(id, yychar, yychar+yylength(), text);\r
+    }\r
 \r
 \r
   /**\r
@@ -900,7 +900,7 @@ public class SCLLexer {
             }\r
             case 278: break;\r
             default:\r
-          {     return sym(SCLTerminals.EOF);
+          {     return sym(SCLTerminals.EOF);\r
  }\r
         }\r
       }\r
@@ -943,15 +943,15 @@ public class SCLLexer {
             }\r
           case 101: break;\r
           case 10: \r
-            { --parenCount;
-                    if(parenCount == 0 && !parenCountStack.isEmpty()) { 
-                       parenCount = parenCountStack.removeAt(parenCountStack.size()-1);
-                       string.setLength(0);
-                       stringStart=yychar;
-                       yybegin(stateStack.removeAt(stateStack.size()-1));
-                       return sym(SCLTerminals.CONTINUE_STRING);
-                    }
-                    else
+            { --parenCount;\r
+                    if(parenCount == 0 && !parenCountStack.isEmpty()) { \r
+                       parenCount = parenCountStack.removeAt(parenCountStack.size()-1);\r
+                       string.setLength(0);\r
+                       stringStart=yychar;\r
+                       yybegin(stateStack.removeAt(stateStack.size()-1));\r
+                       return sym(SCLTerminals.CONTINUE_STRING);\r
+                    }\r
+                    else\r
                        return sym(SCLTerminals.RPAREN);\r
             }\r
           case 102: break;\r
@@ -1036,7 +1036,7 @@ public class SCLLexer {
             }\r
           case 122: break;\r
           case 31: \r
-            { yybegin(YYINITIAL); 
+            { yybegin(YYINITIAL); \r
                     return new Token(SCLTerminals.END_STRING, stringStart, yychar+1, string.toString());\r
             }\r
           case 123: break;\r
@@ -1113,10 +1113,10 @@ public class SCLLexer {
             }\r
           case 141: break;\r
           case 50: \r
-            { parenCountStack.add(parenCount);
-                    parenCount = 1;
-                    stateStack.add(STRING);
-                    yybegin(YYINITIAL); 
+            { parenCountStack.add(parenCount);\r
+                    parenCount = 1;\r
+                    stateStack.add(STRING);\r
+                    yybegin(YYINITIAL); \r
                     return new Token(SCLTerminals.SUSPEND_STRING, stringStart, yychar+1, string.toString());\r
             }\r
           case 142: break;\r
@@ -1129,10 +1129,10 @@ public class SCLLexer {
             }\r
           case 144: break;\r
           case 53: \r
-            { parenCountStack.add(parenCount);
-                    parenCount = 1;
-                    stateStack.add(LONG_STRING);
-                    yybegin(YYINITIAL); 
+            { parenCountStack.add(parenCount);\r
+                    parenCount = 1;\r
+                    stateStack.add(LONG_STRING);\r
+                    yybegin(YYINITIAL); \r
                     return new Token(SCLTerminals.SUSPEND_STRING, stringStart, yychar+1, string.toString());\r
             }\r
           case 145: break;\r
@@ -1145,12 +1145,12 @@ public class SCLLexer {
             }\r
           case 147: break;\r
           case 56: \r
-            { String text = yytext();
+            { String text = yytext();\r
                      return sym(SCLTerminals.ID, text.substring(1, text.length()-1));\r
             }\r
           case 148: break;\r
           case 57: \r
-            { String text = yytext();
+            { String text = yytext();\r
                      return sym(SCLTerminals.SYMBOL, text.substring(1, text.length()-1));\r
             }\r
           case 149: break;\r
@@ -1171,7 +1171,7 @@ public class SCLLexer {
             }\r
           case 153: break;\r
           case 62: \r
-            { yybegin(YYINITIAL); 
+            { yybegin(YYINITIAL); \r
                       return new Token(SCLTerminals.END_STRING, stringStart, yychar+3, string.toString());\r
             }\r
           case 154: break;\r