]> source.dussan.org Git - vaadin-framework.git/commitdiff
Merge commit 'a2f255448e6a755892a97b7df9fc2b65efc5dccc'
authorArtur Signell <artur@vaadin.com>
Mon, 11 Nov 2013 14:24:45 +0000 (16:24 +0200)
committerArtur Signell <artur@vaadin.com>
Mon, 11 Nov 2013 14:24:45 +0000 (16:24 +0200)
Conflicts:
theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java

Change-Id: I6b295f9225785eb6bf07bf2cd2d5c1c3bc181afc

1  2 
theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj

index 5fbec45efd9c08d98892d83611e6bc1dfc5c29f9,bdc5fbc86fd28f99c0268e2711abeacf3d37a102..d8669a82f112adf76f62b73561fb88d72a988ee3
mode 100644,100755..100644
@@@ -2767,8 -2868,11 +2772,11 @@@ public class Parser implements org.w3c.
                  case IF_SYM:
                      controlDirective();
                      break;
+                 case ATKEYWORD:
+                     atRuleDeclaration();
+                     break;
                  default:
 -                    jj_la1[107] = jj_gen;
 +                    jj_la1[101] = jj_gen;
                      jj_consume_token(-1);
                      throw new ParseException();
                  }
                  ;
                  break;
              default:
 -                jj_la1[110] = jj_gen;
 -                break label_71;
 +                jj_la1[104] = jj_gen;
 +                break label_68;
              }
-             ifContentStatement();
+             switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+             case PLUS:
+             case PRECEDES:
+             case SIBLING:
+             case LBRACKET:
+             case ANY:
+             case PARENT:
+             case DOT:
+             case COLON:
+             case INTERPOLATION:
+             case INCLUDE_SYM:
+             case DEBUG_SYM:
+             case WARN_SYM:
+             case EACH_SYM:
+             case IF_SYM:
+             case EXTEND_SYM:
+             case CONTENT_SYM:
+             case IDENT:
+             case VARIABLE:
+             case HASH:
+             case MEDIA_SYM:
+             case KEY_FRAME_SYM:
+             case ATKEYWORD:
+                 ifContentStatement();
+                 break;
+             case FONT_FACE_SYM:
+                 fontFace();
+                 break;
+             default:
 -                jj_la1[111] = jj_gen;
++                jj_la1[105] = jj_gen;
+                 jj_consume_token(-1);
+                 throw new ParseException();
+             }
          }
          jj_consume_token(RBRACE);
 -        label_72: while (true) {
 +        label_69: while (true) {
              switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
              case S:
                  ;
                  break;
              default:
-                 jj_la1[105] = jj_gen;
 -                jj_la1[112] = jj_gen;
 -                break label_72;
++                jj_la1[106] = jj_gen;
 +                break label_69;
              }
              jj_consume_token(S);
          }
                  ;
                  break;
              default:
-                 jj_la1[106] = jj_gen;
 -                jj_la1[113] = jj_gen;
 -                break label_73;
++                jj_la1[107] = jj_gen;
 +                break label_70;
              }
              elseDirective();
          }
                  ;
                  break;
              default:
-                 jj_la1[107] = jj_gen;
 -                jj_la1[114] = jj_gen;
 -                break label_74;
++                jj_la1[108] = jj_gen;
 +                break label_71;
              }
              jj_consume_token(S);
          }
                      ;
                      break;
                  default:
-                     jj_la1[108] = jj_gen;
 -                    jj_la1[115] = jj_gen;
 -                    break label_75;
++                    jj_la1[109] = jj_gen;
 +                    break label_72;
                  }
              }
              break;
          default:
-             jj_la1[109] = jj_gen;
 -            jj_la1[116] = jj_gen;
++            jj_la1[110] = jj_gen;
              ;
          }
          jj_consume_token(LBRACE);
                  ;
                  break;
              default:
-                 jj_la1[110] = jj_gen;
 -                jj_la1[117] = jj_gen;
 -                break label_76;
++                jj_la1[111] = jj_gen;
 +                break label_73;
              }
              jj_consume_token(S);
          }
                  ;
                  break;
              default:
-                 jj_la1[111] = jj_gen;
 -                jj_la1[118] = jj_gen;
 -                break label_77;
++                jj_la1[112] = jj_gen;
 +                break label_74;
              }
-             ifContentStatement();
+             switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+             case PLUS:
+             case PRECEDES:
+             case SIBLING:
+             case LBRACKET:
+             case ANY:
+             case PARENT:
+             case DOT:
+             case COLON:
+             case INTERPOLATION:
+             case INCLUDE_SYM:
+             case DEBUG_SYM:
+             case WARN_SYM:
+             case EACH_SYM:
+             case IF_SYM:
+             case EXTEND_SYM:
+             case CONTENT_SYM:
+             case IDENT:
+             case VARIABLE:
+             case HASH:
+             case MEDIA_SYM:
+             case KEY_FRAME_SYM:
+             case ATKEYWORD:
+                 ifContentStatement();
+                 break;
+             case FONT_FACE_SYM:
+                 fontFace();
+                 break;
+             default:
 -                jj_la1[119] = jj_gen;
++                jj_la1[113] = jj_gen;
+                 jj_consume_token(-1);
+                 throw new ParseException();
+             }
          }
          jj_consume_token(RBRACE);
 -        label_78: while (true) {
 +        label_75: while (true) {
              switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
              case S:
                  ;
                  break;
              default:
-                 jj_la1[112] = jj_gen;
 -                jj_la1[120] = jj_gen;
 -                break label_78;
++                jj_la1[114] = jj_gen;
 +                break label_75;
              }
              jj_consume_token(S);
          }
                  n = jj_consume_token(NOT_EQ);
                  break;
              default:
-                 jj_la1[113] = jj_gen;
 -                jj_la1[121] = jj_gen;
++                jj_la1[115] = jj_gen;
                  jj_consume_token(-1);
                  throw new ParseException();
              }
                  ;
                  break;
              default:
-                 jj_la1[114] = jj_gen;
 -                jj_la1[122] = jj_gen;
 -                break label_79;
++                jj_la1[116] = jj_gen;
 +                break label_76;
              }
              jj_consume_token(S);
          }
                  ;
                  break;
              default:
-                 jj_la1[115] = jj_gen;
 -                jj_la1[123] = jj_gen;
 -                break label_80;
++                jj_la1[117] = jj_gen;
 +                break label_77;
              }
              jj_consume_token(S);
          }
                  ;
                  break;
              default:
-                 jj_la1[116] = jj_gen;
 -                jj_la1[124] = jj_gen;
 -                break label_81;
++                jj_la1[118] = jj_gen;
 +                break label_78;
              }
              jj_consume_token(S);
          }
              documentHandler.startEachDirective(var.image, listVariable);
              break;
          default:
-             jj_la1[117] = jj_gen;
 -            jj_la1[125] = jj_gen;
++            jj_la1[119] = jj_gen;
              jj_consume_token(-1);
              throw new ParseException();
          }
                  ;
                  break;
              default:
-                 jj_la1[118] = jj_gen;
 -                jj_la1[126] = jj_gen;
 -                break label_82;
++                jj_la1[120] = jj_gen;
 +                break label_79;
              }
              jj_consume_token(S);
          }
                  ;
                  break;
              default:
-                 jj_la1[119] = jj_gen;
 -                jj_la1[127] = jj_gen;
 -                break label_83;
++                jj_la1[121] = jj_gen;
 +                break label_80;
              }
              ifContentStatement();
          }
                  ;
                  break;
              default:
-                 jj_la1[120] = jj_gen;
 -                jj_la1[128] = jj_gen;
 -                break label_84;
++                jj_la1[122] = jj_gen;
 +                break label_81;
              }
              jj_consume_token(S);
          }
                  ;
                  break;
              default:
-                 jj_la1[121] = jj_gen;
 -                jj_la1[129] = jj_gen;
 -                break label_85;
++                jj_la1[123] = jj_gen;
 +                break label_82;
              }
              jj_consume_token(S);
          }
                  ;
                  break;
              default:
-                 jj_la1[122] = jj_gen;
 -                jj_la1[130] = jj_gen;
 -                break label_86;
