From: Jonatan Kronqvist <jonatan@vaadin.com>
Date: Mon, 10 Feb 2014 07:43:44 +0000 (+0200)
Subject: Merge commit '3bfd0046eaead75e6b8cac7dc7b2d1ecceb25dc9' into master
X-Git-Tag: 7.2.0.beta1~175
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7e1006430c9c5f2647dbf78d2a2abee981e9f27d;p=vaadin-framework.git

Merge commit '3bfd0046eaead75e6b8cac7dc7b2d1ecceb25dc9' into master

Conflicts:
	theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java

Change-Id: I6516a1f73cd2fb363407d9301f497b2e63bb92f9
---

7e1006430c9c5f2647dbf78d2a2abee981e9f27d
diff --cc theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
index a96932cb5d,6b4a03b038..0c10e09a6c
--- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
@@@ -4584,33 -4673,22 +4584,22 @@@ boolean isPseudoElement = false
  
    final public void debugDirective() throws ParseException {
      jj_consume_token(DEBUG_SYM);
-     String content = skipStatementUntil(new int[] {SEMICOLON,RBRACE});
+     String content = skipStatementUntil(new int[] {SEMICOLON,RBRACE,EOF});
      // TODO should evaluate the content expression, call documentHandler.debugDirective() etc.
 -    System.out.println(content);
 +    Logger.getLogger(Parser.class.getName()).log(Level.INFO, content);
      try {
+       jj_consume_token(SEMICOLON);
 -      label_141:
 +      label_138:
        while (true) {
-         jj_consume_token(SEMICOLON);
-         label_139:
-         while (true) {
-           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-           case S:
-             ;
-             break;
-           default:
-             jj_la1[203] = jj_gen;
-             break label_139;
-           }
-           jj_consume_token(S);
-         }
          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-         case SEMICOLON:
+         case S:
            ;
            break;
          default:
-           jj_la1[204] = jj_gen;
 -          jj_la1[209] = jj_gen;
 -          break label_141;
++          jj_la1[203] = jj_gen;
 +          break label_138;
          }
+         jj_consume_token(S);
        }
      } catch (ParseException e) {
        acceptMissingSemicolonBeforeRbrace(e);
@@@ -4619,33 -4697,22 +4608,22 @@@
  
    final public void warnDirective() throws ParseException {
      jj_consume_token(WARN_SYM);
-     String content = skipStatementUntil(new int[] {SEMICOLON,RBRACE});
+     String content = skipStatementUntil(new int[] {SEMICOLON,RBRACE,EOF});
      // TODO should evaluate the content expression, call documentHandler.warnDirective() etc.
 -    System.err.println(content);
 +    Logger.getLogger(Parser.class.getName()).log(Level.SEVERE, content);
      try {
-       label_140:
+       jj_consume_token(SEMICOLON);
 -      label_142:
++      label_139:
        while (true) {
-         jj_consume_token(SEMICOLON);
-         label_141:
-         while (true) {
-           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-           case S:
-             ;
-             break;
-           default:
-             jj_la1[205] = jj_gen;
-             break label_141;
-           }
-           jj_consume_token(S);
-         }
          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-         case SEMICOLON:
+         case S:
            ;
            break;
          default:
-           jj_la1[206] = jj_gen;
-           break label_140;
 -          jj_la1[210] = jj_gen;
 -          break label_142;
++          jj_la1[204] = jj_gen;
++          break label_139;
          }
+         jj_consume_token(S);
        }
      } catch (ParseException e) {
        acceptMissingSemicolonBeforeRbrace(e);
@@@ -4672,20 -4739,20 +4650,20 @@@
                         exclusive = false;
        break;
      default:
-       jj_la1[207] = jj_gen;
 -      jj_la1[211] = jj_gen;
++      jj_la1[205] = jj_gen;
        jj_consume_token(-1);
        throw new ParseException();
      }
      to = skipStatementUntilLeftBrace();
-     label_142:
 -    label_143:
++    label_140:
      while (true) {
        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
        case S:
          ;
          break;
        default:
-         jj_la1[208] = jj_gen;
-         break label_142;
 -        jj_la1[212] = jj_gen;
 -        break label_143;
++        jj_la1[206] = jj_gen;
++        break label_140;
        }
        jj_consume_token(S);
      }
@@@ -4706,33 -4773,33 +4684,33 @@@
    final public void extendDirective() throws ParseException {
   ArrayList<String> list;
      jj_consume_token(EXTEND_SYM);
-     label_143:
 -    label_144:
++    label_141:
      while (true) {
        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
        case S:
          ;
          break;
        default:
-         jj_la1[209] = jj_gen;
-         break label_143;
 -        jj_la1[213] = jj_gen;
 -        break label_144;
++        jj_la1[207] = jj_gen;
++        break label_141;
        }
        jj_consume_token(S);
      }
      list = selectorList();
       documentHandler.extendDirective(list);
      try {
-       label_144:
 -      label_145:
++      label_142:
        while (true) {
          jj_consume_token(SEMICOLON);
-         label_145:
 -        label_146:
++        label_143:
          while (true) {
            switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
            case S:
              ;
              break;
            default:
-             jj_la1[210] = jj_gen;
-             break label_145;
 -            jj_la1[214] = jj_gen;
 -            break label_146;
++            jj_la1[208] = jj_gen;
++            break label_143;
            }
            jj_consume_token(S);
          }
@@@ -4741,8 -4808,8 +4719,8 @@@
            ;
            break;
          default:
-           jj_la1[211] = jj_gen;
-           break label_144;
 -          jj_la1[215] = jj_gen;
 -          break label_145;
++          jj_la1[209] = jj_gen;
++          break label_142;
          }
        }
      } catch (ParseException e) {
@@@ -4752,31 -4819,31 +4730,31 @@@
  
    final public void contentDirective() throws ParseException {
      jj_consume_token(CONTENT_SYM);
-     label_146:
 -    label_147:
++    label_144:
      while (true) {
        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
        case S:
          ;
          break;
        default:
-         jj_la1[212] = jj_gen;
-         break label_146;
 -        jj_la1[216] = jj_gen;
 -        break label_147;
++        jj_la1[210] = jj_gen;
++        break label_144;
        }
        jj_consume_token(S);
      }
      try {
-       label_147:
 -      label_148:
++      label_145:
        while (true) {
          jj_consume_token(SEMICOLON);
-         label_148:
 -        label_149:
++        label_146:
          while (true) {
            switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
            case S:
              ;
              break;
            default:
-             jj_la1[213] = jj_gen;
-             break label_148;
 -            jj_la1[217] = jj_gen;
 -            break label_149;
++            jj_la1[211] = jj_gen;
++            break label_146;
            }
            jj_consume_token(S);
          }
@@@ -4785,8 -4852,8 +4763,8 @@@
            ;
            break;
          default:
-           jj_la1[214] = jj_gen;
-           break label_147;
 -          jj_la1[218] = jj_gen;
 -          break label_148;
++          jj_la1[212] = jj_gen;
++          break label_145;
          }
        }
      } catch (ParseException e) {
@@@ -4816,28 -4883,28 +4794,28 @@@
  LexicalUnit exp;
      name = property();
      jj_consume_token(COLON);
-     label_149:
 -    label_150:
++    label_147:
      while (true) {
        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
        case S:
          ;
          break;
        default:
-         jj_la1[215] = jj_gen;
-         break label_149;
 -        jj_la1[219] = jj_gen;
 -        break label_150;
++        jj_la1[213] = jj_gen;
++        break label_147;
        }
        jj_consume_token(S);
      }
      jj_consume_token(LBRACE);
-     label_150:
 -    label_151:
++    label_148:
      while (true) {
        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
        case S:
          ;
          break;
        default:
-         jj_la1[216] = jj_gen;
-         break label_150;
 -        jj_la1[220] = jj_gen;
 -        break label_151;
++        jj_la1[214] = jj_gen;
++        break label_148;
        }
        jj_consume_token(S);
      }
@@@ -4848,29 -4915,29 +4826,29 @@@
        declaration();
        break;
      default:
-       jj_la1[217] = jj_gen;
 -      jj_la1[221] = jj_gen;
++      jj_la1[215] = jj_gen;
        ;
      }
-     label_151:
 -    label_152:
++    label_149:
      while (true) {
        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
        case SEMICOLON:
          ;
          break;
        default:
-         jj_la1[218] = jj_gen;
-         break label_151;
 -        jj_la1[222] = jj_gen;
 -        break label_152;
++        jj_la1[216] = jj_gen;
++        break label_149;
        }
        jj_consume_token(SEMICOLON);
-       label_152:
 -      label_153:
++      label_150:
        while (true) {
          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
          case S:
            ;
            break;
          default:
-           jj_la1[219] = jj_gen;
-           break label_152;
 -          jj_la1[223] = jj_gen;
 -          break label_153;
++          jj_la1[217] = jj_gen;
++          break label_150;
          }
          jj_consume_token(S);
        }
@@@ -4880,21 -4947,21 +4858,21 @@@
          declaration();
          break;
        default:
-         jj_la1[220] = jj_gen;
 -        jj_la1[224] = jj_gen;
++        jj_la1[218] = jj_gen;
          ;
        }
      }
      jj_consume_token(RBRACE);
        documentHandler.endNestedProperties(name);
-     label_153:
 -    label_154:
++    label_151:
      while (true) {
        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
        case S:
          ;
          break;
        default:
-         jj_la1[221] = jj_gen;
-         break label_153;
 -        jj_la1[225] = jj_gen;
 -        break label_154;
++        jj_la1[219] = jj_gen;
++        break label_151;
        }
        jj_consume_token(S);
      }
@@@ -4911,7 -4978,7 +4889,7 @@@
          debuggingDirective();
          break;
        default:
-         jj_la1[222] = jj_gen;
 -        jj_la1[226] = jj_gen;
++        jj_la1[220] = jj_gen;
          if (jj_2_6(2147483647)) {
            styleRule();
          } else if (jj_2_7(3)) {
@@@ -4932,7 -4999,7 +4910,7 @@@
              styleRule();
              break;
            default:
-             jj_la1[223] = jj_gen;
 -            jj_la1[227] = jj_gen;
++            jj_la1[221] = jj_gen;
              jj_consume_token(-1);
              throw new ParseException();
            }
@@@ -4977,15 -5044,15 +4955,15 @@@
        name = property();
         save = token;
        jj_consume_token(COLON);
-       label_154:
 -      label_155:
++      label_152:
        while (true) {
          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
          case S:
            ;
            break;
          default:
-           jj_la1[224] = jj_gen;
-           break label_154;
 -          jj_la1[228] = jj_gen;
 -          break label_155;
++          jj_la1[222] = jj_gen;
++          break label_152;
          }
          jj_consume_token(S);
        }
@@@ -5029,7 -5096,7 +5007,7 @@@
            important = prio();
            break;
          default:
-           jj_la1[225] = jj_gen;
 -          jj_la1[229] = jj_gen;
++          jj_la1[223] = jj_gen;
            ;
          }
           Token next = getToken(1);
@@@ -5048,15 -5115,15 +5026,15 @@@
          break;
        case LBRACE:
          jj_consume_token(LBRACE);
-         label_155:
 -        label_156:
