Bug 12354 fixed: In SciNotes, invalid function with a semicolon after args declaration 22/10722/1
Calixte DENIZET [Thu, 7 Mar 2013 10:08:31 +0000 (11:08 +0100)]
Change-Id: Ib2712d377995057f38b05988fe297b569d21a910

scilab/CHANGES_5.4.X
scilab/modules/scinotes/src/java/jflex/function.jflex
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/FunctionScanner.java

index 44000a3..78ce8d3 100644 (file)
@@ -474,6 +474,9 @@ Bug fixes
 
 * Bug #12348 fixed - surf() disable lines(n) if there is no input variable.
 
+* Bug #12354 fixed - In SciNotes, invalid function with a semicolon after args
+                     declaration.
+
 
                     Changes between version 5.3.3 and 5.4.0
                     =======================================
index da1573a..3149fe7 100644 (file)
@@ -99,8 +99,8 @@ import javax.swing.text.Element;
 white = [ \t]+
 eol = \n
 
-comments = {white}*("//".*)?{eol}
-break = ".."(".")*{comments}
+comments = ("//".*)?{eol}
+break = ".."(".")*{white}*{comments}
 
 brokenline = ([^\.]* | ([^\.]*"."[^\.]+)+){break}
 
@@ -109,7 +109,7 @@ spec = [^a-zA-Z0-9_#!$?]?
 
 equal = {white}* "=" {white}*
 
-rpar = ")"{comments}
+rpar = ")"[,; \t]*{comments}
 
 fun = {white}* "function" {white}
 funb = {white}* "function["
index 436a47b..02bdf1f 100644 (file)
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.4.3 on 23/05/12 15:23 */
+/* The following code was generated by JFlex 1.4.3 on 07/03/13 11:06 */
 
 //CHECKSTYLE:OFF
 
@@ -15,8 +15,8 @@ import javax.swing.text.Element;
 /**
  * This class is a scanner generated by
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.3
- * on 23/05/12 15:23 from the specification file
- * <tt>./jflex/function.jflex</tt>
+ * on 07/03/13 11:06 from the specification file
+ * <tt>function.jflex</tt>
  */
 public final class FunctionScanner {
 
@@ -50,10 +50,10 @@ public final class FunctionScanner {
      */
     private static final String ZZ_CMAP_PACKED =
         "\11\0\1\1\1\2\25\0\1\1\1\7\1\0\2\7\1\5\2\0" +
-        "\1\24\1\11\2\0\1\25\1\0\1\4\1\3\12\6\3\0\1\10" +
-        "\1\0\1\7\1\0\32\7\1\21\1\0\1\26\1\0\1\7\1\0" +
-        "\2\7\1\15\1\23\1\22\1\12\2\7\1\17\4\7\1\14\1\20" +
-        "\4\7\1\16\1\13\5\7\uff85\0";
+        "\1\25\1\11\2\0\1\26\1\0\1\4\1\3\12\6\1\0\1\12" +
+        "\1\0\1\10\1\0\1\7\1\0\32\7\1\22\1\0\1\27\1\0" +
+        "\1\7\1\0\2\7\1\16\1\24\1\23\1\13\2\7\1\20\4\7" +
+        "\1\15\1\21\4\7\1\17\1\14\5\7\uff85\0";
 
     /**
      * Translates characters to character classes
@@ -68,11 +68,11 @@ public final class FunctionScanner {
     private static final String ZZ_ACTION_PACKED_0 =
         "\7\0\4\1\1\2\1\3\1\4\1\5\1\1\1\6" +
         "\1\7\1\1\1\10\1\1\1\11\1\12\1\4\1\13" +
-        "\1\4\2\1\1\14\1\1\2\15\13\0\1\16\7\0" +
+        "\1\4\2\1\1\14\1\1\2\15\11\0\1\16\10\0" +
         "\1\17\14\0\1\20\2\0\2\21";
 
     private static int [] zzUnpackAction() {
-        int [] result = new int[69];
+        int [] result = new int[68];
         int offset = 0;
         offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
         return result;
@@ -85,8 +85,9 @@ public final class FunctionScanner {
         while (i < l) {
             int count = packed.charAt(i++);
             int value = packed.charAt(i++);
-            do result[j++] = value;
-            while (--count > 0);
+            do {
+                result[j++] = value;
+            } while (--count > 0);
         }
         return j;
     }
@@ -254,11 +255,12 @@ public final class FunctionScanner {
         char [] map = new char[0x10000];
         int i = 0;  /* index in packed string  */
         int j = 0;  /* index in unpacked array */
-        while (i < 90) {
+        while (i < 94) {
             int  count = packed.charAt(i++);
             char value = packed.charAt(i++);
-            do map[j++] = value;
-            while (--count > 0);
+            do {
+                map[j++] = value;
+            } while (--count > 0);
         }
         return map;
     }
@@ -325,8 +327,9 @@ public final class FunctionScanner {
         zzAtEOF = true;            /* indicate end of file */
         zzEndRead = zzStartRead;  /* invalidate buffer    */
 
-        if (zzReader != null)
+        if (zzReader != null) {
             zzReader.close();
+        }
     }
 
 
@@ -403,7 +406,7 @@ public final class FunctionScanner {
 
 
     /**
-     * Reports an error that occurred while scanning.
+     * Reports an error that occured while scanning.
      *
      * In a wellformed scanner (no or only correct usage of
      * yypushback(int) and a match-all fallback rule) this method
@@ -437,8 +440,9 @@ public final class FunctionScanner {
      *                This number must not be greater than yylength()!
      */
     public void yypushback(int number)  {
-        if ( number > yylength() )
+        if ( number > yylength() ) {
             zzScanError(ZZ_PUSHBACK_2BIG);
+        }
 
         zzMarkedPos -= number;
     }
@@ -478,9 +482,9 @@ public final class FunctionScanner {
             zzForAction: {
                 while (true) {
 
-                    if (zzCurrentPosL < zzEndReadL)
+                    if (zzCurrentPosL < zzEndReadL) {
                         zzInput = zzBufferL[zzCurrentPosL++];
-                    else if (zzAtEOF) {
+                    } else if (zzAtEOF) {
                         zzInput = YYEOF;
                         break zzForAction;
                     } else {
@@ -513,11 +517,11 @@ public final class FunctionScanner {
                                         zzIsFinal = true;
                                         zzState = 8;
                                         break zzForNext;
-                                    case 10:
+                                    case 11:
                                         zzIsFinal = true;
                                         zzState = 9;
                                         break zzForNext;
-                                    case 18:
+                                    case 19:
                                         zzIsFinal = true;
                                         zzState = 10;
                                         break zzForNext;
@@ -532,19 +536,19 @@ public final class FunctionScanner {
                                 switch (zzInput) {
                                     case 5:
                                     case 7:
-                                    case 10:
                                     case 11:
                                     case 12:
                                     case 13:
                                     case 14:
                                     case 15:
                                     case 16:
-                                    case 18:
+                                    case 17:
                                     case 19:
+                                    case 20:
                                         zzIsFinal = true;
                                         zzState = 11;
                                         break zzForNext;
-                                    case 17:
+                                    case 18:
                                         zzIsFinal = true;
                                         zzNoLookAhead = true;
                                         zzState = 12;
@@ -575,7 +579,7 @@ public final class FunctionScanner {
                                         zzIsFinal = true;
                                         zzState = 16;
                                         break zzForNext;
-                                    case 20:
+                                    case 21:
                                         zzIsFinal = true;
                                         zzNoLookAhead = true;
                                         zzState = 17;
@@ -594,9 +598,10 @@ public final class FunctionScanner {
                                     case 6:
                                     case 8:
                                     case 9:
-                                    case 17:
-                                    case 21:
+                                    case 10:
+                                    case 18:
                                     case 22:
+                                    case 23:
                                         zzIsFinal = true;
                                         zzNoLookAhead = true;
                                         zzState = 7;
@@ -614,7 +619,7 @@ public final class FunctionScanner {
                                         zzIsFinal = true;
                                         zzState = 20;
                                         break zzForNext;
-                                    case 20:
+                                    case 21:
                                         zzIsFinal = true;
                                         zzNoLookAhead = true;
                                         zzState = 22;
@@ -634,8 +639,9 @@ public final class FunctionScanner {
                                     case 6:
                                     case 8:
                                     case 9:
-                                    case 17:
-                                    case 20:
+                                    case 10:
+                                    case 18:
+                                    case 21:
                                         zzIsFinal = true;
                                         zzNoLookAhead = true;
                                         zzState = 7;
@@ -644,12 +650,12 @@ public final class FunctionScanner {
                                         zzIsFinal = true;
                                         zzState = 23;
                                         break zzForNext;
-                                    case 21:
+                                    case 22:
                                         zzIsFinal = true;
                                         zzNoLookAhead = true;
                                         zzState = 25;
                                         break zzForNext;
-                                    case 22:
+                                    case 23:
                                         zzIsFinal = true;
                                         zzState = 26;
                                         break zzForNext;
@@ -666,9 +672,10 @@ public final class FunctionScanner {
                                     case 3:
                                     case 6:
                                     case 8:
-                                    case 17:
-                                    case 20:
-                                    case 22:
+                                    case 10:
+                                    case 18:
+                                    case 21:
+                                    case 23:
                                         zzIsFinal = true;
                                         zzNoLookAhead = true;
                                         zzState = 7;
@@ -677,7 +684,7 @@ public final class FunctionScanner {
                                         zzIsFinal = true;
                                         zzState = 23;
                                         break zzForNext;
-                                    case 21:
+                                    case 22:
                                         zzIsFinal = true;
                                         zzNoLookAhead = true;
                                         zzState = 25;
@@ -713,10 +720,10 @@ public final class FunctionScanner {
                                     case 1:
                                         zzState = 32;
                                         break zzForNext;
-                                    case 10:
+                                    case 11:
                                         zzState = 33;
                                         break zzForNext;
-                                    case 18:
+                                    case 19:
                                         zzState = 34;
                                         break zzForNext;
                                     default:
@@ -725,7 +732,7 @@ public final class FunctionScanner {
 
                             case 9:
                                 switch (zzInput) {
-                                    case 11:
+                                    case 12:
                                         zzState = 35;
                                         break zzForNext;
                                     default:
@@ -734,7 +741,7 @@ public final class FunctionScanner {
 
                             case 10:
                                 switch (zzInput) {
-                                    case 12:
+                                    case 13:
                                         zzState = 36;
                                         break zzForNext;
                                     default:
@@ -745,15 +752,15 @@ public final class FunctionScanner {
                                 switch (zzInput) {
                                     case 6:
                                     case 7:
-                                    case 10:
                                     case 11:
                                     case 12:
                                     case 13:
                                     case 14:
                                     case 15:
                                     case 16:
-                                    case 18:
+                                    case 17:
                                     case 19:
+                                    case 20:
                                         zzIsFinal = true;
                                         break zzForNext;
                                     default:
@@ -765,18 +772,10 @@ public final class FunctionScanner {
                                     case 1:
                                         zzIsFinal = true;
                                         break zzForNext;
-                                    case 2:
-                                        zzIsFinal = true;
-                                        zzNoLookAhead = true;
-                                        zzState = 14;
-                                        break zzForNext;
                                     case 8:
                                         zzIsFinal = true;
                                         zzState = 16;
                                         break zzForNext;
-                                    case 3:
-                                        zzState = 37;
-                                        break zzForNext;
                                     default:
                                         break zzForAction;
                                 }
@@ -784,7 +783,7 @@ public final class FunctionScanner {
                             case 15:
                                 switch (zzInput) {
                                     case 3:
-                                        zzState = 38;
+                                        zzState = 37;
                                         break zzForNext;
                                     default:
                                         break zzForAction;
@@ -801,21 +800,13 @@ public final class FunctionScanner {
 
                             case 18:
                                 switch (zzInput) {
-                                    case 2:
-                                        zzIsFinal = true;
-                                        zzNoLookAhead = true;
-                                        zzState = 19;
-                                        break zzForNext;
-                                    case 20:
+                                    case 21:
                                         zzIsFinal = true;
                                         zzNoLookAhead = true;
                                         zzState = 22;
                                         break zzForNext;
                                     case 1:
-                                        zzState = 39;
-                                        break zzForNext;
-                                    case 3:
-                                        zzState = 40;
+                                        zzState = 38;
                                         break zzForNext;
                                     default:
                                         break zzForAction;
@@ -824,7 +815,7 @@ public final class FunctionScanner {
                             case 20:
                                 switch (zzInput) {
                                     case 3:
-                                        zzState = 41;
+                                        zzState = 39;
                                         break zzForNext;
                                     default:
                                         break zzForAction;
@@ -834,15 +825,15 @@ public final class FunctionScanner {
                                 switch (zzInput) {
                                     case 6:
                                     case 7:
-                                    case 10:
                                     case 11:
                                     case 12:
                                     case 13:
                                     case 14:
                                     case 15:
                                     case 16:
-                                    case 18:
+                                    case 17:
                                     case 19:
+                                    case 20:
                                         zzIsFinal = true;
                                         break zzForNext;
                                     default:
@@ -862,15 +853,15 @@ public final class FunctionScanner {
                                 switch (zzInput) {
                                     case 6:
                                     case 7:
-                                    case 10:
                                     case 11:
                                     case 12:
                                     case 13:
                                     case 14:
                                     case 15:
                                     case 16:
-                                    case 18:
+                                    case 17:
                                     case 19:
+                                    case 20:
                                         zzIsFinal = true;
                                         break zzForNext;
                                     default:
@@ -880,11 +871,11 @@ public final class FunctionScanner {
                             case 26:
                                 switch (zzInput) {
                                     case 1:
-                                        zzState = 42;
+                                        zzState = 40;
                                         break zzForNext;
                                     case 8:
                                         zzIsFinal = true;
-                                        zzState = 43;
+                                        zzState = 41;
                                         break zzForNext;
                                     default:
                                         break zzForAction;
@@ -893,7 +884,7 @@ public final class FunctionScanner {
                             case 27:
                                 switch (zzInput) {
                                     case 4:
-                                        zzState = 44;
+                                        zzState = 42;
                                         break zzForNext;
                                     default:
                                         break zzForAction;
@@ -903,15 +894,15 @@ public final class FunctionScanner {
                                 switch (zzInput) {
                                     case 6:
                                     case 7:
-                                    case 10:
                                     case 11:
                                     case 12:
                                     case 13:
                                     case 14:
                                     case 15:
                                     case 16:
-                                    case 18:
+                                    case 17:
                                     case 19:
+                                    case 20:
                                         zzIsFinal = true;
                                         break zzForNext;
                                     default:
@@ -925,11 +916,13 @@ public final class FunctionScanner {
                                         zzNoLookAhead = true;
                                         zzState = 19;
                                         break zzForNext;
-                                    case 3:
-                                        zzState = 40;
-                                        break zzForNext;
                                     case 1:
-                                        zzState = 45;
+                                    case 10:
+                                    case 22:
+                                        zzState = 43;
+                                        break zzForNext;
+                                    case 3:
+                                        zzState = 44;
                                         break zzForNext;
                                     default:
                                         break zzForAction;
@@ -938,20 +931,20 @@ public final class FunctionScanner {
                             case 30:
                                 switch (zzInput) {
                                     case 4:
-                                        zzState = 47;
+                                        zzState = 46;
                                         break zzForNext;
                                     default:
-                                        zzState = 46;
+                                        zzState = 45;
                                         break zzForNext;
                                 }
 
                             case 31:
                                 switch (zzInput) {
                                     case 4:
-                                        zzState = 44;
+                                        zzState = 42;
                                         break zzForNext;
                                     default:
-                                        zzState = 46;
+                                        zzState = 45;
                                         break zzForNext;
                                 }
 
@@ -959,10 +952,10 @@ public final class FunctionScanner {
                                 switch (zzInput) {
                                     case 1:
                                         break zzForNext;
-                                    case 10:
+                                    case 11:
                                         zzState = 33;
                                         break zzForNext;
-                                    case 18:
+                                    case 19:
                                         zzState = 34;
                                         break zzForNext;
                                     default:
@@ -971,7 +964,7 @@ public final class FunctionScanner {
 
                             case 33:
                                 switch (zzInput) {
-                                    case 11:
+                                    case 12:
                                         zzState = 35;
                                         break zzForNext;
                                     default:
@@ -980,7 +973,7 @@ public final class FunctionScanner {
 
                             case 34:
                                 switch (zzInput) {
-                                    case 12:
+                                    case 13:
                                         zzState = 36;
                                         break zzForNext;
                                     default:
@@ -989,8 +982,8 @@ public final class FunctionScanner {
 
                             case 35:
                                 switch (zzInput) {
-                                    case 12:
-                                        zzState = 48;
+                                    case 13:
+                                        zzState = 47;
                                         break zzForNext;
                                     default:
                                         break zzForAction;
@@ -998,8 +991,8 @@ public final class FunctionScanner {
 
                             case 36:
                                 switch (zzInput) {
-                                    case 19:
-                                        zzState = 49;
+                                    case 20:
+                                        zzState = 48;
                                         break zzForNext;
                                     default:
                                         break zzForAction;
@@ -1007,15 +1000,6 @@ public final class FunctionScanner {
 
                             case 37:
                                 switch (zzInput) {
-                                    case 3:
-                                        zzState = 38;
-                                        break zzForNext;
-                                    default:
-                                        break zzForAction;
-                                }
-
-                            case 38:
-                                switch (zzInput) {
                                     case 2:
                                         zzIsFinal = true;
                                         zzNoLookAhead = true;
@@ -1025,37 +1009,20 @@ public final class FunctionScanner {
                                         break zzForNext;
                                 }
 
-                            case 39:
+                            case 38:
                                 switch (zzInput) {
-                                    case 2:
-                                        zzIsFinal = true;
-                                        zzNoLookAhead = true;
-                                        zzState = 19;
-                                        break zzForNext;
-                                    case 20:
+                                    case 21:
                                         zzIsFinal = true;
                                         zzNoLookAhead = true;
                                         zzState = 22;
                                         break zzForNext;
                                     case 1:
                                         break zzForNext;
-                                    case 3:
-                                        zzState = 40;
-                                        break zzForNext;
                                     default:
                                         break zzForAction;
                                 }
 
-                            case 40:
-                                switch (zzInput) {
-                                    case 3:
-                                        zzState = 41;
-                                        break zzForNext;
-                                    default:
-                                        break zzForAction;
-                                }
-
-                            case 41:
+                            case 39:
                                 switch (zzInput) {
                                     case 2:
                                         zzIsFinal = true;
@@ -1066,19 +1033,19 @@ public final class FunctionScanner {
                                         break zzForNext;
                                 }
 
-                            case 42:
+                            case 40:
                                 switch (zzInput) {
                                     case 1:
                                         break zzForNext;
                                     case 8:
                                         zzIsFinal = true;
-                                        zzState = 43;
+                                        zzState = 41;
                                         break zzForNext;
                                     default:
                                         break zzForAction;
                                 }
 
-                            case 43:
+                            case 41:
                                 switch (zzInput) {
                                     case 1:
                                         zzIsFinal = true;
@@ -1087,89 +1054,109 @@ public final class FunctionScanner {
                                         break zzForAction;
                                 }
 
-                            case 44:
+                            case 42:
                                 switch (zzInput) {
                                     case 4:
                                         break zzForNext;
                                     case 1:
-                                        zzState = 50;
+                                        zzState = 49;
                                         break zzForNext;
                                     case 2:
                                         zzIsFinal = true;
                                         zzNoLookAhead = true;
-                                        zzState = 51;
+                                        zzState = 50;
                                         break zzForNext;
                                     case 3:
-                                        zzState = 52;
+                                        zzState = 51;
                                         break zzForNext;
                                     default:
                                         break zzForAction;
                                 }
 
-                            case 45:
+                            case 43:
                                 switch (zzInput) {
                                     case 2:
                                         zzIsFinal = true;
                                         zzNoLookAhead = true;
                                         zzState = 19;
                                         break zzForNext;
+                                    case 1:
+                                    case 10:
+                                    case 22:
+                                        break zzForNext;
                                     case 3:
-                                        zzState = 40;
+                                        zzState = 44;
                                         break zzForNext;
-                                    case 1:
+                                    default:
+                                        break zzForAction;
+                                }
+
+                            case 44:
+                                switch (zzInput) {
+                                    case 3:
+                                        zzState = 39;
                                         break zzForNext;
                                     default:
                                         break zzForAction;
                                 }
 
-                            case 46:
+                            case 45:
                                 switch (zzInput) {
                                     case 4:
-                                        zzState = 47;
+                                        zzState = 46;
                                         break zzForNext;
                                     default:
                                         break zzForNext;
                                 }
 
-                            case 47:
+                            case 46:
                                 switch (zzInput) {
                                     case 4:
-                                        zzState = 44;
+                                        zzState = 42;
                                         break zzForNext;
                                     default:
-                                        zzState = 46;
+                                        zzState = 45;
                                         break zzForNext;
                                 }
 
-                            case 48:
+                            case 47:
                                 switch (zzInput) {
-                                    case 13:
-                                        zzState = 53;
+                                    case 14:
+                                        zzState = 52;
                                         break zzForNext;
                                     default:
                                         break zzForAction;
                                 }
 
-                            case 49:
+                            case 48:
                                 switch (zzInput) {
-                                    case 10:
-                                        zzState = 54;
+                                    case 11:
+                                        zzState = 53;
                                         break zzForNext;
                                     default:
                                         break zzForAction;
                                 }
 
-                            case 50:
+                            case 49:
                                 switch (zzInput) {
                                     case 1:
                                         break zzForNext;
                                     case 2:
                                         zzIsFinal = true;
                                         zzNoLookAhead = true;
+                                        zzState = 50;
+                                        break zzForNext;
+                                    case 3:
                                         zzState = 51;
                                         break zzForNext;
+                                    default:
+                                        break zzForAction;
+                                }
+
+                            case 51:
+                                switch (zzInput) {
                                     case 3:
-                                        zzState = 52;
+                                        zzState = 54;
                                         break zzForNext;
                                     default:
                                         break zzForAction;
@@ -1177,7 +1164,7 @@ public final class FunctionScanner {
 
                             case 52:
                                 switch (zzInput) {
-                                    case 3:
+                                    case 15:
                                         zzState = 55;
                                         break zzForNext;
                                     default:
@@ -1186,7 +1173,7 @@ public final class FunctionScanner {
 
                             case 53:
                                 switch (zzInput) {
-                                    case 14:
+                                    case 12:
                                         zzState = 56;
                                         break zzForNext;
                                     default:
@@ -1195,27 +1182,27 @@ public final class FunctionScanner {
 
                             case 54:
                                 switch (zzInput) {
-                                    case 11:
-                                        zzState = 57;
+                                    case 2:
+                                        zzIsFinal = true;
+                                        zzNoLookAhead = true;
+                                        zzState = 50;
                                         break zzForNext;
                                     default:
-                                        break zzForAction;
+                                        break zzForNext;
                                 }
 
                             case 55:
                                 switch (zzInput) {
-                                    case 2:
-                                        zzIsFinal = true;
-                                        zzNoLookAhead = true;
-                                        zzState = 51;
+                                    case 16:
+                                        zzState = 57;
                                         break zzForNext;
                                     default:
-                                        break zzForNext;
+                                        break zzForAction;
                                 }
 
                             case 56:
                                 switch (zzInput) {
-                                    case 15:
+                                    case 13:
                                         zzState = 58;
                                         break zzForNext;
                                     default:
@@ -1224,7 +1211,7 @@ public final class FunctionScanner {
 
                             case 57:
                                 switch (zzInput) {
-                                    case 12:
+                                    case 17:
                                         zzState = 59;
                                         break zzForNext;
                                     default:
@@ -1233,7 +1220,7 @@ public final class FunctionScanner {
 
                             case 58:
                                 switch (zzInput) {
-                                    case 16:
+                                    case 14:
                                         zzState = 60;
                                         break zzForNext;
                                     default:
@@ -1251,7 +1238,7 @@ public final class FunctionScanner {
 
                             case 60:
                                 switch (zzInput) {
-                                    case 12:
+                                    case 15:
                                         zzState = 62;
                                         break zzForNext;
                                     default:
@@ -1260,38 +1247,29 @@ public final class FunctionScanner {
 
                             case 61:
                                 switch (zzInput) {
-                                    case 14:
-                                        zzState = 63;
-                                        break zzForNext;
-                                    default:
-                                        break zzForAction;
-                                }
-
-                            case 62:
-                                switch (zzInput) {
-                                    case 17:
+                                    case 18:
                                         zzIsFinal = true;
                                         zzNoLookAhead = true;
                                         zzState = 12;
                                         break zzForNext;
                                     case 1:
                                         zzIsFinal = true;
-                                        zzState = 64;
+                                        zzState = 63;
                                         break zzForNext;
                                     default:
                                         break zzForAction;
                                 }
 
-                            case 63:
+                            case 62:
                                 switch (zzInput) {
-                                    case 15:
-                                        zzState = 65;
+                                    case 16:
+                                        zzState = 64;
                                         break zzForNext;
                                     default:
                                         break zzForAction;
                                 }
 
-                            case 64:
+                            case 63:
                                 switch (zzInput) {
                                     case 1:
                                         zzIsFinal = true;
@@ -1300,43 +1278,43 @@ public final class FunctionScanner {
                                         break zzForAction;
                                 }
 
-                            case 65:
+                            case 64:
                                 switch (zzInput) {
-                                    case 16:
-                                        zzState = 66;
+                                    case 17:
+                                        zzState = 65;
                                         break zzForNext;
                                     default:
                                         break zzForAction;
                                 }
 
-                            case 66:
+                            case 65:
                                 switch (zzInput) {
-                                    case 12:
+                                    case 13:
                                         zzIsFinal = true;
-                                        zzState = 67;
+                                        zzState = 66;
                                         break zzForNext;
                                     default:
                                         break zzForAction;
                                 }
 
-                            case 67:
+                            case 66:
                                 switch (zzInput) {
                                     case 6:
                                     case 7:
-                                    case 10:
                                     case 11:
                                     case 12:
                                     case 13:
                                     case 14:
                                     case 15:
                                     case 16:
-                                    case 18:
+                                    case 17:
                                     case 19:
+                                    case 20:
                                         break zzForAction;
                                     default:
                                         zzIsFinal = true;
                                         zzNoLookAhead = true;
-                                        zzState = 68;
+                                        zzState = 67;
                                         break zzForNext;
                                 }
 
@@ -1350,7 +1328,9 @@ public final class FunctionScanner {
                     if ( zzIsFinal ) {
                         zzAction = zzState;
                         zzMarkedPosL = zzCurrentPosL;
-                        if ( zzNoLookAhead ) break zzForAction;
+                        if ( zzNoLookAhead ) {
+                            break zzForAction;
+                        }
                     }
 
                 }