++                jj_la1[124] = jj_gen;
 +                break label_83;
              }
              jj_consume_token(COMMA);
 -            label_87: while (true) {
 +            label_84: while (true) {
                  switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
                  case S:
                      ;
                      break;
                  default:
-                     jj_la1[123] = jj_gen;
 -                    jj_la1[131] = jj_gen;
 -                    break label_87;
++                    jj_la1[125] = jj_gen;
 +                    break label_84;
                  }
                  jj_consume_token(S);
              }
                      ;
                      break;
                  default:
-                     jj_la1[124] = jj_gen;
 -                    jj_la1[132] = jj_gen;
 -                    break label_88;
++                    jj_la1[126] = jj_gen;
 +                    break label_85;
                  }
                  jj_consume_token(S);
              }
                  ;
                  break;
              default:
-                 jj_la1[125] = jj_gen;
 -                jj_la1[133] = jj_gen;
 -                break label_89;
++                jj_la1[127] = jj_gen;
 +                break label_86;
              }
              jj_consume_token(S);
          }
                      ;
                      break;
                  default:
-                     jj_la1[126] = jj_gen;
 -                    jj_la1[134] = jj_gen;
 -                    break label_90;
++                    jj_la1[128] = jj_gen;
 +                    break label_87;
                  }
                  jj_consume_token(S);
              }
              break;
          default:
-             jj_la1[127] = jj_gen;
 -            jj_la1[135] = jj_gen;
++            jj_la1[129] = jj_gen;
              jj_consume_token(-1);
              throw new ParseException();
          }
                  ;
                  break;
              default:
-                 jj_la1[128] = jj_gen;
 -                jj_la1[136] = jj_gen;
 -                break label_91;
++                jj_la1[130] = jj_gen;
 +                break label_88;
              }
              jj_consume_token(S);
          }
              case HASH:
              case MEDIA_SYM:
              case PAGE_SYM:
 +            case FONT_FACE_SYM:
              case KEY_FRAME_SYM:
+             case ATKEYWORD:
                  ;
                  break;
              default:
-                 jj_la1[129] = jj_gen;
 -                jj_la1[137] = jj_gen;
 -                break label_92;
++                jj_la1[131] = jj_gen;
 +                break label_89;
              }
              switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
              case PLUS:
              case HASH:
              case MEDIA_SYM:
              case KEY_FRAME_SYM:
+             case ATKEYWORD:
                  ifContentStatement();
                  break;
 +            case FONT_FACE_SYM:
 +                fontFace();
 +                break;
              case PAGE_SYM:
                  page();
                  break;
              default:
-                 jj_la1[130] = jj_gen;
 -                jj_la1[138] = jj_gen;
++                jj_la1[132] = jj_gen;
                  jj_consume_token(-1);
                  throw new ParseException();
              }
                  ;
                  break;
              default:
-                 jj_la1[131] = jj_gen;
 -                jj_la1[139] = jj_gen;
 -                break label_93;
++                jj_la1[133] = jj_gen;
 +                break label_90;
              }
              jj_consume_token(S);
          }
                  ;
                  break;
              default:
-                 jj_la1[132] = jj_gen;
 -                jj_la1[140] = jj_gen;
 -                break label_94;
++                jj_la1[134] = jj_gen;
 +                break label_91;
              }
              jj_consume_token(COMMA);
 -            label_95: while (true) {
 +            label_92: while (true) {
                  switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
                  case S:
                      ;
                      break;
                  default:
-                     jj_la1[133] = jj_gen;
 -                    jj_la1[141] = jj_gen;
 -                    break label_95;
++                    jj_la1[135] = jj_gen;
 +                    break label_92;
                  }
                  jj_consume_token(S);
              }
                          ;
                          break;
                      default:
-                         jj_la1[134] = jj_gen;
 -                        jj_la1[142] = jj_gen;
 -                        break label_96;
++                        jj_la1[136] = jj_gen;
 +                        break label_93;
                      }
                      jj_consume_token(S);
                  }
                                  ;
                                  break;
                              default:
-                                 jj_la1[135] = jj_gen;
 -                                jj_la1[143] = jj_gen;
 -                                break label_98;
++                                jj_la1[137] = jj_gen;
 +                                break label_95;
                              }
                              jj_consume_token(S);
                          }
                          break;
                      default:
-                         jj_la1[136] = jj_gen;
 -                        jj_la1[144] = jj_gen;
++                        jj_la1[138] = jj_gen;
                          ;
                      }
                      prev = nonVariableTerm(prev);
                          token.beginColumn, prev, variable.image);
                  break;
              default:
-                 jj_la1[137] = jj_gen;
 -                jj_la1[145] = jj_gen;
++                jj_la1[139] = jj_gen;
                  jj_consume_token(-1);
                  throw new ParseException();
              }
              break;
          default:
-             jj_la1[138] = jj_gen;
 -            jj_la1[146] = jj_gen;
++            jj_la1[140] = jj_gen;
              ;
          }
          VariableNode arg = new VariableNode(name, first, false);
                  ;
                  break;
              default:
-                 jj_la1[139] = jj_gen;
 -                jj_la1[147] = jj_gen;
 -                break label_99;
++                jj_la1[141] = jj_gen;
 +                break label_96;
              }
              switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
              case COLON:
                          ;
                          break;
                      default:
-                         jj_la1[140] = jj_gen;
 -                        jj_la1[148] = jj_gen;
 -                        break label_100;
++                        jj_la1[142] = jj_gen;
 +                        break label_97;
                      }
                      jj_consume_token(S);
                  }
                  break;
              default:
-                 jj_la1[141] = jj_gen;
 -                jj_la1[149] = jj_gen;
++                jj_la1[143] = jj_gen;
                  ;
              }
              next = term(prev);
                  ;
                  break;
              default:
-                 jj_la1[142] = jj_gen;
 -                jj_la1[150] = jj_gen;
 -                break label_101;
++                jj_la1[144] = jj_gen;
 +                break label_98;
              }
              jj_consume_token(COMMA);
 -            label_102: while (true) {
 +            label_99: while (true) {
                  switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
                  case S:
                      ;
                      break;
                  default:
-                     jj_la1[143] = jj_gen;
 -                    jj_la1[151] = jj_gen;
 -                    break label_102;
++                    jj_la1[145] = jj_gen;
 +                    break label_99;
                  }
                  jj_consume_token(S);
              }
                      ;
                      break;
                  default:
-                     jj_la1[144] = jj_gen;
 -                    jj_la1[152] = jj_gen;
 -                    break label_103;
++                    jj_la1[146] = jj_gen;
 +                    break label_100;
                  }
                  switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
                  case COLON:
                              ;
                              break;
                          default:
-                             jj_la1[145] = jj_gen;
 -                            jj_la1[153] = jj_gen;
 -                            break label_104;
++                            jj_la1[147] = jj_gen;
 +                            break label_101;
                          }
                          jj_consume_token(S);
                      }
                      break;
                  default:
-                     jj_la1[146] = jj_gen;
 -                    jj_la1[154] = jj_gen;
++                    jj_la1[148] = jj_gen;
                      ;
                  }
                  next = term(prev);
                  ;
                  break;
              default:
-                 jj_la1[147] = jj_gen;
 -                jj_la1[155] = jj_gen;
 -                break label_105;
++                jj_la1[149] = jj_gen;
 +                break label_102;
              }
              jj_consume_token(S);
          }
              name = functionName();
              args = argValuelist();
              jj_consume_token(RPARAN);
-                     jj_la1[148] = jj_gen;
 +            label_103: while (true) {
 +                switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
 +                case S:
 +                    ;
 +                    break;
 +                default:
++                    jj_la1[150] = jj_gen;
 +                    break label_103;
 +                }
 +                jj_consume_token(S);
 +            }
              break;
          default:
-             jj_la1[149] = jj_gen;
 -            jj_la1[156] = jj_gen;
++            jj_la1[151] = jj_gen;
              jj_consume_token(-1);
              throw new ParseException();
          }
                          ;
                          break;
                      default:
-                         jj_la1[150] = jj_gen;
 -                        jj_la1[158] = jj_gen;
 -                        break label_108;
++                        jj_la1[152] = jj_gen;
 +                        break label_105;
                      }
                      jj_consume_token(S);
                  }
                      ;
                      break;
                  default:
-                     jj_la1[151] = jj_gen;
 -                    jj_la1[159] = jj_gen;
 -                    break label_107;
++                    jj_la1[153] = jj_gen;
 +                    break label_104;
                  }
              }
              documentHandler.includeDirective(name, args);
                      ;
                      break;
                  default:
-                     jj_la1[152] = jj_gen;
 -                    jj_la1[160] = jj_gen;
 -                    break label_109;
++                    jj_la1[154] = jj_gen;
 +                    break label_106;
                  }
                  jj_consume_token(S);
              }
                      ;
                      break;
                  default:
-                     jj_la1[153] = jj_gen;
 -                    jj_la1[161] = jj_gen;
 -                    break label_110;
++                    jj_la1[155] = jj_gen;
 +                    break label_107;
                  }
                  styleRuleOrDeclarationOrNestedProperties();
              }
                      ;
                      break;
                  default:
-                     jj_la1[154] = jj_gen;
 -                    jj_la1[162] = jj_gen;
 -                    break label_111;
++                    jj_la1[156] = jj_gen;
 +                    break label_108;
                  }
                  jj_consume_token(S);
              }
              documentHandler.endIncludeContentBlock();
              break;
          default:
-             jj_la1[155] = jj_gen;
 -            jj_la1[163] = jj_gen;
++            jj_la1[157] = jj_gen;
              jj_consume_token(-1);
              throw new ParseException();
          }
                  ;
                  break;
              default:
-                 jj_la1[156] = jj_gen;
 -                jj_la1[164] = jj_gen;
 -                break label_112;
++                jj_la1[158] = jj_gen;
 +                break label_109;
              }
              jj_consume_token(S);
          }
                  ;
                  break;
              default:
-                 jj_la1[157] = jj_gen;
 -                jj_la1[165] = jj_gen;
 -                break label_113;
++                jj_la1[159] = jj_gen;
 +                break label_110;
              }
              jj_consume_token(S);
          }
              type = jj_consume_token(CONTAINS);
              break;
          default:
-             jj_la1[158] = jj_gen;
 -            jj_la1[166] = jj_gen;
++            jj_la1[160] = jj_gen;
              jj_consume_token(-1);
              throw new ParseException();
          }
                  ;
                  break;
              default:
-                 jj_la1[159] = jj_gen;
 -                jj_la1[167] = jj_gen;
 -                break label_114;
++                jj_la1[161] = jj_gen;
 +                break label_111;
              }
              jj_consume_token(S);
          }
              jj_consume_token(RPARAN);
              break;
          default:
-             jj_la1[160] = jj_gen;
 -            jj_la1[168] = jj_gen;
++            jj_la1[162] = jj_gen;
              ;
          }
          jj_consume_token(COMMA);
                  ;
                  break;
              default:
-                 jj_la1[161] = jj_gen;
 -                jj_la1[169] = jj_gen;
 -                break label_115;
++                jj_la1[163] = jj_gen;
 +                break label_112;
              }
              jj_consume_token(S);
          }
                      ;
                      break;
                  default:
-                     jj_la1[162] = jj_gen;
 -                    jj_la1[170] = jj_gen;
 -                    break label_116;
++                    jj_la1[164] = jj_gen;
 +                    break label_113;
                  }
                  jj_consume_token(S);
              }
                      ;
                      break;
                  default:
-                     jj_la1[163] = jj_gen;
 -                    jj_la1[171] = jj_gen;
 -                    break label_117;
++                    jj_la1[165] = jj_gen;
 +                    break label_114;
                  }
                  jj_consume_token(S);
              }
              break;
          default:
-             jj_la1[164] = jj_gen;
 -            jj_la1[172] = jj_gen;
++            jj_la1[166] = jj_gen;
              ;
          }
          jj_consume_token(RPARAN);
                  ;
                  break;
              default:
-                 jj_la1[165] = jj_gen;
 -                jj_la1[173] = jj_gen;
 -                break label_118;
++                jj_la1[167] = jj_gen;
 +                break label_115;
              }
              jj_consume_token(S);
          }
                  ;
                  break;
              default:
-                 jj_la1[166] = jj_gen;
 -                jj_la1[174] = jj_gen;
 -                break label_119;
++                jj_la1[168] = jj_gen;
 +                break label_116;
              }
              jj_consume_token(S);
          }
                  ;
                  break;
              default:
-                 jj_la1[167] = jj_gen;
 -                jj_la1[175] = jj_gen;
 -                break label_120;
++                jj_la1[169] = jj_gen;
 +                break label_117;
              }
              jj_consume_token(S);
          }
                  ;
                  break;
              default:
-                 jj_la1[168] = jj_gen;
 -                jj_la1[176] = jj_gen;
 -                break label_121;
++                jj_la1[170] = jj_gen;
 +                break label_118;
              }
              jj_consume_token(S);
          }
                  ;
                  break;
              default:
-                 jj_la1[169] = jj_gen;
 -                jj_la1[177] = jj_gen;
 -                break label_122;
++                jj_la1[171] = jj_gen;
 +                break label_119;
              }
              jj_consume_token(S);
          }
              jj_consume_token(RPARAN);
              break;
          default:
-             jj_la1[170] = jj_gen;
 -            jj_la1[178] = jj_gen;
++            jj_la1[172] = jj_gen;
              ;
          }
          jj_consume_token(COMMA);
                  ;
                  break;
              default:
-                 jj_la1[171] = jj_gen;
 -                jj_la1[179] = jj_gen;
 -                break label_123;
++                jj_la1[173] = jj_gen;
 +                break label_120;
              }
              jj_consume_token(S);
          }
                      ;
                      break;
                  default:
-                     jj_la1[172] = jj_gen;
 -                    jj_la1[180] = jj_gen;
 -                    break label_124;
++                    jj_la1[174] = jj_gen;
 +                    break label_121;
                  }
                  jj_consume_token(S);
              }
                      ;
                      break;
                  default:
-                     jj_la1[173] = jj_gen;
 -                    jj_la1[181] = jj_gen;
 -                    break label_125;
++                    jj_la1[175] = jj_gen;
 +                    break label_122;
                  }
                  jj_consume_token(S);
              }
              break;
          default:
-             jj_la1[174] = jj_gen;
 -            jj_la1[182] = jj_gen;
++            jj_la1[176] = jj_gen;
              ;
          }
          jj_consume_token(RPARAN);
                  ;
                  break;
              default:
-                 jj_la1[175] = jj_gen;
 -                jj_la1[183] = jj_gen;
 -                break label_126;
++                jj_la1[177] = jj_gen;
 +                break label_123;
              }
              jj_consume_token(S);
          }
                  ;
                  break;
              default:
-                 jj_la1[176] = jj_gen;
 -                jj_la1[184] = jj_gen;
 -                break label_127;
++                jj_la1[178] = jj_gen;
 +                break label_124;
              }
              jj_consume_token(S);
          }
                  ;
                  break;
              default:
-                 jj_la1[177] = jj_gen;
 -                jj_la1[185] = jj_gen;
 -                break label_128;
++                jj_la1[179] = jj_gen;
 +                break label_125;
              }
              jj_consume_token(S);
          }
              jj_consume_token(RPARAN);
              break;
          default:
-             jj_la1[178] = jj_gen;
 -            jj_la1[186] = jj_gen;
++            jj_la1[180] = jj_gen;
              ;
          }
          jj_consume_token(COMMA);
                  ;
                  break;
              default:
-                 jj_la1[179] = jj_gen;
 -                jj_la1[187] = jj_gen;
 -                break label_129;
++                jj_la1[181] = jj_gen;
 +                break label_126;
              }
              jj_consume_token(S);
          }
                      ;
                      break;
                  default:
-                     jj_la1[180] = jj_gen;
 -                    jj_la1[188] = jj_gen;
 -                    break label_130;
++                    jj_la1[182] = jj_gen;
 +                    break label_127;
                  }
                  jj_consume_token(S);
              }
                      ;
                      break;
                  default:
-                     jj_la1[181] = jj_gen;
 -                    jj_la1[189] = jj_gen;
 -                    break label_131;
++                    jj_la1[183] = jj_gen;
 +                    break label_128;
                  }
                  jj_consume_token(S);
              }
              break;
          default:
-             jj_la1[182] = jj_gen;
 -            jj_la1[190] = jj_gen;
++            jj_la1[184] = jj_gen;
              ;
          }
          jj_consume_token(RPARAN);
                      ;
                      break;
                  default:
-                     jj_la1[183] = jj_gen;
 -                    jj_la1[191] = jj_gen;
 -                    break label_132;