++        label_153:
          while (true) {
            switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
            case S:
              ;
              break;
            default:
-             jj_la1[226] = jj_gen;
-             break label_155;
 -            jj_la1[230] = jj_gen;
 -            break label_156;
++            jj_la1[224] = jj_gen;
++            break label_153;
            }
            jj_consume_token(S);
          }
@@@ -5067,29 -5134,29 +5045,29 @@@
            declaration();
            break;
          default:
-           jj_la1[227] = jj_gen;
 -          jj_la1[231] = jj_gen;
++          jj_la1[225] = jj_gen;
            ;
          }
-         label_156:
 -        label_157:
++        label_154:
          while (true) {
            switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
            case SEMICOLON:
              ;
              break;
            default:
-             jj_la1[228] = jj_gen;
-             break label_156;
 -            jj_la1[232] = jj_gen;
 -            break label_157;
++            jj_la1[226] = jj_gen;
++            break label_154;
            }
            jj_consume_token(SEMICOLON);
-           label_157:
 -          label_158:
++          label_155:
            while (true) {
              switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
              case S:
                ;
                break;
              default:
-               jj_la1[229] = jj_gen;
-               break label_157;
 -              jj_la1[233] = jj_gen;
 -              break label_158;
++              jj_la1[227] = jj_gen;
++              break label_155;
              }
              jj_consume_token(S);
            }
@@@ -5099,27 -5166,27 +5077,27 @@@
              declaration();
              break;
            default:
-             jj_la1[230] = jj_gen;
 -            jj_la1[234] = jj_gen;
++            jj_la1[228] = jj_gen;
              ;
            }
          }
          jj_consume_token(RBRACE);
-         label_158:
 -        label_159:
++        label_156:
          while (true) {
            switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
            case S:
              ;
              break;
            default:
-             jj_la1[231] = jj_gen;
-             break label_158;
 -            jj_la1[235] = jj_gen;
 -            break label_159;
++            jj_la1[229] = jj_gen;
++            break label_156;
            }
            jj_consume_token(S);
          }
           documentHandler.endNestedProperties(name);
          break;
        default:
-         jj_la1[232] = jj_gen;
 -        jj_la1[236] = jj_gen;
++        jj_la1[230] = jj_gen;
          jj_consume_token(-1);
          throw new ParseException();
        }
@@@ -5169,15 -5236,15 +5147,15 @@@
        name = property();
         save = token;
        jj_consume_token(COLON);
-       label_159:
 -      label_160:
++      label_157:
        while (true) {
          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
          case S:
            ;
            break;
          default:
-           jj_la1[233] = jj_gen;
-           break label_159;
 -          jj_la1[237] = jj_gen;
 -          break label_160;
++          jj_la1[231] = jj_gen;
++          break label_157;
          }
          jj_consume_token(S);
        }
@@@ -5187,7 -5254,7 +5165,7 @@@
          important = prio();
          break;
        default:
-         jj_la1[234] = jj_gen;
 -        jj_la1[238] = jj_gen;
++        jj_la1[232] = jj_gen;
          ;
        }
           documentHandler.property(name, exp, important);
@@@ -5230,15 -5297,15 +5208,15 @@@
   */
    final public boolean prio() throws ParseException {
      jj_consume_token(IMPORTANT_SYM);
-     label_160:
 -    label_161:
++    label_158:
      while (true) {
        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
        case S:
          ;
          break;
        default:
-         jj_la1[235] = jj_gen;
-         break label_160;
 -        jj_la1[239] = jj_gen;
 -        break label_161;
++        jj_la1[233] = jj_gen;
++        break label_158;
        }
        jj_consume_token(S);
      }
@@@ -5248,15 -5315,15 +5226,15 @@@
  
    final public boolean guarded() throws ParseException {
      jj_consume_token(GUARDED_SYM);
-     label_161:
 -    label_162:
++    label_159:
      while (true) {
        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
        case S:
          ;
          break;
        default:
-         jj_la1[236] = jj_gen;
-         break label_161;
 -        jj_la1[240] = jj_gen;
 -        break label_162;
++        jj_la1[234] = jj_gen;
++        break label_159;
        }
        jj_consume_token(S);
      }
@@@ -5281,15 -5348,15 +5259,15 @@@
        * 3. parenthesis is not supported now.  
        */
        n = jj_consume_token(COMMA);
-       label_162:
 -      label_163:
++      label_160:
        while (true) {
          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
          case S:
            ;
            break;
          default:
-           jj_la1[237] = jj_gen;
-           break label_162;
 -          jj_la1[241] = jj_gen;
 -          break label_163;
++          jj_la1[235] = jj_gen;
++          break label_160;
          }
          jj_consume_token(S);
        }
@@@ -5299,15 -5366,15 +5277,15 @@@
        break;
      case DIV:
        n = jj_consume_token(DIV);
-       label_163:
 -      label_164:
++      label_161:
        while (true) {
          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
          case S:
            ;
            break;
          default:
-           jj_la1[238] = jj_gen;
-           break label_163;
 -          jj_la1[242] = jj_gen;
 -          break label_164;
++          jj_la1[236] = jj_gen;
++          break label_161;
          }
          jj_consume_token(S);
        }
@@@ -5317,15 -5384,15 +5295,15 @@@
        break;
      case ANY:
        n = jj_consume_token(ANY);
-       label_164:
 -      label_165:
++      label_162:
        while (true) {
          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
          case S:
            ;
            break;
          default:
-           jj_la1[239] = jj_gen;
-           break label_164;
 -          jj_la1[243] = jj_gen;
 -          break label_165;
++          jj_la1[237] = jj_gen;
++          break label_162;
          }
          jj_consume_token(S);
        }
@@@ -5335,15 -5402,15 +5313,15 @@@
        break;
      case MOD:
        n = jj_consume_token(MOD);
-       label_165:
 -      label_166:
++      label_163:
        while (true) {
          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
          case S:
            ;
            break;
          default:
-           jj_la1[240] = jj_gen;
-           break label_165;
 -          jj_la1[244] = jj_gen;
 -          break label_166;
++          jj_la1[238] = jj_gen;
++          break label_163;
          }
          jj_consume_token(S);
        }
@@@ -5353,7 -5420,7 +5331,7 @@@
        break;
      case PLUS:
        n = jj_consume_token(PLUS);
-       label_166:
 -      label_167:
++      label_164:
        while (true) {
          jj_consume_token(S);
          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@@ -5361,8 -5428,8 +5339,8 @@@
            ;
            break;
          default:
-           jj_la1[241] = jj_gen;
-           break label_166;
 -          jj_la1[245] = jj_gen;
 -          break label_167;
++          jj_la1[239] = jj_gen;
++          break label_164;
          }
        }
                    {if (true) return LexicalUnitImpl.createAdd(n.beginLine,
@@@ -5371,7 -5438,7 +5349,7 @@@
        break;
      case MINUS:
        n = jj_consume_token(MINUS);
-       label_167:
 -      label_168:
++      label_165:
        while (true) {
          jj_consume_token(S);
          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@@ -5379,8 -5446,8 +5357,8 @@@
            ;
            break;
          default:
-           jj_la1[242] = jj_gen;
-           break label_167;
 -          jj_la1[246] = jj_gen;
 -          break label_168;
++          jj_la1[240] = jj_gen;
++          break label_165;
          }
        }
                    {if (true) return LexicalUnitImpl.createMinus(n.beginLine,
@@@ -5388,7 -5455,7 +5366,7 @@@
          prev);}
        break;
      default:
-       jj_la1[243] = jj_gen;
 -      jj_la1[247] = jj_gen;
++      jj_la1[241] = jj_gen;
        jj_consume_token(-1);
        throw new ParseException();
      }
@@@ -5403,12 -5470,12 +5381,12 @@@
      char op;
      first = term(null);
                        res = first;
-     label_168:
 -    label_169:
++    label_166:
      while (true) {
        if (jj_2_8(2)) {
          ;
        } else {
-         break label_168;
 -        break label_169;
++        break label_166;
        }
        if (jj_2_9(2)) {
          res = operator(res);
@@@ -5435,7 -5502,7 +5413,7 @@@
          {if (true) return '+';}
        break;
      default:
-       jj_la1[244] = jj_gen;
 -      jj_la1[248] = jj_gen;
++      jj_la1[242] = jj_gen;
        jj_consume_token(-1);
        throw new ParseException();
      }
@@@ -5488,7 -5555,7 +5466,7 @@@
        result = variableTerm(prev);
        break;
      default:
-       jj_la1[245] = jj_gen;
 -      jj_la1[249] = jj_gen;
++      jj_la1[243] = jj_gen;
        jj_consume_token(-1);
        throw new ParseException();
      }
@@@ -5541,7 -5608,7 +5519,7 @@@ LexicalUnitImpl result = null
          op = unaryOperator();
          break;
        default:
-         jj_la1[246] = jj_gen;
 -        jj_la1[250] = jj_gen;
++        jj_la1[244] = jj_gen;
          ;
        }
        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@@ -5657,7 -5724,7 +5635,7 @@@
          result = function(op, prev);
          break;
        default:
-         jj_la1[247] = jj_gen;
 -        jj_la1[251] = jj_gen;
++        jj_la1[245] = jj_gen;
          jj_consume_token(-1);
          throw new ParseException();
        }
@@@ -5690,7 -5757,7 +5668,7 @@@
                s+=".";
            break;
          default:
-           jj_la1[248] = jj_gen;
 -          jj_la1[252] = jj_gen;
++          jj_la1[246] = jj_gen;
            ;
          }
          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@@ -5707,7 -5774,7 +5685,7 @@@
            n = jj_consume_token(FROM);
            break;
          default:
-           jj_la1[249] = jj_gen;
 -          jj_la1[253] = jj_gen;
++          jj_la1[247] = jj_gen;
            jj_consume_token(-1);
            throw new ParseException();
          }
@@@ -5754,25 -5821,25 +5732,25 @@@
          result = unicode(prev);
          break;
        default:
-         jj_la1[250] = jj_gen;
 -        jj_la1[254] = jj_gen;
++        jj_la1[248] = jj_gen;
          jj_consume_token(-1);
          throw new ParseException();
        }
        break;
      default:
-       jj_la1[251] = jj_gen;
 -      jj_la1[255] = jj_gen;
++      jj_la1[249] = jj_gen;
        jj_consume_token(-1);
        throw new ParseException();
      }
-     label_169:
 -    label_170:
++    label_167:
      while (true) {
        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
        case S:
          ;
          break;
        default:
-         jj_la1[252] = jj_gen;
-         break label_169;
 -        jj_la1[256] = jj_gen;
 -        break label_170;
++        jj_la1[250] = jj_gen;
++        break label_167;
        }
        jj_consume_token(S);
      }
@@@ -5788,15 -5855,15 +5766,15 @@@
   Token n;
   LexicalUnit params = null;
      n = jj_consume_token(FUNCTION);
-     label_170:
 -    label_171:
++    label_168:
      while (true) {
        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
        case S:
          ;
          break;
        default:
-         jj_la1[253] = jj_gen;
-         break label_170;
 -        jj_la1[257] = jj_gen;
 -        break label_171;
++        jj_la1[251] = jj_gen;
++        break label_168;
        }
        jj_consume_token(S);
      }