++                    jj_la1[185] = jj_gen;
 +                    break label_129;
                  }
                  jj_consume_token(S);
              }
                      ;
                      break;
                  default:
-                     jj_la1[184] = jj_gen;
 -                    jj_la1[192] = jj_gen;
 -                    break label_133;
++                    jj_la1[186] = jj_gen;
 +                    break label_130;
                  }
                  jj_consume_token(S);
              }
              break;
          default:
-             jj_la1[185] = jj_gen;
 -            jj_la1[193] = jj_gen;
++            jj_la1[187] = jj_gen;
              ;
          }
          jj_consume_token(CONTAINS);
                  ;
                  break;
              default:
-                 jj_la1[186] = jj_gen;
 -                jj_la1[194] = jj_gen;
 -                break label_134;
++                jj_la1[188] = jj_gen;
 +                break label_131;
              }
              jj_consume_token(S);
          }
              jj_consume_token(RPARAN);
              break;
          default:
-             jj_la1[187] = jj_gen;
 -            jj_la1[195] = jj_gen;
++            jj_la1[189] = jj_gen;
              ;
          }
          jj_consume_token(COMMA);
                  ;
                  break;
              default:
-                 jj_la1[188] = jj_gen;
 -                jj_la1[196] = jj_gen;
 -                break label_135;
++                jj_la1[190] = jj_gen;
 +                break label_132;
              }
              jj_consume_token(S);
          }
                      ;
                      break;
                  default:
-                     jj_la1[189] = jj_gen;
 -                    jj_la1[197] = jj_gen;
 -                    break label_136;
++                    jj_la1[191] = jj_gen;
 +                    break label_133;
                  }
                  jj_consume_token(S);
              }
                      ;
                      break;
                  default:
-                     jj_la1[190] = jj_gen;
 -                    jj_la1[198] = jj_gen;
 -                    break label_137;
++                    jj_la1[192] = jj_gen;
 +                    break label_134;
                  }
                  jj_consume_token(S);
              }
              break;
          default:
-             jj_la1[191] = jj_gen;
 -            jj_la1[199] = jj_gen;
++            jj_la1[193] = jj_gen;
              ;
          }
          jj_consume_token(RPARAN);
              warnDirective();
              break;
          default:
-             jj_la1[192] = jj_gen;
 -            jj_la1[200] = jj_gen;
++            jj_la1[194] = jj_gen;
              jj_consume_token(-1);
              throw new ParseException();
          }
                  ;
                  break;
              default:
-                 jj_la1[193] = jj_gen;
 -                jj_la1[201] = jj_gen;
 -                break label_138;
++                jj_la1[195] = jj_gen;
 +                break label_135;
              }
              jj_consume_token(S);
          }
                  ;
                  break;
              default:
-                 jj_la1[194] = jj_gen;
 -                jj_la1[202] = jj_gen;
 -                break label_139;
++                jj_la1[196] = jj_gen;
 +                break label_136;
              }
              jj_consume_token(S);
          }
              exclusive = false;
              break;
          default:
-             jj_la1[195] = jj_gen;
 -            jj_la1[203] = jj_gen;
++            jj_la1[197] = jj_gen;
              jj_consume_token(-1);
              throw new ParseException();
          }
                  ;
                  break;
              default:
-                 jj_la1[196] = jj_gen;
 -                jj_la1[204] = jj_gen;
 -                break label_140;
++                jj_la1[198] = jj_gen;
 +                break label_137;
              }
              jj_consume_token(S);
          }
                  ;
                  break;
              default:
-                 jj_la1[197] = jj_gen;
 -                jj_la1[205] = jj_gen;
 -                break label_141;
++                jj_la1[199] = jj_gen;
 +                break label_138;
              }
              jj_consume_token(S);
          }
                      ;
                      break;
                  default:
-                     jj_la1[198] = jj_gen;
 -                    jj_la1[206] = jj_gen;
 -                    break label_143;
++                    jj_la1[200] = jj_gen;
 +                    break label_140;
                  }
                  jj_consume_token(S);
              }
                  ;
                  break;
              default:
-                 jj_la1[199] = jj_gen;
 -                jj_la1[207] = jj_gen;
 -                break label_142;
++                jj_la1[201] = jj_gen;
 +                break label_139;
              }
          }
          documentHandler.extendDirective(list);
                  ;
                  break;
              default:
-                 jj_la1[200] = jj_gen;
 -                jj_la1[208] = jj_gen;
 -                break label_144;
++                jj_la1[202] = jj_gen;
 +                break label_141;
              }
              jj_consume_token(S);
          }
                      ;
                      break;
                  default:
-                     jj_la1[201] = jj_gen;
 -                    jj_la1[209] = jj_gen;
 -                    break label_146;
++                    jj_la1[203] = jj_gen;
 +                    break label_143;
                  }
                  jj_consume_token(S);
              }
                  ;
                  break;
              default:
-                 jj_la1[202] = jj_gen;
 -                jj_la1[210] = jj_gen;
 -                break label_145;
++                jj_la1[204] = jj_gen;
 +                break label_142;
              }
          }
          documentHandler.contentDirective();
                  ;
                  break;
              default:
-                 jj_la1[203] = jj_gen;
 -                jj_la1[211] = jj_gen;
 -                break label_147;
++                jj_la1[205] = jj_gen;
 +                break label_144;
              }
              jj_consume_token(S);
          }
                  ;
                  break;
              default:
-                 jj_la1[204] = jj_gen;
 -                jj_la1[212] = jj_gen;
 -                break label_148;
++                jj_la1[206] = jj_gen;
 +                break label_145;
              }
              jj_consume_token(S);
          }
              declaration();
              break;
          default:
-             jj_la1[205] = jj_gen;
 -            jj_la1[213] = jj_gen;
++            jj_la1[207] = jj_gen;
              ;
          }
 -        label_149: while (true) {
 +        label_146: while (true) {
              switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
              case SEMICOLON:
                  ;
                  break;
              default:
-                 jj_la1[206] = jj_gen;
 -                jj_la1[214] = jj_gen;
 -                break label_149;
++                jj_la1[208] = jj_gen;
 +                break label_146;
              }
              jj_consume_token(SEMICOLON);
 -            label_150: while (true) {
 +            label_147: while (true) {
                  switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
                  case S:
                      ;
                      break;
                  default:
-                     jj_la1[207] = jj_gen;
 -                    jj_la1[215] = jj_gen;
 -                    break label_150;
++                    jj_la1[209] = jj_gen;
 +                    break label_147;
                  }
                  jj_consume_token(S);
              }
                  declaration();
                  break;
              default:
-                 jj_la1[208] = jj_gen;
 -                jj_la1[216] = jj_gen;
++                jj_la1[210] = jj_gen;
                  ;
              }
          }
                  ;
                  break;
              default:
-                 jj_la1[209] = jj_gen;
 -                jj_la1[217] = jj_gen;
 -                break label_151;
++                jj_la1[211] = jj_gen;
 +                break label_148;
              }
              jj_consume_token(S);
          }
                  debuggingDirective();
                  break;
              default:
-                 jj_la1[210] = jj_gen;
 -                jj_la1[218] = jj_gen;
++                jj_la1[212] = jj_gen;
                  if (jj_2_6(2147483647)) {
                      styleRule();
                  } else if (jj_2_7(3)) {
                          styleRule();
                          break;
                      default:
-                         jj_la1[211] = jj_gen;
 -                        jj_la1[219] = jj_gen;
++                        jj_la1[213] = jj_gen;
                          jj_consume_token(-1);
                          throw new ParseException();
                      }
                      ;
                      break;
                  default:
-                     jj_la1[212] = jj_gen;
 -                    jj_la1[220] = jj_gen;
 -                    break label_152;
++                    jj_la1[214] = jj_gen;
 +                    break label_149;
                  }
                  jj_consume_token(S);
              }
                      important = prio();
                      break;
                  default:
-                     jj_la1[213] = jj_gen;
 -                    jj_la1[221] = jj_gen;
++                    jj_la1[215] = jj_gen;
                      ;
                  }
                  Token next = getToken(1);
                          ;
                          break;
                      default:
-                         jj_la1[214] = jj_gen;
 -                        jj_la1[222] = jj_gen;
 -                        break label_153;
++                        jj_la1[216] = jj_gen;
 +                        break label_150;
                      }
                      jj_consume_token(S);
                  }
                      declaration();
                      break;
                  default:
-                     jj_la1[215] = jj_gen;
 -                    jj_la1[223] = jj_gen;
++                    jj_la1[217] = jj_gen;
                      ;
                  }
 -                label_154: while (true) {
 +                label_151: while (true) {
                      switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
                      case SEMICOLON:
                          ;
                          break;
                      default:
-                         jj_la1[216] = jj_gen;
 -                        jj_la1[224] = jj_gen;
 -                        break label_154;
++                        jj_la1[218] = jj_gen;
 +                        break label_151;
                      }
                      jj_consume_token(SEMICOLON);
 -                    label_155: while (true) {
 +                    label_152: while (true) {
                          switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
                          case S:
                              ;
                              break;
                          default:
-                             jj_la1[217] = jj_gen;
 -                            jj_la1[225] = jj_gen;
 -                            break label_155;
++                            jj_la1[219] = jj_gen;
 +                            break label_152;
                          }
                          jj_consume_token(S);
                      }
                          declaration();
                          break;
                      default:
-                         jj_la1[218] = jj_gen;
 -                        jj_la1[226] = jj_gen;
++                        jj_la1[220] = jj_gen;
                          ;
                      }
                  }
                          ;
                          break;
                      default:
-                         jj_la1[219] = jj_gen;
 -                        jj_la1[227] = jj_gen;
 -                        break label_156;
++                        jj_la1[221] = jj_gen;
 +                        break label_153;
                      }
                      jj_consume_token(S);
                  }
                  documentHandler.endNestedProperties(name);
                  break;
              default:
-                 jj_la1[220] = jj_gen;
 -                jj_la1[228] = jj_gen;
++                jj_la1[222] = jj_gen;
                  jj_consume_token(-1);
                  throw new ParseException();
              }
                      ;
                      break;
                  default:
-                     jj_la1[221] = jj_gen;
 -                    jj_la1[229] = jj_gen;
 -                    break label_157;
++                    jj_la1[223] = jj_gen;
 +                    break label_154;
                  }
                  jj_consume_token(S);
              }
                  important = prio();
                  break;
              default:
-                 jj_la1[222] = jj_gen;
 -                jj_la1[230] = jj_gen;
++                jj_la1[224] = jj_gen;
                  ;
              }
              documentHandler.property(name, exp, important);
                  ;
                  break;
              default:
-                 jj_la1[223] = jj_gen;
 -                jj_la1[231] = jj_gen;
 -                break label_158;
++                jj_la1[225] = jj_gen;
 +                break label_155;
              }
              jj_consume_token(S);
          }
                  ;
                  break;
              default:
-                 jj_la1[224] = jj_gen;
 -                jj_la1[232] = jj_gen;
 -                break label_159;
++                jj_la1[226] = jj_gen;
 +                break label_156;
              }
              jj_consume_token(S);
          }
                      ;
                      break;
                  default:
-                     jj_la1[225] = jj_gen;
 -                    jj_la1[233] = jj_gen;
 -                    break label_160;
++                    jj_la1[227] = jj_gen;
 +                    break label_157;
                  }
                  jj_consume_token(S);
              }
                      ;
                      break;
                  default:
-                     jj_la1[226] = jj_gen;
 -                    jj_la1[234] = jj_gen;
 -                    break label_161;
++                    jj_la1[228] = jj_gen;
 +                    break label_158;
                  }
                  jj_consume_token(S);
              }
                      ;
                      break;
                  default:
-                     jj_la1[227] = jj_gen;
 -                    jj_la1[235] = jj_gen;
 -                    break label_162;
++                    jj_la1[229] = jj_gen;
 +                    break label_159;
                  }
                  jj_consume_token(S);
              }
                      ;
                      break;
                  default:
-                     jj_la1[228] = jj_gen;
 -                    jj_la1[236] = jj_gen;
 -                    break label_163;
++                    jj_la1[230] = jj_gen;
 +                    break label_160;
                  }
                  jj_consume_token(S);
              }
                      ;
                      break;
                  default:
-                     jj_la1[229] = jj_gen;
 -                    jj_la1[237] = jj_gen;
 -                    break label_164;
++                    jj_la1[231] = jj_gen;
 +                    break label_161;
                  }
              }
              {
                      ;
                      break;
                  default:
-                     jj_la1[230] = jj_gen;
 -                    jj_la1[238] = jj_gen;
 -                    break label_165;
++                    jj_la1[232] = jj_gen;
 +                    break label_162;
                  }
              }
              {
              }
              break;
          default:
-             jj_la1[231] = jj_gen;
 -            jj_la1[239] = jj_gen;
++            jj_la1[233] = jj_gen;
              jj_consume_token(-1);
              throw new ParseException();
          }
              }
              break;
          default:
-             jj_la1[232] = jj_gen;
 -            jj_la1[240] = jj_gen;
++            jj_la1[234] = jj_gen;
              jj_consume_token(-1);
              throw new ParseException();
          }
              result = variableTerm(prev);
              break;
          default:
-             jj_la1[233] = jj_gen;
 -            jj_la1[241] = jj_gen;
++            jj_la1[235] = jj_gen;
              jj_consume_token(-1);
              throw new ParseException();
          }
                  op = unaryOperator();
                  break;
              default:
-                 jj_la1[234] = jj_gen;
 -                jj_la1[242] = jj_gen;
++                jj_la1[236] = jj_gen;
                  ;
              }
              switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
                  result = function(op, prev);
                  break;
              default:
-                 jj_la1[235] = jj_gen;
 -                jj_la1[243] = jj_gen;
++                jj_la1[237] = jj_gen;
                  jj_consume_token(-1);
                  throw new ParseException();
              }
                      s += ".";
                      break;
                  default:
-                     jj_la1[236] = jj_gen;
 -                    jj_la1[244] = jj_gen;
++                    jj_la1[238] = jj_gen;
                      ;
                  }
                  switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
                      n = jj_consume_token(FROM);
                      break;
                  default:
-                     jj_la1[237] = jj_gen;
 -                    jj_la1[245] = jj_gen;
++                    jj_la1[239] = jj_gen;
                      jj_consume_token(-1);
                      throw new ParseException();
                  }
                  result = unicode(prev);
                  break;
              default:
-                 jj_la1[238] = jj_gen;
 -                jj_la1[246] = jj_gen;
++                jj_la1[240] = jj_gen;
                  jj_consume_token(-1);
                  throw new ParseException();
              }
              break;
          default:
-             jj_la1[239] = jj_gen;
 -            jj_la1[247] = jj_gen;
++            jj_la1[241] = jj_gen;
              jj_consume_token(-1);
              throw new ParseException();
          }
                  ;
                  break;
              default:
-                 jj_la1[240] = jj_gen;
 -                jj_la1[248] = jj_gen;
 -                break label_167;
++                jj_la1[242] = jj_gen;
 +                break label_164;
              }
              jj_consume_token(S);
          }
                  ;
                  break;
              default:
-                 jj_la1[241] = jj_gen;
 -                jj_la1[249] = jj_gen;
 -                break label_168;
++                jj_la1[243] = jj_gen;
 +                break label_165;
              }
              jj_consume_token(S);
          }
              params = expr();
              break;
          default:
-             jj_la1[242] = jj_gen;
 -            jj_la1[250] = jj_gen;
++            jj_la1[244] = jj_gen;
              ;
          }
          jj_consume_token(RPARAN);
                  ;
                  break;
              default:
-                 jj_la1[243] = jj_gen;
 -                jj_la1[251] = jj_gen;
 -                break label_169;
++                jj_la1[245] = jj_gen;
 +                break label_166;
              }
              jj_consume_token(S);
          }
              fontFace();
              break;
          default:
-             jj_la1[244] = jj_gen;
 -            jj_la1[252] = jj_gen;
++            jj_la1[246] = jj_gen;
              ret = skipStatement();
              if ((ret == null) || (ret.length() == 0)) {
                  {
                  ;
                  break;
              default:
-                 jj_la1[245] = jj_gen;
 -                jj_la1[253] = jj_gen;
 -                break label_170;
++                jj_la1[247] = jj_gen;
 +                break label_167;
              }
              jj_consume_token(S);
          }
                  ;
                  break;
              default:
-                 jj_la1[246] = jj_gen;
 -                jj_la1[254] = jj_gen;
 -                break label_171;
++                jj_la1[248] = jj_gen;
 +                break label_168;
              }
              jj_consume_token(S);
          }
                  ;
                  break;
              default:
-                 jj_la1[247] = jj_gen;
 -                jj_la1[255] = jj_gen;
 -                break label_172;
++                jj_la1[249] = jj_gen;
 +                break label_169;
              }
              jj_consume_token(S);
          }
              declaration();
              break;
          default:
-             jj_la1[248] = jj_gen;
 -            jj_la1[256] = jj_gen;
++            jj_la1[250] = jj_gen;
              ;
          }
 -        label_173: while (true) {
 +        label_170: while (true) {
              switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
              case SEMICOLON:
                  ;
                  break;
              default:
-                 jj_la1[249] = jj_gen;
 -                jj_la1[257] = jj_gen;
 -                break label_173;
++                jj_la1[251] = jj_gen;
 +                break label_170;
              }
              jj_consume_token(SEMICOLON);
 -            label_174: while (true) {
 +            label_171: while (true) {
                  switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
                  case S:
                      ;
                      break;
                  default:
-                     jj_la1[250] = jj_gen;
 -                    jj_la1[258] = jj_gen;
 -                    break label_174;
++                    jj_la1[252] = jj_gen;
 +                    break label_171;
                  }
                  jj_consume_token(S);
              }
                  declaration();
                  break;
              default:
-                 jj_la1[251] = jj_gen;
 -                jj_la1[259] = jj_gen;
++                jj_la1[253] = jj_gen;
                  ;
              }
          }
                      ;
                      break;
                  default:
-                     jj_la1[252] = jj_gen;
 -                    jj_la1[260] = jj_gen;
 -                    break label_175;
++                    jj_la1[254] = jj_gen;
 +                    break label_172;
                  }
                  jj_consume_token(S);
              }
      private Token jj_scanpos, jj_lastpos;
      private int jj_la;
      private int jj_gen;
-     final private int[] jj_la1 = new int[253];
 -    final private int[] jj_la1 = new int[261];
++    final private int[] jj_la1 = new int[255];
      static private int[] jj_la1_0;
      static private int[] jj_la1_1;
      static private int[] jj_la1_2;
                  0xc40002, 0xc40000, 0x2, 0x2, 0x80120002, 0x80120002, 0x2, 0x0,
                  0x0, 0x2, 0x2, 0x2, 0x2, 0xd4c40000, 0xd4c40000, 0x2, 0x100000,
                  0x2, 0xd4c40000, 0x2, 0x84000000, 0x84000000, 0x84000000,
 -                0x84000000, 0x84000000, 0x84000000, 0x84000000, 0x84000000,
 -                0x84000000, 0x84000000, 0xd4000000, 0x0, 0x0, 0x0, 0x0,
 -                0x50000000, 0x2, 0x2, 0x3f000, 0x2, 0x0, 0x2, 0x3f000, 0x0,
 -                0x2, 0x0, 0x2, 0x0, 0x2, 0x200000, 0x0, 0xd4c40000, 0x0,
 -                0x134e0002, 0x2, 0xd4c40000, 0xd4c40000, 0x2, 0x0, 0x2,
 -                0x134e0002, 0x0, 0x2, 0xd4c40000, 0xd4c40000, 0x2, 0x134e0002,
 -                0x2, 0x2, 0x2, 0x0, 0x2, 0xd4c40000, 0x2, 0x2, 0x100000, 0x2,
 -                0x2, 0x2, 0x2, 0x0, 0x2, 0xd4c40000, 0xd4c40000, 0x2, 0x100000,
 -                0x2, 0x2, 0x2, 0x100000, 0x0, 0x0, 0x800c0000, 0x2, 0x0,
 -                0x100000, 0x2, 0x800c0000, 0x2, 0x0, 0x2, 0x0, 0x2, 0x2,
 -                0x200000, 0x2, 0xd4c40000, 0x2, 0x200400, 0x2, 0x2, 0x0, 0x2,
 -                0x0, 0x2, 0x2, 0x2, 0x100000, 0x2, 0x2, 0x2, 0x2, 0x2, 0x0,
 -                0x2, 0x2, 0x2, 0x100000, 0x2, 0x2, 0x2, 0x0, 0x2, 0x2, 0x2,
 -                0x100000, 0x2, 0x2, 0x0, 0x2, 0x0, 0x2, 0x2, 0x2, 0x100000,
 -                0x0, 0x2, 0x2, 0x0, 0x2, 0x2, 0x2, 0x200000, 0x2, 0x2,
 -                0x200000, 0x2, 0x2, 0x0, 0x200000, 0x2, 0x0, 0x2, 0x0,
 -                0xd4c40000, 0x2, 0x0, 0x2, 0x0, 0x200000, 0x2, 0x0, 0x2,
 -                0x800c0400, 0x2, 0x0, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2,
 -                0x321c0000, 0xc0000, 0x800c0000, 0xc0000, 0x0, 0x80000000, 0x0,
 -                0x80000000, 0x800c0000, 0x2, 0x2, 0x800c0000, 0x2, 0xd4c40000,
 -                0x2, 0x2, 0x2, 0x0, 0x200000, 0x2, 0x0, 0x2, };
 +                0x84000000, 0xd4000000, 0x0, 0x0, 0x0, 0x0, 0x50000000, 0x2,
 +                0x2, 0x3f000, 0x2, 0x0, 0x2, 0x3f000, 0x0, 0x2, 0x0, 0x2, 0x0,
 +                0x2, 0x200000, 0x0, 0xd4c40000, 0x0, 0x134e0002, 0x2,