@@@ -5847,7 -5914,7 +5825,7 @@@
        params = expr();
        break;
      default:
-       jj_la1[254] = jj_gen;
 -      jj_la1[258] = jj_gen;
++      jj_la1[252] = jj_gen;
        ;
      }
      jj_consume_token(RPARAN);
@@@ -6330,15 -6371,15 +6308,15 @@@
  // TODO required by original parser but not used by Vaadin?
    final public void _parseRule() throws ParseException {
   String ret = null;
-     label_171:
 -    label_172:
++    label_169:
      while (true) {
        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
        case S:
          ;
          break;
        default:
-         jj_la1[255] = jj_gen;
-         break label_171;
 -        jj_la1[259] = jj_gen;
 -        break label_172;
++        jj_la1[253] = jj_gen;
++        break label_169;
        }
        jj_consume_token(S);
      }
@@@ -6373,7 -6414,7 +6351,7 @@@
        fontFace();
        break;
      default:
-       jj_la1[256] = jj_gen;
 -      jj_la1[260] = jj_gen;
++      jj_la1[254] = jj_gen;
        ret = skipStatement();
                      if ((ret == null) || (ret.length() == 0)) {
                          {if (true) return;}
@@@ -6388,15 -6429,15 +6366,15 @@@
    }
  
    final public void _parseImportRule() throws ParseException {
-     label_172:
 -    label_173:
++    label_170:
      while (true) {
        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
        case S:
          ;
          break;
        default:
-         jj_la1[257] = jj_gen;
-         break label_172;
 -        jj_la1[261] = jj_gen;
 -        break label_173;
++        jj_la1[255] = jj_gen;
++        break label_170;
        }
        jj_consume_token(S);
      }
@@@ -6404,31 -6445,31 +6382,31 @@@
    }
  
    final public void _parseMediaRule() throws ParseException {
-     label_173:
 -    label_174:
++    label_171:
      while (true) {
        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
        case S:
          ;
          break;
        default:
-         jj_la1[258] = jj_gen;
-         break label_173;
 -        jj_la1[262] = jj_gen;
 -        break label_174;
 -      }
++        jj_la1[256] = jj_gen;
++        break label_171;
 +      }
        jj_consume_token(S);
      }
      media();
    }
  
    final public void _parseDeclarationBlock() throws ParseException {
-     label_174:
 -    label_175:
++    label_172:
      while (true) {
        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
        case S:
          ;
          break;
        default:
-         jj_la1[259] = jj_gen;
-         break label_174;
 -        jj_la1[263] = jj_gen;
 -        break label_175;
++        jj_la1[257] = jj_gen;
++        break label_172;
        }
        jj_consume_token(S);
      }
@@@ -6438,29 -6479,29 +6416,29 @@@
        declaration();
        break;
      default:
-       jj_la1[260] = jj_gen;
 -      jj_la1[264] = jj_gen;
++      jj_la1[258] = jj_gen;
        ;
      }
-     label_175:
 -    label_176:
++    label_173:
      while (true) {
        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
        case SEMICOLON:
          ;
          break;
        default:
-         jj_la1[261] = jj_gen;
-         break label_175;
 -        jj_la1[265] = jj_gen;
 -        break label_176;
++        jj_la1[259] = jj_gen;
++        break label_173;
        }
        jj_consume_token(SEMICOLON);
-       label_176:
 -      label_177:
++      label_174:
        while (true) {
          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
          case S:
            ;
            break;
          default:
-           jj_la1[262] = jj_gen;
-           break label_176;
 -          jj_la1[266] = jj_gen;
 -          break label_177;
++          jj_la1[260] = jj_gen;
++          break label_174;
          }
          jj_consume_token(S);
        }
@@@ -6470,7 -6511,7 +6448,7 @@@
          declaration();
          break;
        default:
-         jj_la1[263] = jj_gen;
 -        jj_la1[267] = jj_gen;
++        jj_la1[261] = jj_gen;
          ;
        }
      }
@@@ -6479,15 -6520,15 +6457,15 @@@
    final public ArrayList<String> _parseSelectors() throws ParseException {
    ArrayList<String> p = null;
      try {
-       label_177:
 -      label_178:
++      label_175:
        while (true) {
          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
          case S:
            ;
            break;
          default:
-           jj_la1[264] = jj_gen;
-           break label_177;
 -          jj_la1[268] = jj_gen;
 -          break label_178;
++          jj_la1[262] = jj_gen;
++          break label_175;
          }
          jj_consume_token(S);
        }
@@@ -6569,29 -6610,7 +6547,29 @@@
      finally { jj_save(8, xla); }
    }
  