-                 0xd4c40000, 0x2, 0x0, 0x2, 0x134e0002, 0x0, 0x2, 0xd4c40000,
-                 0x2, 0x134e0002, 0x2, 0x2, 0x2, 0x0, 0x2, 0xd4c40000, 0x2, 0x2,
-                 0x100000, 0x2, 0x2, 0x2, 0x2, 0x0, 0x2, 0xd4c40000, 0xd4c40000,
-                 0x2, 0x100000, 0x2, 0x2, 0x2, 0x100000, 0x0, 0x0, 0x800c0000,
-                 0x2, 0x0, 0x100000, 0x2, 0x800c0000, 0x2, 0x0, 0x2, 0x2, 0x0,
-                 0x2, 0x200000, 0x2, 0xd4c40000, 0x2, 0x200400, 0x2, 0x2, 0x0,
-                 0x2, 0x0, 0x2, 0x2, 0x2, 0x100000, 0x2, 0x2, 0x2, 0x2, 0x2,
-                 0x0, 0x2, 0x2, 0x2, 0x100000, 0x2, 0x2, 0x2, 0x0, 0x2, 0x2,
-                 0x2, 0x100000, 0x2, 0x2, 0x0, 0x2, 0x0, 0x2, 0x2, 0x2,
-                 0x100000, 0x0, 0x2, 0x2, 0x0, 0x2, 0x2, 0x2, 0x200000, 0x2,
-                 0x2, 0x200000, 0x2, 0x2, 0x0, 0x200000, 0x2, 0x0, 0x2, 0x0,
-                 0xd4c40000, 0x2, 0x0, 0x2, 0x0, 0x200000, 0x2, 0x0, 0x2,
-                 0x800c0400, 0x2, 0x0, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2,
-                 0x321c0000, 0xc0000, 0x800c0000, 0xc0000, 0x0, 0x80000000, 0x0,
-                 0x80000000, 0x800c0000, 0x2, 0x2, 0x800c0000, 0x2, 0xd4c40000,
-                 0x2, 0x2, 0x2, 0x0, 0x200000, 0x2, 0x0, 0x2, };
++                0xd4c40000, 0xd4c40000, 0x2, 0x0, 0x2, 0x134e0002, 0x0, 0x2,
++                0xd4c40000, 0xd4c40000, 0x2, 0x134e0002, 0x2, 0x2, 0x2, 0x0,
++                0x2, 0xd4c40000, 0x2, 0x2, 0x100000, 0x2, 0x2, 0x2, 0x2, 0x0,
++                0x2, 0xd4c40000, 0xd4c40000, 0x2, 0x100000, 0x2, 0x2, 0x2,
++                0x100000, 0x0, 0x0, 0x800c0000, 0x2, 0x0, 0x100000, 0x2,
++                0x800c0000, 0x2, 0x0, 0x2, 0x2, 0x0, 0x2, 0x200000, 0x2,
++                0xd4c40000, 0x2, 0x200400, 0x2, 0x2, 0x0, 0x2, 0x0, 0x2, 0x2,
++                0x2, 0x100000, 0x2, 0x2, 0x2, 0x2, 0x2, 0x0, 0x2, 0x2, 0x2,
++                0x100000, 0x2, 0x2, 0x2, 0x0, 0x2, 0x2, 0x2, 0x100000, 0x2,
++                0x2, 0x0, 0x2, 0x0, 0x2, 0x2, 0x2, 0x100000, 0x0, 0x2, 0x2,
++                0x0, 0x2, 0x2, 0x2, 0x200000, 0x2, 0x2, 0x200000, 0x2, 0x2,
++                0x0, 0x200000, 0x2, 0x0, 0x2, 0x0, 0xd4c40000, 0x2, 0x0, 0x2,
++                0x0, 0x200000, 0x2, 0x0, 0x2, 0x800c0400, 0x2, 0x0, 0x2, 0x2,
++                0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x321c0000, 0xc0000, 0x800c0000,
++                0xc0000, 0x0, 0x80000000, 0x0, 0x80000000, 0x800c0000, 0x2,
++                0x2, 0x800c0000, 0x2, 0xd4c40000, 0x2, 0x2, 0x2, 0x0, 0x200000,
++                0x2, 0x0, 0x2, };
      }
  
      private static void jj_la1_init_1() {
                  0x0, 0x0, 0x80, 0x0, 0x100, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc2,
                  0xc2, 0x0, 0x80, 0x80, 0x0, 0x0, 0x0, 0x0, 0x564000c0,
                  0x564000c0, 0x0, 0x0, 0x0, 0xc0, 0x0, 0x40, 0x40, 0x40, 0x40,
 -                0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0xc0, 0x80, 0x80, 0x80,
 -                0x80, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x40, 0x0, 0x0,
 -                0x0, 0x0, 0x0, 0x0, 0x50000000, 0x64000c0, 0x50000000, 0x3f,
 -                0x0, 0x564000c0, 0x564000c0, 0x0, 0x80000000, 0x0, 0x3f, 0x0,
 -                0x0, 0x564000c0, 0x564000c0, 0x0, 0x3f, 0x0, 0x0, 0x0, 0x0,
 -                0x0, 0x564000c0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x80, 0x0,
 -                0x564000c0, 0x564000c0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x40,
 -                0x40, 0x160040, 0x0, 0x40, 0x0, 0x0, 0x160040, 0x0, 0x40, 0x0,
 -                0x80, 0x0, 0x0, 0x0, 0x0, 0x60000c0, 0x0, 0x0, 0x0, 0x0, 0x0,
 -                0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2,
 -                0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0,
 -                0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x6000000, 0x0,
 -                0x0, 0x60000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
 -                0x80, 0x0, 0x0, 0x80, 0x0, 0x6000000, 0xc0, 0x0, 0x0, 0x0,
 -                0x80, 0x0, 0x0, 0x80, 0x0, 0x160000, 0x0, 0x0, 0x0, 0x0, 0x0,
 -                0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x160000, 0x0, 0x0, 0x0,
 -                0x160000, 0x160000, 0x160000, 0x0, 0x0, 0x160000, 0x0,
 -                0x60000c0, 0x0, 0x0, 0x0, 0x80, 0x0, 0x0, 0x80, 0x0, };
 +                0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0,
 +                0x0, 0x0, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x50000000,
-                 0x64000c0, 0x50000000, 0x3f, 0x0, 0x564000c0, 0x0, 0x80000000,
-                 0x0, 0x3f, 0x0, 0x0, 0x564000c0, 0x0, 0x3f, 0x0, 0x0, 0x0, 0x0,
-                 0x0, 0x564000c0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x80, 0x0,
-                 0x564000c0, 0x564000c0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x40,
-                 0x40, 0x160040, 0x0, 0x40, 0x0, 0x0, 0x160040, 0x0, 0x40, 0x0,
-                 0x0, 0x80, 0x0, 0x0, 0x0, 0x60000c0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2,
-                 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0,
-                 0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x6000000, 0x0,
-                 0x0, 0x60000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                 0x80, 0x0, 0x0, 0x80, 0x0, 0x6000000, 0xc0, 0x0, 0x0, 0x0,
-                 0x80, 0x0, 0x0, 0x80, 0x0, 0x160000, 0x0, 0x0, 0x0, 0x0, 0x0,
-                 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x160000, 0x0, 0x0, 0x0,
-                 0x160000, 0x160000, 0x160000, 0x0, 0x0, 0x160000, 0x0,
-                 0x60000c0, 0x0, 0x0, 0x0, 0x80, 0x0, 0x0, 0x80, 0x0, };
++                0x64000c0, 0x50000000, 0x3f, 0x0, 0x564000c0, 0x564000c0, 0x0,
++                0x80000000, 0x0, 0x3f, 0x0, 0x0, 0x564000c0, 0x564000c0, 0x0,
++                0x3f, 0x0, 0x0, 0x0, 0x0, 0x0, 0x564000c0, 0x0, 0x0, 0x0, 0x0,
++                0x0, 0x0, 0x0, 0x80, 0x0, 0x564000c0, 0x564000c0, 0x0, 0x0,
++                0x0, 0x0, 0x0, 0x0, 0x40, 0x40, 0x160040, 0x0, 0x40, 0x0, 0x0,
++                0x160040, 0x0, 0x40, 0x0, 0x0, 0x80, 0x0, 0x0, 0x0, 0x60000c0,
++                0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0,
++                0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
++                0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0,
++                0x0, 0x0, 0x6000000, 0x0, 0x0, 0x60000, 0x0, 0x0, 0x0, 0x0,
++                0x0, 0x0, 0x0, 0x0, 0x0, 0x80, 0x0, 0x0, 0x80, 0x0, 0x6000000,
++                0xc0, 0x0, 0x0, 0x0, 0x80, 0x0, 0x0, 0x80, 0x0, 0x160000, 0x0,
++                0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
++                0x160000, 0x0, 0x0, 0x0, 0x160000, 0x160000, 0x160000, 0x0,
++                0x0, 0x160000, 0x0, 0x60000c0, 0x0, 0x0, 0x0, 0x80, 0x0, 0x0,
++                0x80, 0x0, };
      }
  
      private static void jj_la1_init_2() {
                  0x100, 0x0, 0x0, 0x100, 0x0, 0x0, 0x0, 0x0, 0x100, 0x0, 0x0,
                  0x100, 0x0, 0x2a80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x380, 0x380, 0x0,
                  0x100, 0x100, 0x0, 0x0, 0x0, 0x0, 0x1119, 0x1119, 0x0, 0x0,
-                 0x0, 0x1109, 0x0, 0x0, 0x0, 0x1300, 0x20, 0x0, 0x1109, 0x0,
-                 0x1300, 0x0, 0x0, 0x0, 0x1100, 0x0, 0x1109, 0x0, 0x0, 0x0, 0x0,
-                 0x0, 0x0, 0x0, 0x100, 0x0, 0x1109, 0x1109, 0x0, 0x0, 0x0, 0x0,
-                 0x0, 0x0, 0x1000, 0x1000, 0xfffffb80, 0x0, 0x0, 0x0, 0x0,
-                 0xfffffb80, 0x0, 0x0, 0x0, 0x0, 0x1100, 0x0, 0x0, 0x0, 0x100,
 +                0x0, 0x100, 0x0, 0x0, 0x0, 0x0, 0x0, 0x100, 0x100, 0x100,
 +                0x100, 0x100, 0x100, 0x0, 0x0, 0x0, 0x0, 0x180, 0x0, 0x0, 0x0,
 +                0x0, 0x100, 0x0, 0x40, 0x0, 0x0, 0x0, 0x109, 0x1000, 0x1300,
 -                0x0, 0x100, 0x100, 0x100, 0x100, 0x100, 0x100, 0x0, 0x0, 0x0,
 -                0x0, 0x180, 0x0, 0x0, 0x0, 0x0, 0x100, 0x0, 0x40, 0x0, 0x0,
 -                0x0, 0x109, 0x1000, 0x1300, 0x0, 0x1109, 0x1109, 0x0, 0x0, 0x0,
 -                0x1300, 0x20, 0x0, 0x1109, 0x1109, 0x0, 0x1300, 0x0, 0x0, 0x0,
 -                0x1100, 0x0, 0x1109, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x100,
 -                0x0, 0x1109, 0x1109, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1000,
 -                0x1000, 0xfffffb80, 0x0, 0x0, 0x0, 0x0, 0xfffffb80, 0x0, 0x0,
 -                0x0, 0x1100, 0x0, 0x0, 0x0, 0x0, 0x100, 0x0, 0x0, 0x0, 0x0,
++                0x0, 0x1109, 0x1109, 0x0, 0x0, 0x0, 0x1300, 0x20, 0x0, 0x1109,
++                0x1109, 0x0, 0x1300, 0x0, 0x0, 0x0, 0x1100, 0x0, 0x1109, 0x0,
++                0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x100, 0x0, 0x1109, 0x1109, 0x0,
++                0x0, 0x0, 0x0, 0x0, 0x0, 0x1000, 0x1000, 0xfffffb80, 0x0, 0x0,
++                0x0, 0x0, 0xfffffb80, 0x0, 0x0, 0x0, 0x0, 0x1100, 0x0, 0x0,
+                 0x0, 0x100, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
                  0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1000, 0x0, 0x0, 0x0, 0x0,
++                0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1000, 0x0, 0x0,
 +                0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
++                0x0, 0x0, 0x0, 0x0, 0x0, 0x100, 0x0, 0x0, 0x100, 0x0, 0x0,
++                0x100, 0x0, 0x0, 0x0, 0x100, 0x0, 0x0, 0x100, 0x0, 0xfffffb80,
                  0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                 0x0, 0x0, 0x0, 0x100, 0x0, 0x0, 0x100, 0x0, 0x0, 0x100, 0x0,
-                 0x0, 0x0, 0x100, 0x0, 0x0, 0x100, 0x0, 0xfffffb80, 0x0, 0x0,
-                 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfffffb80,
-                 0x0, 0xffffe200, 0x0, 0x100, 0x980, 0xffffeb80, 0x0, 0x0,
-                 0xfffffb80, 0x0, 0x100, 0x0, 0x0, 0x0, 0x100, 0x0, 0x0, 0x100,
-                 0x0, };
 -                0x0, 0x0, 0x0, 0x1000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
 -                0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x100,
 -                0x0, 0x0, 0x100, 0x0, 0x0, 0x100, 0x0, 0x0, 0x0, 0x100, 0x0,
 -                0x0, 0x100, 0x0, 0xfffffb80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
 -                0x0, 0x0, 0x0, 0x0, 0x0, 0xfffffb80, 0x0, 0xffffe200, 0x0,
 -                0x100, 0x980, 0xffffeb80, 0x0, 0x0, 0xfffffb80, 0x0, 0x100,
 -                0x0, 0x0, 0x0, 0x100, 0x0, 0x0, 0x100, 0x0, };
++                0xfffffb80, 0x0, 0xffffe200, 0x0, 0x100, 0x980, 0xffffeb80,
++                0x0, 0x0, 0xfffffb80, 0x0, 0x100, 0x0, 0x0, 0x0, 0x100, 0x0,
++                0x0, 0x100, 0x0, };
      }
  
      private static void jj_la1_init_3() {
                  0xc401bf, 0xc401bf, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
                  0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
                  0xc401be, 0x0, 0x0, 0x0, 0x0, 0x0, 0x400000, 0x400000, 0x0,
-                 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x47, 0x47, 0x0, 0x0, 0x0, 0x1,
+                 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc7, 0xc7, 0x0, 0x0, 0x0, 0x1,
 -                0x0, 0x1, 0x1, 0x0, 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1,
 +                0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
 +                0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x400000, 0x0, 0x0,
-                 0x0, 0x0, 0x0, 0x45, 0x0, 0x200000, 0x0, 0x45, 0x0, 0x0, 0x0,
-                 0x200000, 0x0, 0x0, 0x45, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                 0x45, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x400000, 0x0, 0x75,
-                 0x75, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x440001, 0x0,
-                 0x0, 0x0, 0x0, 0x440001, 0x0, 0x0, 0x0, 0x0, 0x400000, 0x0,
-                 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x380000, 0x0, 0x0, 0x0,
++                0x0, 0x0, 0x0, 0x45, 0x80, 0x200000, 0x0, 0xe5, 0xe5, 0x0, 0x0,
++                0x0, 0x200000, 0x0, 0x0, 0xe5, 0xe5, 0x0, 0x0, 0x0, 0x0, 0x0,
++                0x0, 0x0, 0xc5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x400000,
++                0x0, 0xf5, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
++                0x440001, 0x0, 0x0, 0x0, 0x0, 0x440001, 0x0, 0x0, 0x0, 0x0,
++                0x400000, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x380000,
                  0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
 -                0x0, 0x0, 0x400000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x45, 0x80,
 -                0x200000, 0x0, 0xe5, 0xe5, 0x0, 0x0, 0x0, 0x200000, 0x0, 0x0,
 -                0xe5, 0xe5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc5, 0x0, 0x0,
 -                0x0, 0x0, 0x0, 0x0, 0x0, 0x400000, 0x0, 0xd5, 0xd5, 0x0, 0x0,
 -                0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x440001, 0x0, 0x0, 0x0, 0x0,
 -                0x440001, 0x0, 0x0, 0x0, 0x400000, 0x0, 0x0, 0x0, 0x0, 0x1,
 -                0x0, 0x0, 0x0, 0x0, 0x380000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
                  0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
                  0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
                  0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                 0x0, 0x1, 0x0, 0x100, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x440001,
-                 0x0, 0x100, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                 0x440001, 0x0, 0x400000, 0x0, 0x0, 0x40001, 0x440001, 0x0, 0x0,
-                 0x440001, 0x0, 0x37, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, };
 -                0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0,
 -                0x100, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x440001, 0x0, 0x100, 0x0,
 -                0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x440001, 0x0,
 -                0x400000, 0x0, 0x0, 0x40001, 0x440001, 0x0, 0x0, 0x440001, 0x0,
 -                0x37, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, };
++                0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x100, 0x0, 0x0, 0x0, 0x0, 0x0,
++                0x0, 0x440001, 0x0, 0x100, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
++                0x0, 0x0, 0x0, 0x440001, 0x0, 0x400000, 0x0, 0x0, 0x40001,
++                0x440001, 0x0, 0x0, 0x440001, 0x0, 0x37, 0x0, 0x0, 0x0, 0x0,
++                0x0, 0x0, 0x0, 0x0, };
      }
  
      final private JJCalls[] jj_2_rtns = new JJCalls[9];
          token = new Token();
          jj_ntk = -1;
          jj_gen = 0;
-         for (int i = 0; i < 253; i++) {
 -        for (int i = 0; i < 261; i++) {
++        for (int i = 0; i < 255; i++) {
              jj_la1[i] = -1;
          }
          for (int i = 0; i < jj_2_rtns.length; i++) {
          token = new Token();
          jj_ntk = -1;
          jj_gen = 0;
-         for (int i = 0; i < 253; i++) {
 -        for (int i = 0; i < 261; i++) {
++        for (int i = 0; i < 255; i++) {
              jj_la1[i] = -1;
          }
          for (int i = 0; i < jj_2_rtns.length; i++) {
          token = new Token();
          jj_ntk = -1;
          jj_gen = 0;
-         for (int i = 0; i < 253; i++) {
 -        for (int i = 0; i < 261; i++) {
++        for (int i = 0; i < 255; i++) {
              jj_la1[i] = -1;
          }
          for (int i = 0; i < jj_2_rtns.length; i++) {
          token = new Token();
          jj_ntk = -1;
          jj_gen = 0;
-         for (int i = 0; i < 253; i++) {
 -        for (int i = 0; i < 261; i++) {
++        for (int i = 0; i < 255; i++) {
              jj_la1[i] = -1;
          }
          for (int i = 0; i < jj_2_rtns.length; i++) {
              la1tokens[jj_kind] = true;
              jj_kind = -1;
          }
-         for (int i = 0; i < 253; i++) {
 -        for (int i = 0; i < 261; i++) {
++        for (int i = 0; i < 255; i++) {
              if (jj_la1[i] == jj_gen) {
                  for (int j = 0; j < 32; j++) {
                      if ((jj_la1_0[i] & (1 << j)) != 0) {