-   private boolean jj_3R_214() {
-     if (jj_3R_213()) return true;
 -  private boolean jj_3R_200() {
++  private boolean jj_3R_212() {
++    if (jj_3R_211()) return true;
 +    return false;
 +  }
 +
-   private boolean jj_3R_213() {
++  private boolean jj_3R_211() {
 +    Token xsp;
 +    xsp = jj_scanpos;
 +    if (jj_scan_token(18)) {
 +    jj_scanpos = xsp;
 +    if (jj_scan_token(22)) {
 +    jj_scanpos = xsp;
 +    if (jj_scan_token(23)) return true;
 +    }
 +    }
 +    while (true) {
 +      xsp = jj_scanpos;
 +      if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
 +    }
 +    return false;
 +  }
 +
-   private boolean jj_3R_196() {
++  private boolean jj_3R_194() {
      if (jj_scan_token(VARIABLE)) return true;
      Token xsp;
      while (true) {
@@@ -6606,19 -6625,34 +6584,19 @@@
      return false;
    }
  
-   private boolean jj_3R_193() {
 -  private boolean jj_3R_218() {
 -    if (jj_3R_217()) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_182() {
++  private boolean jj_3R_191() {
 +    if (jj_scan_token(S)) return true;
      Token xsp;
      xsp = jj_scanpos;
-     if (jj_3R_214()) jj_scanpos = xsp;
 -    if (jj_3R_200()) jj_scanpos = xsp;
 -    if (jj_scan_token(CONTAINS)) return true;
 -    while (true) {
 -      xsp = jj_scanpos;
 -      if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
 -    }
 -    if (true) { jj_la = 0; jj_scanpos = jj_lastpos; return false;}
++    if (jj_3R_212()) jj_scanpos = xsp;
      return false;
    }
  
-   private boolean jj_3R_181() {
 -  private boolean jj_3R_217() {
++  private boolean jj_3R_179() {
      Token xsp;
      xsp = jj_scanpos;
-     if (jj_3R_196()) jj_scanpos = xsp;
 -    if (jj_scan_token(18)) {
 -    jj_scanpos = xsp;
 -    if (jj_scan_token(22)) {
 -    jj_scanpos = xsp;
 -    if (jj_scan_token(23)) return true;
 -    }
 -    }
++    if (jj_3R_194()) jj_scanpos = xsp;
 +    if (jj_scan_token(CONTAINS)) return true;
      while (true) {
        xsp = jj_scanpos;
        if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
@@@ -6627,51 -6660,59 +6605,51 @@@
      return false;
    }
  
-   private boolean jj_3R_178() {
-     if (jj_3R_188()) return true;
 -  private boolean jj_3R_179() {
 -    if (jj_3R_189()) return true;
++  private boolean jj_3R_176() {
++    if (jj_3R_186()) return true;
      if (jj_scan_token(COLON)) return true;
      Token xsp;
      while (true) {
        xsp = jj_scanpos;
        if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
      }
-     if (jj_3R_189()) return true;
 -    if (jj_3R_190()) return true;
++    if (jj_3R_187()) return true;
      xsp = jj_scanpos;
-     if (jj_3R_190()) jj_scanpos = xsp;
-     if (jj_3R_191()) return true;
 -    if (jj_3R_191()) jj_scanpos = xsp;
 -    if (jj_3R_192()) return true;
++    if (jj_3R_188()) jj_scanpos = xsp;
++    if (jj_3R_189()) return true;
      while (true) {
        xsp = jj_scanpos;
-       if (jj_3R_191()) { jj_scanpos = xsp; break; }
 -      if (jj_3R_192()) { jj_scanpos = xsp; break; }
++      if (jj_3R_189()) { jj_scanpos = xsp; break; }
      }
      return false;
    }
  
-   private boolean jj_3R_192() {
-     if (jj_3R_213()) return true;
 -  private boolean jj_3R_194() {
 -    if (jj_scan_token(S)) return true;
 -    Token xsp;
 -    xsp = jj_scanpos;
 -    if (jj_3R_218()) jj_scanpos = xsp;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_193() {
 -    if (jj_3R_217()) return true;
++  private boolean jj_3R_190() {
++    if (jj_3R_211()) return true;
      return false;
    }
  
-   private boolean jj_3R_179() {
 -  private boolean jj_3R_180() {
++  private boolean jj_3R_177() {
      Token xsp;
      xsp = jj_scanpos;
-     if (jj_3R_192()) {
 -    if (jj_3R_193()) {
++    if (jj_3R_190()) {
      jj_scanpos = xsp;
-     if (jj_3R_193()) return true;
 -    if (jj_3R_194()) return true;
++    if (jj_3R_191()) return true;
      }
      return false;
    }
  
-   private boolean jj_3R_264() {
 -  private boolean jj_3R_220() {
++  private boolean jj_3R_262() {
      if (jj_scan_token(HASH)) return true;
      return false;
    }
  
-   private boolean jj_3R_281() {
 -  private boolean jj_3R_290() {
++  private boolean jj_3R_279() {
      if (jj_scan_token(IDENT)) return true;
      return false;
    }
  
-   private boolean jj_3R_282() {
 -  private boolean jj_3R_291() {
++  private boolean jj_3R_280() {
      if (jj_scan_token(FUNCTION)) return true;
      Token xsp;
      while (true) {
@@@ -6683,46 -6724,46 +6661,46 @@@
    }
  
    private boolean jj_3_7() {
-     if (jj_3R_185()) return true;
 -    if (jj_3R_186()) return true;
++    if (jj_3R_183()) return true;
      return false;
    }
  
-   private boolean jj_3R_280() {
 -  private boolean jj_3R_289() {
++  private boolean jj_3R_278() {
      if (jj_scan_token(COLON)) return true;
      return false;
    }
  
-   private boolean jj_3R_203() {
 -  private boolean jj_3R_207() {
++  private boolean jj_3R_201() {
      if (jj_scan_token(LBRACE)) return true;
      return false;
    }
  
-   private boolean jj_3R_267() {
 -  private boolean jj_3R_222() {
++  private boolean jj_3R_265() {
      if (jj_scan_token(COLON)) return true;
      Token xsp;
      xsp = jj_scanpos;
-     if (jj_3R_280()) jj_scanpos = xsp;
 -    if (jj_3R_289()) jj_scanpos = xsp;
++    if (jj_3R_278()) jj_scanpos = xsp;
      xsp = jj_scanpos;
-     if (jj_3R_281()) {
 -    if (jj_3R_290()) {
++    if (jj_3R_279()) {
      jj_scanpos = xsp;
-     if (jj_3R_282()) return true;
 -    if (jj_3R_291()) return true;
++    if (jj_3R_280()) return true;
      }
      return false;
    }
  
-   private boolean jj_3R_202() {
-     if (jj_3R_189()) return true;
 -  private boolean jj_3R_206() {
 -    if (jj_3R_190()) return true;
++  private boolean jj_3R_200() {
++    if (jj_3R_187()) return true;
      return false;
    }
  
    private boolean jj_3_6() {
-     if (jj_3R_184()) return true;
 -    if (jj_3R_185()) return true;
++    if (jj_3R_182()) return true;
      if (jj_scan_token(LBRACE)) return true;
      return false;
    }
  
-   private boolean jj_3R_185() {
-     if (jj_3R_201()) return true;
 -  private boolean jj_3R_186() {
 -    if (jj_3R_205()) return true;
++  private boolean jj_3R_183() {
++    if (jj_3R_199()) return true;
      if (jj_scan_token(COLON)) return true;
      Token xsp;
      while (true) {
@@@ -6730,24 -6771,24 +6708,24 @@@
        if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
      }
      xsp = jj_scanpos;
-     if (jj_3R_202()) {
 -    if (jj_3R_206()) {
++    if (jj_3R_200()) {
      jj_scanpos = xsp;
-     if (jj_3R_203()) return true;
 -    if (jj_3R_207()) return true;
++    if (jj_3R_201()) return true;
      }
      return false;
    }
  
-   private boolean jj_3R_270() {
-     if (jj_3R_189()) return true;
 -  private boolean jj_3R_269() {
 -    if (jj_3R_190()) return true;
++  private boolean jj_3R_268() {
++    if (jj_3R_187()) return true;
      return false;
    }
  
-   private boolean jj_3R_292() {
 -  private boolean jj_3R_310() {
++  private boolean jj_3R_290() {
      if (jj_scan_token(STRING)) return true;
      return false;
    }
  
-   private boolean jj_3R_256() {
 -  private boolean jj_3R_259() {
++  private boolean jj_3R_254() {
      if (jj_scan_token(FUNCTION)) return true;
      Token xsp;
      while (true) {
@@@ -6755,65 -6796,65 +6733,65 @@@
        if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
      }
      xsp = jj_scanpos;
-     if (jj_3R_270()) jj_scanpos = xsp;
 -    if (jj_3R_269()) jj_scanpos = xsp;
++    if (jj_3R_268()) jj_scanpos = xsp;
      if (jj_scan_token(RPARAN)) return true;
      return false;
    }
  
-   private boolean jj_3R_290() {
 -  private boolean jj_3R_308() {
++  private boolean jj_3R_288() {
      if (jj_scan_token(STARMATCH)) return true;
      return false;
    }
  
-   private boolean jj_3R_289() {
 -  private boolean jj_3R_309() {
 -    if (jj_scan_token(IDENT)) return true;
++  private boolean jj_3R_287() {
 +    if (jj_scan_token(DOLLARMATCH)) return true;
      return false;
    }
  
-   private boolean jj_3R_291() {
 -  private boolean jj_3R_307() {
 -    if (jj_scan_token(DOLLARMATCH)) return true;
++  private boolean jj_3R_289() {
 +    if (jj_scan_token(IDENT)) return true;
      return false;
    }
  
-   private boolean jj_3R_288() {
 -  private boolean jj_3R_306() {
++  private boolean jj_3R_286() {
      if (jj_scan_token(CARETMATCH)) return true;
      return false;
    }
  
-   private boolean jj_3R_287() {
 -  private boolean jj_3R_305() {
++  private boolean jj_3R_285() {
      if (jj_scan_token(DASHMATCH)) return true;
      return false;
    }
  
-   private boolean jj_3R_286() {
 -  private boolean jj_3R_304() {
++  private boolean jj_3R_284() {
      if (jj_scan_token(INCLUDES)) return true;
      return false;
    }
  
-   private boolean jj_3R_272() {
 -  private boolean jj_3R_271() {
++  private boolean jj_3R_270() {
      if (jj_scan_token(INTERPOLATION)) return true;
      return false;
    }
  
-   private boolean jj_3R_285() {
 -  private boolean jj_3R_303() {
++  private boolean jj_3R_283() {
      if (jj_scan_token(EQ)) return true;
      return false;
    }
  
-   private boolean jj_3R_279() {
 -  private boolean jj_3R_296() {
++  private boolean jj_3R_277() {
      Token xsp;
      xsp = jj_scanpos;
 -    if (jj_3R_303()) {
++    if (jj_3R_283()) {
+     jj_scanpos = xsp;
 -    if (jj_3R_304()) {
++    if (jj_3R_284()) {
+     jj_scanpos = xsp;
 -    if (jj_3R_305()) {
 +    if (jj_3R_285()) {
      jj_scanpos = xsp;
 -    if (jj_3R_306()) {
 +    if (jj_3R_286()) {
      jj_scanpos = xsp;
 -    if (jj_3R_307()) {
 +    if (jj_3R_287()) {
      jj_scanpos = xsp;
-     if (jj_3R_288()) {
-     jj_scanpos = xsp;
-     if (jj_3R_289()) {
-     jj_scanpos = xsp;
-     if (jj_3R_290()) return true;
 -    if (jj_3R_308()) return true;
++    if (jj_3R_288()) return true;
      }
      }
      }
@@@ -6824,9 -6865,9 +6802,9 @@@
        if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
      }
      xsp = jj_scanpos;
-     if (jj_3R_291()) {
 -    if (jj_3R_309()) {
++    if (jj_3R_289()) {
      jj_scanpos = xsp;
-     if (jj_3R_292()) return true;
 -    if (jj_3R_310()) return true;
++    if (jj_3R_290()) return true;
      }
      while (true) {
        xsp = jj_scanpos;
@@@ -6835,22 -6876,22 +6813,22 @@@
      return false;
    }
  
-   private boolean jj_3R_243() {
-     if (jj_3R_260()) return true;
 -  private boolean jj_3R_250() {
 -    if (jj_3R_263()) return true;
++  private boolean jj_3R_241() {
++    if (jj_3R_258()) return true;
      return false;
    }
  
-   private boolean jj_3R_242() {
-     if (jj_3R_259()) return true;
 -  private boolean jj_3R_249() {
 -    if (jj_3R_262()) return true;
++  private boolean jj_3R_240() {
++    if (jj_3R_257()) return true;
      return false;
    }
  
-   private boolean jj_3R_241() {
-     if (jj_3R_258()) return true;
 -  private boolean jj_3R_248() {
 -    if (jj_3R_261()) return true;
++  private boolean jj_3R_239() {
++    if (jj_3R_256()) return true;
      return false;
    }
  
-   private boolean jj_3R_266() {
 -  private boolean jj_3R_223() {
++  private boolean jj_3R_264() {
      if (jj_scan_token(LBRACKET)) return true;
      Token xsp;
      while (true) {
@@@ -6863,65 -6904,65 +6841,65 @@@
        if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
      }
      xsp = jj_scanpos;
-     if (jj_3R_279()) jj_scanpos = xsp;
 -    if (jj_3R_296()) jj_scanpos = xsp;
++    if (jj_3R_277()) jj_scanpos = xsp;
      if (jj_scan_token(RBRACKET)) return true;
      return false;
    }
  
-   private boolean jj_3R_284() {
 -  private boolean jj_3R_302() {
++  private boolean jj_3R_282() {
      if (jj_scan_token(INTERPOLATION)) return true;
      return false;
    }
  
-   private boolean jj_3R_250() {
 -  private boolean jj_3R_257() {
++  private boolean jj_3R_248() {
      if (jj_scan_token(PARENT)) return true;
      return false;
    }
  
-   private boolean jj_3R_249() {
 -  private boolean jj_3R_256() {
++  private boolean jj_3R_247() {
      if (jj_scan_token(ANY)) return true;
      return false;
    }
  
-   private boolean jj_3R_263() {
 -  private boolean jj_3R_266() {
++  private boolean jj_3R_261() {
      Token xsp;
      xsp = jj_scanpos;
-     if (jj_3R_271()) {
 -    if (jj_3R_270()) {
++    if (jj_3R_269()) {
      jj_scanpos = xsp;
-     if (jj_3R_272()) return true;
 -    if (jj_3R_271()) return true;
++    if (jj_3R_270()) return true;
      }
      return false;
    }
  
-   private boolean jj_3R_271() {
 -  private boolean jj_3R_270() {
++  private boolean jj_3R_269() {
      if (jj_scan_token(IDENT)) return true;
      return false;
    }
  
-   private boolean jj_3R_215() {
 -  private boolean jj_3R_219() {
++  private boolean jj_3R_213() {
      Token xsp;
      xsp = jj_scanpos;
-     if (jj_3R_248()) {
 -    if (jj_3R_255()) {
++    if (jj_3R_246()) {
      jj_scanpos = xsp;
-     if (jj_3R_249()) {
 -    if (jj_3R_256()) {
++    if (jj_3R_247()) {
      jj_scanpos = xsp;
-     if (jj_3R_250()) return true;
 -    if (jj_3R_257()) return true;
++    if (jj_3R_248()) return true;
      }
      }
      return false;
    }
  
-   private boolean jj_3R_248() {
 -  private boolean jj_3R_255() {
++  private boolean jj_3R_246() {
      Token xsp;
-     if (jj_3R_263()) return true;
 -    if (jj_3R_266()) return true;
++    if (jj_3R_261()) return true;
      while (true) {
        xsp = jj_scanpos;
-       if (jj_3R_263()) { jj_scanpos = xsp; break; }
 -      if (jj_3R_266()) { jj_scanpos = xsp; break; }
++      if (jj_3R_261()) { jj_scanpos = xsp; break; }
      }
      return false;
    }
  
-   private boolean jj_3R_182() {
 -  private boolean jj_3R_183() {
++  private boolean jj_3R_180() {
      if (jj_scan_token(COMMA)) return true;
      Token xsp;
      while (true) {
@@@ -6931,30 -6972,30 +6909,30 @@@
      return false;
    }
  
-   private boolean jj_3R_278() {
 -  private boolean jj_3R_301() {
 -    if (jj_scan_token(IDENT)) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_284() {
++  private boolean jj_3R_276() {
      Token xsp;
      xsp = jj_scanpos;
-     if (jj_3R_283()) {
 -    if (jj_3R_301()) {
++    if (jj_3R_281()) {
      jj_scanpos = xsp;
-     if (jj_3R_284()) return true;
 -    if (jj_3R_302()) return true;
++    if (jj_3R_282()) return true;
      }
      return false;
    }
  
-   private boolean jj_3R_283() {
 -  private boolean jj_3R_260() {
++  private boolean jj_3R_281() {
 +    if (jj_scan_token(IDENT)) return true;
 +    return false;
 +  }
 +
-   private boolean jj_3R_257() {
++  private boolean jj_3R_255() {
      if (jj_scan_token(DOT)) return true;
      return false;
    }
  
-   private boolean jj_3R_240() {
 -  private boolean jj_3R_247() {
++  private boolean jj_3R_238() {
      Token xsp;
      xsp = jj_scanpos;
-     if (jj_3R_257()) jj_scanpos = xsp;
 -    if (jj_3R_260()) jj_scanpos = xsp;
++    if (jj_3R_255()) jj_scanpos = xsp;
      xsp = jj_scanpos;
      if (jj_scan_token(72)) {
      jj_scanpos = xsp;
@@@ -6972,44 -7013,49 +6950,44 @@@
    private boolean jj_3_5() {
      Token xsp;
      xsp = jj_scanpos;
-     if (jj_3R_182()) jj_scanpos = xsp;
-     if (jj_3R_183()) return true;
 -    if (jj_3R_183()) jj_scanpos = xsp;
 -    if (jj_3R_184()) return true;
++    if (jj_3R_180()) jj_scanpos = xsp;
++    if (jj_3R_181()) return true;
      return false;
    }
  
-   private boolean jj_3R_239() {
 -  private boolean jj_3R_300() {
 -    if (jj_3R_222()) return true;
++  private boolean jj_3R_237() {
 +    if (jj_scan_token(STRING)) return true;
      return false;
    }
  
-   private boolean jj_3R_238() {
-     if (jj_3R_256()) return true;
 -  private boolean jj_3R_246() {
 -    if (jj_scan_token(STRING)) return true;
++  private boolean jj_3R_236() {
++    if (jj_3R_254()) return true;
      return false;
    }
  
-   private boolean jj_3R_265() {
 -  private boolean jj_3R_221() {
++  private boolean jj_3R_263() {
      if (jj_scan_token(DOT)) return true;
      Token xsp;
-     if (jj_3R_278()) return true;
 -    if (jj_3R_284()) return true;
++    if (jj_3R_276()) return true;
      while (true) {
        xsp = jj_scanpos;
-       if (jj_3R_278()) { jj_scanpos = xsp; break; }
 -      if (jj_3R_284()) { jj_scanpos = xsp; break; }
++      if (jj_3R_276()) { jj_scanpos = xsp; break; }
      }
      return false;
    }
  
-   private boolean jj_3R_198() {
 -  private boolean jj_3R_245() {
 -    if (jj_3R_259()) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_202() {
++  private boolean jj_3R_196() {
      Token xsp;
      xsp = jj_scanpos;
-     if (jj_3R_239()) {
 -    if (jj_3R_246()) {
++    if (jj_3R_237()) {
      jj_scanpos = xsp;
-     if (jj_3R_240()) {
 -    if (jj_3R_247()) {
++    if (jj_3R_238()) {
      jj_scanpos = xsp;
-     if (jj_3R_241()) {
 -    if (jj_3R_248()) {
++    if (jj_3R_239()) {
      jj_scanpos = xsp;
-     if (jj_3R_242()) {
 -    if (jj_3R_249()) {
++    if (jj_3R_240()) {
      jj_scanpos = xsp;
-     if (jj_3R_243()) return true;
 -    if (jj_3R_250()) return true;
++    if (jj_3R_241()) return true;
      }
      }
      }
@@@ -7017,243 -7063,363 +6995,247 @@@
      return false;
    }
  
-   private boolean jj_3R_254() {
-     if (jj_3R_267()) return true;
 -  private boolean jj_3R_298() {
 -    if (jj_3R_221()) return true;
++  private boolean jj_3R_252() {
++    if (jj_3R_265()) return true;
      return false;
    }
  
-   private boolean jj_3R_277() {
-     if (jj_3R_267()) return true;
 -  private boolean jj_3R_293() {
 -    if (jj_3R_221()) return true;
++  private boolean jj_3R_275() {
++    if (jj_3R_265()) return true;
      return false;
    }
  
-   private boolean jj_3R_237() {
 -  private boolean jj_3R_295() {
 -    if (jj_3R_222()) return true;
++  private boolean jj_3R_235() {
 +    if (jj_scan_token(DIMEN)) return true;
      return false;
    }
  
-   private boolean jj_3R_236() {
 -  private boolean jj_3R_283() {
 -    if (jj_3R_222()) return true;
++  private boolean jj_3R_234() {
 +    if (jj_scan_token(KHZ)) return true;
      return false;
    }
  
-   private boolean jj_3R_275() {
-     if (jj_3R_265()) return true;
 -  private boolean jj_3R_286() {
 -    if (jj_3R_221()) return true;
++  private boolean jj_3R_273() {
++    if (jj_3R_263()) return true;
      return false;
    }
  
-   private boolean jj_3R_252() {
-     if (jj_3R_265()) return true;
 -  private boolean jj_3R_288() {
 -    if (jj_3R_222()) return true;
++  private boolean jj_3R_250() {
++    if (jj_3R_263()) return true;
      return false;
    }
  
-   private boolean jj_3R_235() {
 -  private boolean jj_3R_244() {
 -    if (jj_scan_token(DIMEN)) return true;
++  private boolean jj_3R_233() {
 +    if (jj_scan_token(HZ)) return true;
      return false;
    }
  
-   private boolean jj_3R_234() {
 -  private boolean jj_3R_243() {
 -    if (jj_scan_token(KHZ)) return true;
++  private boolean jj_3R_232() {
 +    if (jj_scan_token(MS)) return true;
      return false;
    }
  
-   private boolean jj_3R_233() {
 -  private boolean jj_3R_299() {
 -    if (jj_3R_223()) return true;
++  private boolean jj_3R_231() {
 +    if (jj_scan_token(SECOND)) return true;
      return false;
    }
  
-   private boolean jj_3R_232() {
 -  private boolean jj_3R_242() {
 -    if (jj_scan_token(HZ)) return true;
++  private boolean jj_3R_230() {
 +    if (jj_scan_token(GRAD)) return true;
      return false;
    }
  
-   private boolean jj_3R_231() {
 -  private boolean jj_3R_276() {
++  private boolean jj_3R_229() {
 +    if (jj_scan_token(RAD)) return true;
 +    return false;
 +  }
 +
-   private boolean jj_3R_253() {
-     if (jj_3R_266()) return true;
++  private boolean jj_3R_251() {
++    if (jj_3R_264()) return true;
 +    return false;
 +  }
 +
-   private boolean jj_3R_276() {
-     if (jj_3R_266()) return true;
++  private boolean jj_3R_274() {
++    if (jj_3R_264()) return true;
 +    return false;
 +  }
 +
-   private boolean jj_3R_230() {
++  private boolean jj_3R_228() {
 +    if (jj_scan_token(DEG)) return true;
 +    return false;
 +  }
 +
-   private boolean jj_3R_273() {
++  private boolean jj_3R_271() {
      Token xsp;
      xsp = jj_scanpos;
-     if (jj_3R_274()) {
 -    if (jj_3R_297()) {
++    if (jj_3R_272()) {
      jj_scanpos = xsp;
-     if (jj_3R_275()) {
 -    if (jj_3R_298()) {
++    if (jj_3R_273()) {
      jj_scanpos = xsp;
-     if (jj_3R_276()) {
 -    if (jj_3R_299()) {
++    if (jj_3R_274()) {
      jj_scanpos = xsp;
-     if (jj_3R_277()) return true;
 -    if (jj_3R_300()) return true;
++    if (jj_3R_275()) return true;
      }
      }
      }
      return false;
    }
  
-   private boolean jj_3R_274() {
-     if (jj_3R_264()) return true;
 -  private boolean jj_3R_297() {
 -    if (jj_3R_220()) return true;
++  private boolean jj_3R_272() {
++    if (jj_3R_262()) return true;
      return false;
    }
  
-   private boolean jj_3R_229() {
 -  private boolean jj_3R_275() {
++  private boolean jj_3R_227() {
 +    if (jj_scan_token(EXS)) return true;
 +    return false;
 +  }
 +
-   private boolean jj_3R_216() {
++  private boolean jj_3R_214() {
      Token xsp;
      xsp = jj_scanpos;
-     if (jj_3R_251()) {
 -    if (jj_3R_292()) {
++    if (jj_3R_249()) {
      jj_scanpos = xsp;
-     if (jj_3R_252()) {
 -    if (jj_3R_293()) {
++    if (jj_3R_250()) {
      jj_scanpos = xsp;
-     if (jj_3R_253()) {
 -    if (jj_3R_294()) {
++    if (jj_3R_251()) {
      jj_scanpos = xsp;
-     if (jj_3R_254()) return true;
 -    if (jj_3R_295()) return true;
++    if (jj_3R_252()) return true;
      }
      }
      }
      return false;
    }
  
-   private boolean jj_3R_251() {
-     if (jj_3R_264()) return true;
 -  private boolean jj_3R_292() {
 -    if (jj_3R_220()) return true;
++  private boolean jj_3R_249() {
++    if (jj_3R_262()) return true;
      return false;
    }
  
-   private boolean jj_3R_228() {
 -  private boolean jj_3R_241() {
 -    if (jj_scan_token(MS)) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_280() {
 -    if (jj_3R_222()) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_274() {
 -    Token xsp;
 -    xsp = jj_scanpos;
 -    if (jj_3R_285()) {
 -    jj_scanpos = xsp;
 -    if (jj_3R_286()) {
 -    jj_scanpos = xsp;
 -    if (jj_3R_287()) {
 -    jj_scanpos = xsp;
 -    if (jj_3R_288()) return true;
 -    }
 -    }
 -    }
 -    return false;
 -  }
 -
 -  private boolean jj_3R_285() {
 -    if (jj_3R_220()) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_294() {
 -    if (jj_3R_223()) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_282() {
 -    if (jj_3R_223()) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_240() {
 -    if (jj_scan_token(SECOND)) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_287() {
 -    if (jj_3R_223()) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_273() {
 -    Token xsp;
 -    xsp = jj_scanpos;
 -    if (jj_3R_281()) {
 -    jj_scanpos = xsp;
 -    if (jj_3R_282()) {
 -    jj_scanpos = xsp;
 -    if (jj_3R_283()) return true;
 -    }
 -    }
 -    return false;
 -  }
 -
 -  private boolean jj_3R_278() {
 -    if (jj_3R_221()) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_281() {
 -    if (jj_3R_221()) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_239() {
 -    if (jj_scan_token(GRAD)) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_238() {
 -    if (jj_scan_token(RAD)) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_237() {
 -    if (jj_scan_token(DEG)) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_236() {
 -    if (jj_scan_token(EXS)) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_199() {
 -    if (jj_3R_223()) return true;
 -    Token xsp;
 -    while (true) {
 -      xsp = jj_scanpos;
 -      if (jj_3R_276()) { jj_scanpos = xsp; break; }
 -    }
 -    return false;
 -  }
 -
 -  private boolean jj_3R_235() {
++  private boolean jj_3R_226() {
      if (jj_scan_token(REM)) return true;
      return false;
    }
  
-   private boolean jj_3R_195() {
 -  private boolean jj_3R_198() {
 -    if (jj_3R_222()) return true;
++  private boolean jj_3R_193() {
      Token xsp;
-     if (jj_3R_216()) return true;
++    if (jj_3R_214()) return true;
      while (true) {
        xsp = jj_scanpos;
-       if (jj_3R_216()) { jj_scanpos = xsp; break; }
 -      if (jj_3R_275()) { jj_scanpos = xsp; break; }
++      if (jj_3R_214()) { jj_scanpos = xsp; break; }
      }
      return false;
    }
  
-   private boolean jj_3R_227() {
 -  private boolean jj_3R_279() {
 -    if (jj_3R_223()) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_234() {
++  private boolean jj_3R_225() {
      if (jj_scan_token(LEM)) return true;
      return false;
    }
  
-   private boolean jj_3R_194() {
-     if (jj_3R_215()) return true;
 -  private boolean jj_3R_197() {
 -    if (jj_3R_221()) return true;
++  private boolean jj_3R_192() {
++    if (jj_3R_213()) return true;
      Token xsp;
      while (true) {
        xsp = jj_scanpos;
-       if (jj_3R_273()) { jj_scanpos = xsp; break; }
 -      if (jj_3R_274()) { jj_scanpos = xsp; break; }
++      if (jj_3R_271()) { jj_scanpos = xsp; break; }
      }
      return false;
    }
  
-   private boolean jj_3R_226() {
 -  private boolean jj_3R_196() {
 -    if (jj_3R_220()) return true;
 -    Token xsp;
 -    while (true) {
 -      xsp = jj_scanpos;
 -      if (jj_3R_273()) { jj_scanpos = xsp; break; }
 -    }
++  private boolean jj_3R_224() {
 +    if (jj_scan_token(EMS)) return true;
      return false;
    }
  
-   private boolean jj_3R_180() {
 -  private boolean jj_3R_272() {
++  private boolean jj_3R_178() {
      Token xsp;
      xsp = jj_scanpos;
-     if (jj_3R_194()) {
 -    if (jj_3R_277()) {
 -    jj_scanpos = xsp;
 -    if (jj_3R_278()) {
 -    jj_scanpos = xsp;
 -    if (jj_3R_279()) {
++    if (jj_3R_192()) {
      jj_scanpos = xsp;
-     if (jj_3R_195()) return true;
 -    if (jj_3R_280()) return true;
 -    }
 -    }
++    if (jj_3R_193()) return true;
      }
      return false;
    }
  
-   private boolean jj_3R_225() {
 -  private boolean jj_3R_277() {
 -    if (jj_3R_220()) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_233() {
 -    if (jj_scan_token(EMS)) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_232() {
++  private boolean jj_3R_223() {
      if (jj_scan_token(PX)) return true;
      return false;
    }
  
-   private boolean jj_3R_245() {
-     if (jj_3R_213()) return true;
-     if (jj_3R_180()) return true;
 -  private boolean jj_3R_195() {
 -    if (jj_3R_219()) return true;
 -    Token xsp;
 -    while (true) {
 -      xsp = jj_scanpos;
 -      if (jj_3R_272()) { jj_scanpos = xsp; break; }
 -    }
++  private boolean jj_3R_243() {
++    if (jj_3R_211()) return true;
++    if (jj_3R_178()) return true;
      return false;
    }
  
-   private boolean jj_3R_224() {
 -  private boolean jj_3R_231() {
++  private boolean jj_3R_222() {
      if (jj_scan_token(IN)) return true;
      return false;
    }
  
-   private boolean jj_3R_223() {
 -  private boolean jj_3R_181() {
 -    Token xsp;
 -    xsp = jj_scanpos;
 -    if (jj_3R_195()) {
 -    jj_scanpos = xsp;
 -    if (jj_3R_196()) {
 -    jj_scanpos = xsp;
 -    if (jj_3R_197()) {
 -    jj_scanpos = xsp;
 -    if (jj_3R_198()) {
 -    jj_scanpos = xsp;
 -    if (jj_3R_199()) return true;
 -    }
 -    }
 -    }
 -    }
 -    return false;
 -  }
 -
 -  private boolean jj_3R_230() {
++  private boolean jj_3R_221() {
      if (jj_scan_token(PC)) return true;
      return false;
    }
  
-   private boolean jj_3R_222() {
 -  private boolean jj_3R_252() {
 -    if (jj_3R_217()) return true;
 -    if (jj_3R_181()) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_229() {
++  private boolean jj_3R_220() {
      if (jj_scan_token(MM)) return true;
      return false;
    }
  
-   private boolean jj_3R_221() {
 -  private boolean jj_3R_228() {
++  private boolean jj_3R_219() {
      if (jj_scan_token(CM)) return true;
      return false;
    }
  
-   private boolean jj_3R_220() {
 -  private boolean jj_3R_227() {
++  private boolean jj_3R_218() {
      if (jj_scan_token(PT)) return true;
      return false;
    }
  
-   private boolean jj_3R_219() {
 -  private boolean jj_3R_226() {
++  private boolean jj_3R_217() {
      if (jj_scan_token(PERCENTAGE)) return true;
      return false;
    }
  
-   private boolean jj_3R_205() {
-     if (jj_3R_247()) return true;
 -  private boolean jj_3R_209() {
 -    if (jj_3R_254()) return true;
++  private boolean jj_3R_203() {
++    if (jj_3R_245()) return true;
      return false;
    }
  
-   private boolean jj_3R_218() {
 -  private boolean jj_3R_225() {
++  private boolean jj_3R_216() {
      if (jj_scan_token(NUMBER)) return true;
      return false;
    }
  
-   private boolean jj_3R_217() {
-     if (jj_3R_255()) return true;
 -  private boolean jj_3R_224() {
 -    if (jj_3R_258()) return true;
++  private boolean jj_3R_215() {
++    if (jj_3R_253()) return true;
      return false;
    }
  
-   private boolean jj_3R_197() {
 -  private boolean jj_3R_201() {
++  private boolean jj_3R_195() {
      Token xsp;
      xsp = jj_scanpos;
-     if (jj_3R_217()) jj_scanpos = xsp;
 -    if (jj_3R_224()) jj_scanpos = xsp;
++    if (jj_3R_215()) jj_scanpos = xsp;
      xsp = jj_scanpos;
++    if (jj_3R_216()) {
++    jj_scanpos = xsp;
++    if (jj_3R_217()) {
++    jj_scanpos = xsp;
 +    if (jj_3R_218()) {
 +    jj_scanpos = xsp;
 +    if (jj_3R_219()) {
 +    jj_scanpos = xsp;
 +    if (jj_3R_220()) {
 +    jj_scanpos = xsp;
 +    if (jj_3R_221()) {
 +    jj_scanpos = xsp;
 +    if (jj_3R_222()) {
 +    jj_scanpos = xsp;
 +    if (jj_3R_223()) {
 +    jj_scanpos = xsp;
 +    if (jj_3R_224()) {
 +    jj_scanpos = xsp;
      if (jj_3R_225()) {
      jj_scanpos = xsp;
      if (jj_3R_226()) {
@@@ -7276,11 -7442,25 +7258,7 @@@
      jj_scanpos = xsp;
      if (jj_3R_235()) {
      jj_scanpos = xsp;
--    if (jj_3R_236()) {
--    jj_scanpos = xsp;
--    if (jj_3R_237()) {
--    jj_scanpos = xsp;
-     if (jj_3R_238()) return true;
 -    if (jj_3R_238()) {
 -    jj_scanpos = xsp;
 -    if (jj_3R_239()) {
 -    jj_scanpos = xsp;
 -    if (jj_3R_240()) {
 -    jj_scanpos = xsp;
 -    if (jj_3R_241()) {
 -    jj_scanpos = xsp;
 -    if (jj_3R_242()) {
 -    jj_scanpos = xsp;
 -    if (jj_3R_243()) {
 -    jj_scanpos = xsp;
 -    if (jj_3R_244()) {
 -    jj_scanpos = xsp;
 -    if (jj_3R_245()) return true;
++    if (jj_3R_236()) return true;
      }
      }
      }
@@@ -7304,12 -7484,12 +7282,12 @@@
      return false;
    }
  
-   private boolean jj_3R_183() {
 -  private boolean jj_3R_184() {
++  private boolean jj_3R_181() {
      Token xsp;
      xsp = jj_scanpos;
-     if (jj_3R_197()) {
 -    if (jj_3R_201()) {
++    if (jj_3R_195()) {
      jj_scanpos = xsp;
-     if (jj_3R_198()) return true;
 -    if (jj_3R_202()) return true;
++    if (jj_3R_196()) return true;
      }
      while (true) {
        xsp = jj_scanpos;
@@@ -7318,49 -7498,49 +7296,49 @@@
      return false;
    }
  
-   private boolean jj_3R_258() {
 -  private boolean jj_3R_261() {
++  private boolean jj_3R_256() {
      if (jj_scan_token(HASH)) return true;
      return false;
    }
  
    private boolean jj_3_2() {
-     if (jj_3R_179()) return true;
--    if (jj_3R_180()) return true;
 -    if (jj_3R_181()) return true;
++    if (jj_3R_177()) return true;
++    if (jj_3R_178()) return true;
      return false;
    }
  
-   private boolean jj_3R_200() {
 -  private boolean jj_3R_254() {
 -    if (jj_3R_189()) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_262() {
 -    if (jj_scan_token(URL)) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_204() {
++  private boolean jj_3R_198() {
      if (jj_scan_token(COMMA)) return true;
      Token xsp;
      while (true) {
        xsp = jj_scanpos;
        if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
      }
-     if (jj_3R_199()) return true;
 -    if (jj_3R_203()) return true;
++    if (jj_3R_197()) return true;
      return false;
    }
  
-   private boolean jj_3R_244() {
-     if (jj_3R_180()) return true;
 -  private boolean jj_3R_251() {
 -    if (jj_3R_181()) return true;
++  private boolean jj_3R_242() {
++    if (jj_3R_178()) return true;
      return false;
    }
  
-   private boolean jj_3R_247() {
-     if (jj_3R_188()) return true;
 -  private boolean jj_3R_203() {
++  private boolean jj_3R_245() {
++    if (jj_3R_186()) return true;
 +    return false;
 +  }
 +
-   private boolean jj_3R_259() {
++  private boolean jj_3R_257() {
 +    if (jj_scan_token(URL)) return true;
 +    return false;
 +  }
 +
-   private boolean jj_3R_199() {
++  private boolean jj_3R_197() {
      Token xsp;
      xsp = jj_scanpos;
-     if (jj_3R_244()) {
 -    if (jj_3R_251()) {
++    if (jj_3R_242()) {
      jj_scanpos = xsp;
-     if (jj_3R_245()) return true;
 -    if (jj_3R_252()) return true;
++    if (jj_3R_243()) return true;
      }
      while (true) {
        xsp = jj_scanpos;
@@@ -7373,62 -7553,62 +7351,62 @@@
      return false;
    }
  
-   private boolean jj_3R_204() {
-     if (jj_3R_183()) return true;
 -  private boolean jj_3R_208() {
 -    if (jj_3R_184()) return true;
++  private boolean jj_3R_202() {
++    if (jj_3R_181()) return true;
      return false;
    }
  
-   private boolean jj_3R_186() {
 -  private boolean jj_3R_187() {
++  private boolean jj_3R_184() {
      Token xsp;
      xsp = jj_scanpos;
-     if (jj_3R_204()) {
 -    if (jj_3R_208()) {
++    if (jj_3R_202()) {
      jj_scanpos = xsp;
-     if (jj_3R_205()) return true;
 -    if (jj_3R_209()) return true;
++    if (jj_3R_203()) return true;
      }
      return false;
    }
  
    private boolean jj_3_9() {
-     if (jj_3R_187()) return true;
 -    if (jj_3R_188()) return true;
++    if (jj_3R_185()) return true;
      return false;
    }
  
-   private boolean jj_3R_184() {
-     if (jj_3R_199()) return true;
 -  private boolean jj_3R_268() {
++  private boolean jj_3R_182() {
++    if (jj_3R_197()) return true;
 +    Token xsp;
 +    while (true) {
 +      xsp = jj_scanpos;
-       if (jj_3R_200()) { jj_scanpos = xsp; break; }
++      if (jj_3R_198()) { jj_scanpos = xsp; break; }
 +    }
 +    return false;
 +  }
 +
-   private boolean jj_3R_269() {
++  private boolean jj_3R_267() {
      if (jj_scan_token(PLUS)) return true;
      return false;
    }
  
-   private boolean jj_3R_255() {
 -  private boolean jj_3R_258() {
++  private boolean jj_3R_253() {
      Token xsp;
      xsp = jj_scanpos;
-     if (jj_3R_268()) {
 -    if (jj_3R_267()) {
++    if (jj_3R_266()) {
      jj_scanpos = xsp;
-     if (jj_3R_269()) return true;
 -    if (jj_3R_268()) return true;
++    if (jj_3R_267()) return true;
      }
      return false;
    }
  
-   private boolean jj_3R_268() {
 -  private boolean jj_3R_267() {
++  private boolean jj_3R_266() {
      if (jj_scan_token(MINUS)) return true;
      return false;
    }
  
    private boolean jj_3_1() {
-     if (jj_3R_178()) return true;
 -    if (jj_3R_179()) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_185() {
 -    if (jj_3R_203()) return true;
 -    Token xsp;
 -    while (true) {
 -      xsp = jj_scanpos;
 -      if (jj_3R_204()) { jj_scanpos = xsp; break; }
 -    }
++    if (jj_3R_176()) return true;
      return false;
    }
  
-   private boolean jj_3R_260() {
 -  private boolean jj_3R_263() {
++  private boolean jj_3R_258() {
      if (jj_scan_token(UNICODERANGE)) return true;
      return false;
    }
@@@ -7437,17 -7617,17 +7415,17 @@@
      Token xsp;
      xsp = jj_scanpos;
      if (jj_3_9()) jj_scanpos = xsp;
-     if (jj_3R_186()) return true;
 -    if (jj_3R_187()) return true;
++    if (jj_3R_184()) return true;
      return false;
    }
  
    private boolean jj_3_4() {
-     if (jj_3R_181()) return true;
 -    if (jj_3R_182()) return true;
++    if (jj_3R_179()) return true;
      return false;
    }
  
-   private boolean jj_3R_189() {
-     if (jj_3R_186()) return true;
 -  private boolean jj_3R_190() {
 -    if (jj_3R_187()) return true;
++  private boolean jj_3R_187() {
++    if (jj_3R_184()) return true;
      Token xsp;
      while (true) {
        xsp = jj_scanpos;
@@@ -7456,7 -7636,7 +7434,7 @@@
      return false;
    }
  
-   private boolean jj_3R_211() {
 -  private boolean jj_3R_215() {
++  private boolean jj_3R_209() {
      if (jj_scan_token(MINUS)) return true;
      Token xsp;
      if (jj_scan_token(1)) return true;
@@@ -7467,12 -7647,7 +7445,12 @@@
      return false;
    }
  
-   private boolean jj_3R_262() {
 -  private boolean jj_3R_214() {
++  private boolean jj_3R_260() {
 +    if (jj_scan_token(INTERPOLATION)) return true;
 +    return false;
 +  }
 +
-   private boolean jj_3R_210() {
++  private boolean jj_3R_208() {
      if (jj_scan_token(PLUS)) return true;
      Token xsp;
      if (jj_scan_token(1)) return true;
@@@ -7483,12 -7658,17 +7461,12 @@@
      return false;
    }
  
 -  private boolean jj_3R_265() {
 -    if (jj_scan_token(INTERPOLATION)) return true;
 -    return false;
 -  }
 -
    private boolean jj_3_3() {
-     if (jj_3R_178()) return true;
 -    if (jj_3R_179()) return true;
++    if (jj_3R_176()) return true;
      return false;
    }
  
-   private boolean jj_3R_209() {
 -  private boolean jj_3R_213() {
++  private boolean jj_3R_207() {
      if (jj_scan_token(MOD)) return true;
      Token xsp;
      while (true) {
@@@ -7498,7 -7678,7 +7476,7 @@@
      return false;
    }
  
-   private boolean jj_3R_208() {
 -  private boolean jj_3R_212() {
++  private boolean jj_3R_206() {
      if (jj_scan_token(ANY)) return true;
      Token xsp;
      while (true) {
@@@ -7508,7 -7688,7 +7486,7 @@@
      return false;
    }
  
-   private boolean jj_3R_207() {
 -  private boolean jj_3R_211() {
++  private boolean jj_3R_205() {
      if (jj_scan_token(DIV)) return true;
      Token xsp;
      while (true) {
@@@ -7518,17 -7698,7 +7496,17 @@@
      return false;
    }
  
-   private boolean jj_3R_188() {
 -  private boolean jj_3R_192() {
++  private boolean jj_3R_186() {
 +    if (jj_scan_token(VARIABLE)) return true;
 +    Token xsp;
 +    while (true) {
 +      xsp = jj_scanpos;
 +      if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
 +    }
 +    return false;
 +  }
 +
-   private boolean jj_3R_191() {
++  private boolean jj_3R_189() {
      if (jj_scan_token(SEMICOLON)) return true;
      Token xsp;
      while (true) {
@@@ -7538,7 -7708,7 +7516,7 @@@
      return false;
    }
  
-   private boolean jj_3R_206() {
 -  private boolean jj_3R_210() {
++  private boolean jj_3R_204() {
      if (jj_scan_token(COMMA)) return true;
      Token xsp;
      while (true) {
@@@ -7548,20 -7718,20 +7526,20 @@@
      return false;
    }
  
-   private boolean jj_3R_187() {
 -  private boolean jj_3R_188() {
++  private boolean jj_3R_185() {
      Token xsp;
      xsp = jj_scanpos;
 -    if (jj_3R_210()) {
++    if (jj_3R_204()) {
+     jj_scanpos = xsp;
 -    if (jj_3R_211()) {
++    if (jj_3R_205()) {
+     jj_scanpos = xsp;
 -    if (jj_3R_212()) {
 +    if (jj_3R_206()) {
      jj_scanpos = xsp;
 -    if (jj_3R_213()) {
 +    if (jj_3R_207()) {
      jj_scanpos = xsp;
 -    if (jj_3R_214()) {
 +    if (jj_3R_208()) {
      jj_scanpos = xsp;
-     if (jj_3R_209()) {
-     jj_scanpos = xsp;
-     if (jj_3R_210()) {
-     jj_scanpos = xsp;
-     if (jj_3R_211()) return true;
 -    if (jj_3R_215()) return true;
++    if (jj_3R_209()) return true;
      }
      }
      }
@@@ -7570,27 -7740,37 +7548,27 @@@
      return false;
    }
  
-   private boolean jj_3R_246() {
 -  private boolean jj_3R_189() {
 -    if (jj_scan_token(VARIABLE)) return true;
 -    Token xsp;
 -    while (true) {
 -      xsp = jj_scanpos;
 -      if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
 -    }
 -    return false;
 -  }
 -
 -  private boolean jj_3R_253() {
++  private boolean jj_3R_244() {
      Token xsp;
      xsp = jj_scanpos;
-     if (jj_3R_261()) {
 -    if (jj_3R_264()) {
++    if (jj_3R_259()) {
      jj_scanpos = xsp;
-     if (jj_3R_262()) return true;
 -    if (jj_3R_265()) return true;
++    if (jj_3R_260()) return true;
      }
      return false;
    }
  
-   private boolean jj_3R_261() {
 -  private boolean jj_3R_264() {
++  private boolean jj_3R_259() {
      if (jj_scan_token(IDENT)) return true;
      return false;
    }
  
-   private boolean jj_3R_201() {
 -  private boolean jj_3R_205() {
++  private boolean jj_3R_199() {
      Token xsp;
-     if (jj_3R_246()) return true;
 -    if (jj_3R_253()) return true;
++    if (jj_3R_244()) return true;
      while (true) {
        xsp = jj_scanpos;
-       if (jj_3R_246()) { jj_scanpos = xsp; break; }
 -      if (jj_3R_253()) { jj_scanpos = xsp; break; }
++      if (jj_3R_244()) { jj_scanpos = xsp; break; }
      }
      while (true) {
        xsp = jj_scanpos;
@@@ -7599,7 -7779,7 +7577,7 @@@
      return false;
    }
  
-   private boolean jj_3R_212() {
 -  private boolean jj_3R_216() {
++  private boolean jj_3R_210() {
      if (jj_scan_token(GUARDED_SYM)) return true;
      Token xsp;
      while (true) {
@@@ -7609,8 -7789,8 +7587,8 @@@
      return false;
    }
  
-   private boolean jj_3R_190() {
-     if (jj_3R_212()) return true;
 -  private boolean jj_3R_191() {
 -    if (jj_3R_216()) return true;
++  private boolean jj_3R_188() {
++    if (jj_3R_210()) return true;
      return false;
    }
  
@@@ -7624,7 -7804,7 +7602,7 @@@
    private Token jj_scanpos, jj_lastpos;
    private int jj_la;
    private int jj_gen;
-   final private int[] jj_la1 = new int[265];
 -  final private int[] jj_la1 = new int[269];
++  final private int[] jj_la1 = new int[263];
    static private int[] jj_la1_0;
    static private int[] jj_la1_1;
    static private int[] jj_la1_2;
@@@ -7636,16 -7816,16 +7614,16 @@@
        jj_la1_init_3();
     }
     private static void jj_la1_init_0() {
-       jj_la1_0 = new int[] {0x0,0x302,0x302,0x0,0x300,0x2,0x2,0x2,0xd4c40000,0x0,0x300,0x2,0x300,0x2,0x0,0x2,0x2,0x2,0x0,0x0,0x2,0x2,0x0,0x0,0x2,0x0,0x2,0x100000,0x2,0x0,0x2,0x2,0xd4c40000,0xd4c40000,0x2,0x2,0x2,0xd4fd1500,0x2,0xd4fd1500,0x2,0x2,0x0,0x0,0x2,0x0,0x200000,0x2,0x0,0x2,0x2,0x2,0x2,0x0,0x200000,0x2,0x0,0x2,0x391500,0xc40000,0xc40002,0xc40000,0x2,0x2,0x80120002,0x80120002,0x2,0x0,0x0,0x2,0x2,0x2,0x2,0xd4c40000,0xd4c40000,0x2,0x100000,0x2,0xd4c40000,0x2,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,0x0,0x2,0x2,0x100000,0x0,0x0,0x800c0000,0x2,0x0,0x100000,0x2,0x800c0000,0x2,0x0,0x800c0000,0x2,0x2,0x0,0x200400,0x2,0x200000,0x2,0xd4c40000,0xd4c40000,0x2,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,0x200000,0x2,0x200000,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,};
 -      jj_la1_0 = new int[] {0x0,0x302,0x302,0x0,0x300,0x2,0x2,0x2,0xd4c40000,0x0,0x300,0x2,0x300,0x2,0x0,0x2,0x2,0x2,0x0,0x0,0x2,0x2,0x0,0x0,0x2,0x0,0x2,0x100000,0x2,0x0,0x2,0x2,0xd4c40000,0xd4c40000,0x2,0x2,0x2,0xd4fd1500,0xd4fd1500,0x2,0x2,0x2,0x0,0x0,0x2,0x0,0x200000,0x2,0x0,0x2,0x2,0x2,0x2,0x0,0x200000,0x2,0x0,0x2,0x391500,0xc40000,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,0x0,0x2,0x2,0x100000,0x0,0x0,0x800c0000,0x2,0x0,0x100000,0x2,0x800c0000,0x2,0x0,0x800c0000,0x2,0x2,0x0,0x200400,0x2,0x200000,0x2,0xd4c40000,0xd4c40000,0x2,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,};
++      jj_la1_0 = new int[] {0x0,0x302,0x302,0x0,0x300,0x2,0x2,0x2,0xd4c40000,0x0,0x300,0x2,0x300,0x2,0x0,0x2,0x2,0x2,0x0,0x0,0x2,0x2,0x0,0x0,0x2,0x0,0x2,0x100000,0x2,0x0,0x2,0x2,0xd4c40000,0xd4c40000,0x2,0x2,0x2,0xd4fd1500,0x2,0xd4fd1500,0x2,0x2,0x0,0x0,0x2,0x0,0x200000,0x2,0x0,0x2,0x2,0x2,0x2,0x0,0x200000,0x2,0x0,0x2,0x391500,0xc40000,0xc40002,0xc40000,0x2,0x2,0x80120002,0x80120002,0x2,0x0,0x0,0x2,0x2,0x2,0x2,0xd4c40000,0xd4c40000,0x2,0x100000,0x2,0xd4c40000,0x2,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,0x0,0x2,0x2,0x100000,0x0,0x0,0x800c0000,0x2,0x0,0x100000,0x2,0x800c0000,0x2,0x0,0x800c0000,0x2,0x2,0x0,0x200400,0x2,0x200000,0x2,0xd4c40000,0xd4c40000,0x2,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() {
-       jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x566000c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x80,0x0,0x0,0x120000,0x120000,0x0,0x120000,0x0,0x0,0x0,0x120000,0x0,0x0,0x564000c0,0x564000c0,0x0,0x0,0x0,0x60001c0,0x0,0x60001c0,0x0,0x0,0x0,0x40,0x0,0x80,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x80,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,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,0x0,0x40,0x40,0x160040,0x0,0x40,0x0,0x0,0x160040,0x0,0x40,0x160000,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x61200c0,0x61200c0,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,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,};
 -      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x566000c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x80,0x0,0x0,0x120000,0x120000,0x0,0x120000,0x0,0x0,0x0,0x120000,0x0,0x0,0x564000c0,0x564000c0,0x0,0x0,0x0,0x60001c0,0x60001c0,0x0,0x0,0x0,0x0,0x40,0x0,0x80,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x80,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,0x0,0x40,0x40,0x160040,0x0,0x40,0x0,0x0,0x160040,0x0,0x40,0x160000,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x61200c0,0x61200c0,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,};
++      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x566000c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x80,0x0,0x0,0x120000,0x120000,0x0,0x120000,0x0,0x0,0x0,0x120000,0x0,0x0,0x564000c0,0x564000c0,0x0,0x0,0x0,0x60001c0,0x0,0x60001c0,0x0,0x0,0x0,0x40,0x0,0x80,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x80,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,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,0x0,0x40,0x40,0x160040,0x0,0x40,0x0,0x0,0x160040,0x0,0x40,0x160000,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x61200c0,0x61200c0,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() {
-       jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x1000,0x0,0x0,0x0,0x0,0x880,0x0,0x0,0x0,0x100,0x100,0x0,0x0,0x2008,0x2008,0x0,0x2000,0x0,0x0,0x0,0x2000,0x0,0x0,0x1119,0x1119,0x0,0x0,0x0,0x2b88,0x0,0x2b88,0x0,0x0,0x100,0x0,0x0,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,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,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,0x1000,0x0,0x0,0x0,0x1000,0x1000,0xfffffb80,0x0,0x0,0x0,0x0,0xfffffb80,0x0,0x0,0xfffffb80,0x0,0x0,0x1100,0x0,0x0,0x0,0x0,0x2100,0x2100,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,0x1000,0x0,0x0,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,};
 -      jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x1000,0x0,0x0,0x0,0x0,0x880,0x0,0x0,0x0,0x100,0x100,0x0,0x0,0x2008,0x2008,0x0,0x2000,0x0,0x0,0x0,0x2000,0x0,0x0,0x1119,0x1119,0x0,0x0,0x0,0x2b80,0x2b80,0x0,0x0,0x0,0x100,0x0,0x0,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,0x100,0x0,0x0,0x0,0x0,0x0,0x0,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,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,0x1000,0x0,0x0,0x0,0x1000,0x1000,0xfffffb80,0x0,0x0,0x0,0x0,0xfffffb80,0x0,0x0,0xfffffb80,0x0,0x0,0x1100,0x0,0x0,0x0,0x0,0x2100,0x2100,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,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,};
++      jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x1000,0x0,0x0,0x0,0x0,0x880,0x0,0x0,0x0,0x100,0x100,0x0,0x0,0x2008,0x2008,0x0,0x2000,0x0,0x0,0x0,0x2000,0x0,0x0,0x1119,0x1119,0x0,0x0,0x0,0x2b88,0x0,0x2b88,0x0,0x0,0x100,0x0,0x0,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,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,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,0x1000,0x0,0x0,0x0,0x1000,0x1000,0xfffffb80,0x0,0x0,0x0,0x0,0xfffffb80,0x0,0x0,0xfffffb80,0x0,0x0,0x1100,0x0,0x0,0x0,0x0,0x2100,0x2100,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,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,};
     }
     private static void jj_la1_init_3() {
-       jj_la1_3 = new int[] {0x8,0x80,0x80,0x2,0x80,0x0,0x0,0x0,0x75,0x0,0x80,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc5,0xc5,0x0,0x0,0x0,0xc401bf,0x0,0xc401bf,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,0xc7,0xc7,0x0,0x0,0x0,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,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,0x0,0x440001,0x0,0x0,0x0,0x0,0x440001,0x0,0x0,0x440001,0x0,0x0,0x400000,0x0,0x0,0x0,0x0,0x1,0x1,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,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,};
 -      jj_la1_3 = new int[] {0x8,0x80,0x80,0x2,0x80,0x0,0x0,0x0,0x75,0x0,0x80,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc5,0xc5,0x0,0x0,0x0,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,0xc7,0xc7,0x0,0x0,0x0,0x1,0x0,0x1,0x1,0x0,0x0,0x1,0x1,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,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,0x0,0x440001,0x0,0x0,0x0,0x0,0x440001,0x0,0x0,0x440001,0x0,0x0,0x400000,0x0,0x0,0x0,0x0,0x1,0x1,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,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,};
++      jj_la1_3 = new int[] {0x8,0x80,0x80,0x2,0x80,0x0,0x0,0x0,0x75,0x0,0x80,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc5,0xc5,0x0,0x0,0x0,0xc401bf,0x0,0xc401bf,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,0xc7,0xc7,0x0,0x0,0x0,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,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,0x0,0x440001,0x0,0x0,0x0,0x0,0x440001,0x0,0x0,0x440001,0x0,0x0,0x400000,0x0,0x0,0x0,0x0,0x1,0x1,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,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];
    private boolean jj_rescan = false;
@@@ -7657,7 -7837,7 +7635,7 @@@
      token = new Token();
      jj_ntk = -1;
      jj_gen = 0;
-     for (int i = 0; i < 265; i++) jj_la1[i] = -1;
 -    for (int i = 0; i < 269; i++) jj_la1[i] = -1;
++    for (int i = 0; i < 263; i++) jj_la1[i] = -1;
      for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
    }
  
@@@ -7667,7 -7847,7 +7645,7 @@@
      token = new Token();
      jj_ntk = -1;
      jj_gen = 0;
-     for (int i = 0; i < 265; i++) jj_la1[i] = -1;
 -    for (int i = 0; i < 269; i++) jj_la1[i] = -1;
++    for (int i = 0; i < 263; i++) jj_la1[i] = -1;
      for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
    }
  
@@@ -7677,7 -7857,7 +7655,7 @@@
      token = new Token();
      jj_ntk = -1;
      jj_gen = 0;
-     for (int i = 0; i < 265; i++) jj_la1[i] = -1;
 -    for (int i = 0; i < 269; i++) jj_la1[i] = -1;
++    for (int i = 0; i < 263; i++) jj_la1[i] = -1;
      for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
    }
  
@@@ -7687,7 -7867,7 +7665,7 @@@
      token = new Token();
      jj_ntk = -1;
      jj_gen = 0;
-     for (int i = 0; i < 265; i++) jj_la1[i] = -1;
 -    for (int i = 0; i < 269; i++) jj_la1[i] = -1;
++    for (int i = 0; i < 263; i++) jj_la1[i] = -1;
      for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
    }
  
@@@ -7804,7 -7984,7 +7782,7 @@@
        la1tokens[jj_kind] = true;
        jj_kind = -1;
      }
-     for (int i = 0; i < 265; i++) {
 -    for (int i = 0; i < 269; i++) {
++    for (int i = 0; i < 263; i++) {
        if (jj_la1[i] == jj_gen) {
          for (int j = 0; j < 32; j++) {
            if ((jj_la1_0[i] & (1<<j)) != 0) {
diff --cc theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj
index 3cb277b6e9,482b8597d3..2b6e809088
--- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj
@@@ -1994,12 -1992,12 +1994,12 @@@ void debugDirective() 
  {
      <DEBUG_SYM>
      { 
-     String content = skipStatementUntil(new int[] {SEMICOLON,RBRACE});
+     String content = skipStatementUntil(new int[] {SEMICOLON,RBRACE,EOF});
      // TODO should evaluate the content expression, call documentHandler.debugDirective() etc.
 -    System.out.println(content);
 +    Logger.getLogger(Parser.class.getName()).log(Level.INFO, content);
      }
      try {
-       (";"(<S>)*)+
+       ";" (<S>)*
      }
      catch (ParseException e) {
        acceptMissingSemicolonBeforeRbrace(e);
@@@ -2011,12 -2009,12 +2011,12 @@@ void warnDirective() 
  {
      <WARN_SYM>
      { 
-     String content = skipStatementUntil(new int[] {SEMICOLON,RBRACE});
+     String content = skipStatementUntil(new int[] {SEMICOLON,RBRACE,EOF});
      // TODO should evaluate the content expression, call documentHandler.warnDirective() etc.
 -    System.err.println(content);
 +    Logger.getLogger(Parser.class.getName()).log(Level.SEVERE, content);
      }
      try {
-       (";"(<S>)*)+
+       ";" (<S>)*
      }
      catch (ParseException e) {
        acceptMissingSemicolonBeforeRbrace(e);