diff options
| author | Henri Sara <hesara@vaadin.com> | 2012-11-27 13:01:21 +0200 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2012-11-27 13:02:53 +0200 |
| commit | 82120d5db9eee301143e234d0217b0083b8c97ec (patch) | |
| tree | 0a51d27592b86fba8ea45079164a79c4aead4666 /theme-compiler | |
| parent | bcad61f83313b7ed73f56db39371491abe38e267 (diff) | |
| download | vaadin-framework-82120d5db9eee301143e234d0217b0083b8c97ec.tar.gz vaadin-framework-82120d5db9eee301143e234d0217b0083b8c97ec.zip | |
Support for all valid CSS selectors (#10316)
Add support for pseudo-functions like ":nth-child(n)".
Add support for sibling selector "E ~ F".
Add support for unknown pseudo-functions taking an identifier such as
":not(s)".
Change-Id: I39b31fa99f031b31b215058a45b74e40b23191f3
Diffstat (limited to 'theme-compiler')
6 files changed, 1622 insertions, 1423 deletions
diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java index c13ab31def..266352e66f 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java @@ -795,6 +795,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case COMMA: case SEMICOLON: case PRECEDES: + case SIBLING: case LBRACKET: case ANY: case PARENT: @@ -844,6 +845,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case COMMA: case SEMICOLON: case PRECEDES: + case SIBLING: case NONASCII: case STRING: case NUMBER: @@ -1283,6 +1285,9 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case PRECEDES: n = jj_consume_token(PRECEDES); break; + case SIBLING: + n = jj_consume_token(SIBLING); + break; case MINUS: n = jj_consume_token(MINUS); break; @@ -1341,11 +1346,28 @@ char connector = ' '; } {if (true) return '>';} break; + case SIBLING: + jj_consume_token(SIBLING); + label_34: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case S: + ; + break; + default: + jj_la1[47] = jj_gen; + break label_34; + } + jj_consume_token(S); + } + {if (true) return '~';} + break; case S: jj_consume_token(S); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: case PRECEDES: + case SIBLING: switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: jj_consume_token(PLUS); @@ -1355,32 +1377,36 @@ char connector = ' '; jj_consume_token(PRECEDES); connector = '>'; break; + case SIBLING: + jj_consume_token(SIBLING); + connector = '~'; + break; default: - jj_la1[47] = jj_gen; + jj_la1[48] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_34: + label_35: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[48] = jj_gen; - break label_34; + jj_la1[49] = jj_gen; + break label_35; } jj_consume_token(S); } break; default: - jj_la1[49] = jj_gen; + jj_la1[50] = jj_gen; ; } {if (true) return connector;} break; default: - jj_la1[50] = jj_gen; + jj_la1[51] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1392,21 +1418,21 @@ char connector = ' '; String name = ""; String value = ""; n = jj_consume_token(MICROSOFT_RULE); - label_35: + label_36: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[51] = jj_gen; - break label_35; + jj_la1[52] = jj_gen; + break label_36; } jj_consume_token(S); } name = n.image; jj_consume_token(COLON); - label_36: + label_37: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IDENT: @@ -1447,7 +1473,7 @@ char connector = ' '; { value += n.image; } break; default: - jj_la1[52] = jj_gen; + jj_la1[53] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1464,20 +1490,20 @@ char connector = ' '; ; break; default: - jj_la1[53] = jj_gen; - break label_36; + jj_la1[54] = jj_gen; + break label_37; } } jj_consume_token(SEMICOLON); - label_37: + label_38: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[54] = jj_gen; - break label_37; + jj_la1[55] = jj_gen; + break label_38; } jj_consume_token(S); } @@ -1490,15 +1516,15 @@ char connector = ' '; final public String property() throws ParseException { Token n; n = jj_consume_token(IDENT); - label_38: + label_39: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[55] = jj_gen; - break label_38; + jj_la1[56] = jj_gen; + break label_39; } jj_consume_token(S); } @@ -1509,15 +1535,15 @@ char connector = ' '; final public String variableName() throws ParseException { Token n; n = jj_consume_token(VARIABLE); - label_39: + label_40: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[56] = jj_gen; - break label_39; + jj_la1[57] = jj_gen; + break label_40; } jj_consume_token(S); } @@ -1528,15 +1554,15 @@ char connector = ' '; final public String functionName() throws ParseException { Token n; n = jj_consume_token(FUNCTION); - label_40: + label_41: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[57] = jj_gen; - break label_40; + jj_la1[58] = jj_gen; + break label_41; } jj_consume_token(S); } @@ -1556,21 +1582,21 @@ char connector = ' '; l = selectorList(); save = token; jj_consume_token(LBRACE); - label_41: + label_42: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[58] = jj_gen; - break label_41; + jj_la1[59] = jj_gen; + break label_42; } jj_consume_token(S); } start = true; documentHandler.startSelector(l); - label_42: + label_43: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: @@ -1591,15 +1617,15 @@ char connector = ' '; ; break; default: - jj_la1[59] = jj_gen; - break label_42; + jj_la1[60] = jj_gen; + break label_43; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IF_SYM: ifDirective(); break; default: - jj_la1[61] = jj_gen; + jj_la1[62] = jj_gen; if (jj_2_2(5)) { listModifyDirective(); } else { @@ -1620,7 +1646,7 @@ char connector = ' '; variable(); break; default: - jj_la1[62] = jj_gen; + jj_la1[63] = jj_gen; if (jj_2_3(3)) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case MICROSOFT_RULE: @@ -1630,7 +1656,7 @@ char connector = ' '; declarationOrNestedProperties(); break; default: - jj_la1[60] = jj_gen; + jj_la1[61] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1647,7 +1673,7 @@ char connector = ' '; styleRule(); break; default: - jj_la1[63] = jj_gen; + jj_la1[64] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1657,15 +1683,15 @@ char connector = ' '; } } jj_consume_token(RBRACE); - label_43: + label_44: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[64] = jj_gen; - break label_43; + jj_la1[65] = jj_gen; + break label_44; } jj_consume_token(S); } @@ -1694,26 +1720,26 @@ char connector = ' '; ArrayList<String> selectors = new ArrayList<String>(); String selector; selector = selector(); - label_44: + label_45: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[65] = jj_gen; - break label_44; + jj_la1[66] = jj_gen; + break label_45; } jj_consume_token(COMMA); - label_45: + label_46: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[66] = jj_gen; - break label_45; + jj_la1[67] = jj_gen; + break label_46; } jj_consume_token(S); } @@ -1733,25 +1759,25 @@ char connector = ' '; char comb; try { selector = simple_selector(null, ' '); - label_46: + label_47: while (true) { if (jj_2_4(2)) { ; } else { - break label_46; + break label_47; } comb = combinator(); selector = simple_selector(selector, comb); } - label_47: + label_48: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[67] = jj_gen; - break label_47; + jj_la1[68] = jj_gen; + break label_48; } jj_consume_token(S); } @@ -1795,7 +1821,7 @@ char connector = ' '; case INTERPOLATION: case IDENT: simple_current = element_name(); - label_48: + label_49: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: @@ -1805,8 +1831,8 @@ char connector = ' '; ; break; default: - jj_la1[68] = jj_gen; - break label_48; + jj_la1[69] = jj_gen; + break label_49; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case HASH: @@ -1822,7 +1848,7 @@ char connector = ' '; cond = pseudo(cond); break; default: - jj_la1[69] = jj_gen; + jj_la1[70] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1830,7 +1856,7 @@ char connector = ' '; break; case HASH: cond = hash(cond); - label_49: + label_50: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: @@ -1839,8 +1865,8 @@ char connector = ' '; ; break; default: - jj_la1[70] = jj_gen; - break label_49; + jj_la1[71] = jj_gen; + break label_50; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case DOT: @@ -1853,7 +1879,7 @@ char connector = ' '; cond = pseudo(cond); break; default: - jj_la1[71] = jj_gen; + jj_la1[72] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1861,7 +1887,7 @@ char connector = ' '; break; case DOT: cond = _class(cond); - label_50: + label_51: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: @@ -1871,8 +1897,8 @@ char connector = ' '; ; break; default: - jj_la1[72] = jj_gen; - break label_50; + jj_la1[73] = jj_gen; + break label_51; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case HASH: @@ -1888,7 +1914,7 @@ char connector = ' '; cond = pseudo(cond); break; default: - jj_la1[73] = jj_gen; + jj_la1[74] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1896,7 +1922,7 @@ char connector = ' '; break; case COLON: cond = pseudo(cond); - label_51: + label_52: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: @@ -1906,8 +1932,8 @@ char connector = ' '; ; break; default: - jj_la1[74] = jj_gen; - break label_51; + jj_la1[75] = jj_gen; + break label_52; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case HASH: @@ -1923,7 +1949,7 @@ char connector = ' '; cond = pseudo(cond); break; default: - jj_la1[75] = jj_gen; + jj_la1[76] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1931,7 +1957,7 @@ char connector = ' '; break; case LBRACKET: cond = attrib(cond); - label_52: + label_53: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: @@ -1941,8 +1967,8 @@ char connector = ' '; ; break; default: - jj_la1[76] = jj_gen; - break label_52; + jj_la1[77] = jj_gen; + break label_53; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case HASH: @@ -1958,14 +1984,14 @@ char connector = ' '; cond = pseudo(cond); break; default: - jj_la1[77] = jj_gen; + jj_la1[78] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } break; default: - jj_la1[78] = jj_gen; + jj_la1[79] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1981,10 +2007,9 @@ char connector = ' '; selector = selector + comb + simple_current; break; case '+': - selector = selector + " " + comb + " " + simple_current; - break; case '>': - selector = selector + " " + comb + " " + simple_current; + case '~': + selector = selector + " " + comb + " " + simple_current; break; default: {if (true) throw new ParseException("invalid state. send a bug report");} @@ -2006,7 +2031,7 @@ char connector = ' '; Token t; String s = "."; jj_consume_token(DOT); - label_53: + label_54: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IDENT: @@ -2018,7 +2043,7 @@ String s = "."; s += t.image; break; default: - jj_la1[79] = jj_gen; + jj_la1[80] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2028,8 +2053,8 @@ String s = "."; ; break; default: - jj_la1[80] = jj_gen; - break label_53; + jj_la1[81] = jj_gen; + break label_54; } } if (pred == null) { @@ -2048,7 +2073,7 @@ String s = "."; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case INTERPOLATION: case IDENT: - label_54: + label_55: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IDENT: @@ -2060,7 +2085,7 @@ String s = "."; s += t.image; break; default: - jj_la1[81] = jj_gen; + jj_la1[82] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2070,8 +2095,8 @@ String s = "."; ; break; default: - jj_la1[82] = jj_gen; - break label_54; + jj_la1[83] = jj_gen; + break label_55; } } {if (true) return s;} @@ -2085,7 +2110,7 @@ String s = "."; {if (true) return "&";} break; default: - jj_la1[83] = jj_gen; + jj_la1[84] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2101,28 +2126,28 @@ String s = "."; Token val = null; String attValue = null; jj_consume_token(LBRACKET); - label_55: + label_56: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[84] = jj_gen; - break label_55; + jj_la1[85] = jj_gen; + break label_56; } jj_consume_token(S); } att = jj_consume_token(IDENT); - label_56: + label_57: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[85] = jj_gen; - break label_56; + jj_la1[86] = jj_gen; + break label_57; } jj_consume_token(S); } @@ -2159,19 +2184,19 @@ String s = "."; cases = 6; break; default: - jj_la1[86] = jj_gen; + jj_la1[87] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_57: + label_58: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[87] = jj_gen; - break label_57; + jj_la1[88] = jj_gen; + break label_58; } jj_consume_token(S); } @@ -2185,25 +2210,25 @@ String s = "."; attValue = val.image; break; default: - jj_la1[88] = jj_gen; + jj_la1[89] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_58: + label_59: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[89] = jj_gen; - break label_58; + jj_la1[90] = jj_gen; + break label_59; } jj_consume_token(S); } break; default: - jj_la1[90] = jj_gen; + jj_la1[91] = jj_gen; ; } jj_consume_token(RBRACKET); @@ -2249,7 +2274,8 @@ String s = "."; */ final public String pseudo(String pred) throws ParseException { Token n; -Token language; +Token param; +String d; boolean isPseudoElement = false; jj_consume_token(COLON); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2258,7 +2284,7 @@ boolean isPseudoElement = false; isPseudoElement=true; break; default: - jj_la1[91] = jj_gen; + jj_la1[92] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2284,47 +2310,65 @@ boolean isPseudoElement = false; break; case FUNCTION: n = jj_consume_token(FUNCTION); - label_59: + label_60: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[92] = jj_gen; - break label_59; + jj_la1[93] = jj_gen; + break label_60; } jj_consume_token(S); } - language = jj_consume_token(IDENT); - label_60: + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IDENT: + param = jj_consume_token(IDENT); + d = convertIdent(param.image); + break; + case NUMBER: + param = jj_consume_token(NUMBER); + d = param.image; + break; + case LBRACKET: + case ANY: + case PARENT: + case DOT: + case COLON: + case INTERPOLATION: + case HASH: + d = simple_selector(null, ' '); + break; + default: + jj_la1[94] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + label_61: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[93] = jj_gen; - break label_60; + jj_la1[95] = jj_gen; + break label_61; } jj_consume_token(S); } jj_consume_token(RPARAN); String f = convertIdent(n.image); - if (f.equals("lang(")) { - String d = convertIdent(language.image); + String colons = isPseudoElement ? "::" : ":"; + String pseudofn = colons + f + d + ")"; if (pred == null) { - {if (true) return d;} + {if (true) return pseudofn;} } else { - {if (true) return pred + d;} - } - } else { - {if (true) throw new CSSParseException("invalid pseudo function name " - + f, getLocator());} + {if (true) return pred + pseudofn;} } break; default: - jj_la1[94] = jj_gen; + jj_la1[96] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2354,15 +2398,15 @@ boolean isPseudoElement = false; try { name = variableName(); jj_consume_token(COLON); - label_61: + label_62: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[95] = jj_gen; - break label_61; + jj_la1[97] = jj_gen; + break label_62; } jj_consume_token(S); } @@ -2372,21 +2416,21 @@ boolean isPseudoElement = false; guarded = guarded(); break; default: - jj_la1[96] = jj_gen; + jj_la1[98] = jj_gen; ; } - label_62: + label_63: while (true) { jj_consume_token(SEMICOLON); - label_63: + label_64: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[97] = jj_gen; - break label_63; + jj_la1[99] = jj_gen; + break label_64; } jj_consume_token(S); } @@ -2395,8 +2439,8 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[98] = jj_gen; - break label_62; + jj_la1[100] = jj_gen; + break label_63; } } documentHandler.variable(name, exp, guarded); @@ -2431,7 +2475,7 @@ boolean isPseudoElement = false; Token n = null; String evaluator = ""; jj_consume_token(IF_SYM); - label_64: + label_65: while (true) { n = booleanExpressionToken(); evaluator += n.image; @@ -2456,26 +2500,26 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[99] = jj_gen; - break label_64; + jj_la1[101] = jj_gen; + break label_65; } } jj_consume_token(LBRACE); - label_65: + label_66: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[100] = jj_gen; - break label_65; + jj_la1[102] = jj_gen; + break label_66; } jj_consume_token(S); } documentHandler.startIfElseDirective(); documentHandler.ifDirective(evaluator); - label_66: + label_67: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: @@ -2493,8 +2537,8 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[101] = jj_gen; - break label_66; + jj_la1[103] = jj_gen; + break label_67; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case INCLUDE_SYM: @@ -2510,7 +2554,7 @@ boolean isPseudoElement = false; variable(); break; default: - jj_la1[102] = jj_gen; + jj_la1[104] = jj_gen; if (jj_2_5(3)) { declarationOrNestedProperties(); } else { @@ -2526,7 +2570,7 @@ boolean isPseudoElement = false; styleRule(); break; default: - jj_la1[103] = jj_gen; + jj_la1[105] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2534,27 +2578,27 @@ boolean isPseudoElement = false; } } jj_consume_token(RBRACE); - label_67: + label_68: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[104] = jj_gen; - break label_67; + jj_la1[106] = jj_gen; + break label_68; } jj_consume_token(S); } - label_68: + label_69: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ELSE_SYM: ; break; default: - jj_la1[105] = jj_gen; - break label_68; + jj_la1[107] = jj_gen; + break label_69; } elseDirective(); } @@ -2565,22 +2609,22 @@ boolean isPseudoElement = false; String evaluator = ""; Token n = null; jj_consume_token(ELSE_SYM); - label_69: + label_70: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[106] = jj_gen; - break label_69; + jj_la1[108] = jj_gen; + break label_70; } jj_consume_token(S); } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IF: jj_consume_token(IF); - label_70: + label_71: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -2603,33 +2647,33 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[107] = jj_gen; - break label_70; + jj_la1[109] = jj_gen; + break label_71; } n = booleanExpressionToken(); if(n != null) evaluator += n.image; } break; default: - jj_la1[108] = jj_gen; + jj_la1[110] = jj_gen; ; } jj_consume_token(LBRACE); - label_71: + label_72: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[109] = jj_gen; - break label_71; + jj_la1[111] = jj_gen; + break label_72; } jj_consume_token(S); } if(!evaluator.trim().equals("")){ documentHandler.ifDirective(evaluator); } else{ documentHandler.elseDirective(); } - label_72: + label_73: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: @@ -2647,8 +2691,8 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[110] = jj_gen; - break label_72; + jj_la1[112] = jj_gen; + break label_73; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case INCLUDE_SYM: @@ -2664,7 +2708,7 @@ boolean isPseudoElement = false; variable(); break; default: - jj_la1[111] = jj_gen; + jj_la1[113] = jj_gen; if (jj_2_6(3)) { declarationOrNestedProperties(); } else { @@ -2680,7 +2724,7 @@ boolean isPseudoElement = false; styleRule(); break; default: - jj_la1[112] = jj_gen; + jj_la1[114] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2688,15 +2732,15 @@ boolean isPseudoElement = false; } } jj_consume_token(RBRACE); - label_73: + label_74: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[113] = jj_gen; - break label_73; + jj_la1[115] = jj_gen; + break label_74; } jj_consume_token(S); } @@ -2757,7 +2801,7 @@ boolean isPseudoElement = false; n = jj_consume_token(NOT_EQ); break; default: - jj_la1[114] = jj_gen; + jj_la1[116] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2770,41 +2814,41 @@ boolean isPseudoElement = false; ArrayList<String> list = null; String listVariable = null; jj_consume_token(EACH_SYM); - label_74: + label_75: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[115] = jj_gen; - break label_74; + jj_la1[117] = jj_gen; + break label_75; } jj_consume_token(S); } var = jj_consume_token(VARIABLE); - label_75: + label_76: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[116] = jj_gen; - break label_75; + jj_la1[118] = jj_gen; + break label_76; } jj_consume_token(S); } jj_consume_token(EACH_IN); - label_76: + label_77: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[117] = jj_gen; - break label_76; + jj_la1[119] = jj_gen; + break label_77; } jj_consume_token(S); } @@ -2818,24 +2862,24 @@ boolean isPseudoElement = false; documentHandler.startEachDirective(var.image, listVariable); break; default: - jj_la1[118] = jj_gen; + jj_la1[120] = jj_gen; jj_consume_token(-1); throw new ParseException(); } jj_consume_token(LBRACE); - label_77: + label_78: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[119] = jj_gen; - break label_77; + jj_la1[121] = jj_gen; + break label_78; } jj_consume_token(S); } - label_78: + label_79: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: @@ -2853,15 +2897,15 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[120] = jj_gen; - break label_78; + jj_la1[122] = jj_gen; + break label_79; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case INCLUDE_SYM: includeDirective(); break; default: - jj_la1[121] = jj_gen; + jj_la1[123] = jj_gen; if (jj_2_7(5)) { listModifyDirective(); } else { @@ -2876,7 +2920,7 @@ boolean isPseudoElement = false; variable(); break; default: - jj_la1[122] = jj_gen; + jj_la1[124] = jj_gen; if (jj_2_8(3)) { declarationOrNestedProperties(); } else { @@ -2892,7 +2936,7 @@ boolean isPseudoElement = false; styleRule(); break; default: - jj_la1[123] = jj_gen; + jj_la1[125] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2902,15 +2946,15 @@ boolean isPseudoElement = false; } } jj_consume_token(RBRACE); - label_79: + label_80: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[124] = jj_gen; - break label_79; + jj_la1[126] = jj_gen; + break label_80; } jj_consume_token(S); } @@ -2921,53 +2965,53 @@ boolean isPseudoElement = false; ArrayList<String > strings = new ArrayList<String >(); Token input; input = jj_consume_token(IDENT); - label_80: + label_81: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[125] = jj_gen; - break label_80; + jj_la1[127] = jj_gen; + break label_81; } jj_consume_token(S); } strings.add(input.image); - label_81: + label_82: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[126] = jj_gen; - break label_81; + jj_la1[128] = jj_gen; + break label_82; } jj_consume_token(COMMA); - label_82: + label_83: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[127] = jj_gen; - break label_82; + jj_la1[129] = jj_gen; + break label_83; } jj_consume_token(S); } input = jj_consume_token(IDENT); strings.add(input.image); - label_83: + label_84: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[128] = jj_gen; - break label_83; + jj_la1[130] = jj_gen; + break label_84; } jj_consume_token(S); } @@ -2981,15 +3025,15 @@ boolean isPseudoElement = false; ArrayList<VariableNode> args = null; String body; jj_consume_token(MIXIN_SYM); - label_84: + label_85: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[129] = jj_gen; - break label_84; + jj_la1[131] = jj_gen; + break label_85; } jj_consume_token(S); } @@ -3001,39 +3045,39 @@ boolean isPseudoElement = false; name = functionName(); args = arglist(); jj_consume_token(RPARAN); - label_85: + label_86: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[130] = jj_gen; - break label_85; + jj_la1[132] = jj_gen; + break label_86; } jj_consume_token(S); } break; default: - jj_la1[131] = jj_gen; + jj_la1[133] = jj_gen; jj_consume_token(-1); throw new ParseException(); } jj_consume_token(LBRACE); - label_86: + label_87: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[132] = jj_gen; - break label_86; + jj_la1[134] = jj_gen; + break label_87; } jj_consume_token(S); } documentHandler.startMixinDirective(name, args); - label_87: + label_88: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: @@ -3052,8 +3096,8 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[133] = jj_gen; - break label_87; + jj_la1[135] = jj_gen; + break label_88; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case INCLUDE_SYM: @@ -3063,7 +3107,7 @@ boolean isPseudoElement = false; media(); break; default: - jj_la1[134] = jj_gen; + jj_la1[136] = jj_gen; if (jj_2_9(5)) { listModifyDirective(); } else { @@ -3078,7 +3122,7 @@ boolean isPseudoElement = false; variable(); break; default: - jj_la1[135] = jj_gen; + jj_la1[137] = jj_gen; if (jj_2_10(3)) { declarationOrNestedProperties(); } else { @@ -3094,7 +3138,7 @@ boolean isPseudoElement = false; styleRule(); break; default: - jj_la1[136] = jj_gen; + jj_la1[138] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3104,15 +3148,15 @@ boolean isPseudoElement = false; } } jj_consume_token(RBRACE); - label_88: + label_89: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[137] = jj_gen; - break label_88; + jj_la1[139] = jj_gen; + break label_89; } jj_consume_token(S); } @@ -3124,26 +3168,26 @@ boolean isPseudoElement = false; VariableNode arg; boolean hasNonOptionalArgument = false; arg = mixinArg(); - label_89: + label_90: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[138] = jj_gen; - break label_89; + jj_la1[140] = jj_gen; + break label_90; } jj_consume_token(COMMA); - label_90: + label_91: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[139] = jj_gen; - break label_90; + jj_la1[141] = jj_gen; + break label_91; } jj_consume_token(S); } @@ -3184,45 +3228,45 @@ boolean isPseudoElement = false; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COLON: jj_consume_token(COLON); - label_91: + label_92: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[140] = jj_gen; - break label_91; + jj_la1[142] = jj_gen; + break label_92; } jj_consume_token(S); } first = nonVariableTerm(null); prev = first; - label_92: + label_93: while (true) { if (jj_2_11(3)) { ; } else { - break label_92; + break label_93; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: jj_consume_token(COMMA); - label_93: + label_94: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[141] = jj_gen; - break label_93; + jj_la1[143] = jj_gen; + break label_94; } jj_consume_token(S); } break; default: - jj_la1[142] = jj_gen; + jj_la1[144] = jj_gen; ; } prev = nonVariableTerm(prev); @@ -3234,13 +3278,13 @@ boolean isPseudoElement = false; prev, variable.image); break; default: - jj_la1[143] = jj_gen; + jj_la1[145] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[144] = jj_gen; + jj_la1[146] = jj_gen; ; } VariableNode arg = new VariableNode(name, first, false); @@ -3255,7 +3299,7 @@ boolean isPseudoElement = false; LexicalUnitImpl prev = null; first = term(null); args.add(first); prev = first; - label_94: + label_95: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: @@ -3290,58 +3334,58 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[145] = jj_gen; - break label_94; + jj_la1[147] = jj_gen; + break label_95; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COLON: jj_consume_token(COLON); - label_95: + label_96: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[146] = jj_gen; - break label_95; + jj_la1[148] = jj_gen; + break label_96; } jj_consume_token(S); } break; default: - jj_la1[147] = jj_gen; + jj_la1[149] = jj_gen; ; } next = term(prev); prev.setNextLexicalUnit(next); prev = next; } - label_96: + label_97: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[148] = jj_gen; - break label_96; + jj_la1[150] = jj_gen; + break label_97; } jj_consume_token(COMMA); - label_97: + label_98: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[149] = jj_gen; - break label_97; + jj_la1[151] = jj_gen; + break label_98; } jj_consume_token(S); } first = term(null); args.add(first); prev = first; - label_98: + label_99: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: @@ -3376,27 +3420,27 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[150] = jj_gen; - break label_98; + jj_la1[152] = jj_gen; + break label_99; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COLON: jj_consume_token(COLON); - label_99: + label_100: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[151] = jj_gen; - break label_99; + jj_la1[153] = jj_gen; + break label_100; } jj_consume_token(S); } break; default: - jj_la1[152] = jj_gen; + jj_la1[154] = jj_gen; ; } next = term(prev); @@ -3411,15 +3455,15 @@ boolean isPseudoElement = false; String name; ArrayList<LexicalUnitImpl> args=null; jj_consume_token(INCLUDE_SYM); - label_100: + label_101: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[153] = jj_gen; - break label_100; + jj_la1[155] = jj_gen; + break label_101; } jj_consume_token(S); } @@ -3440,22 +3484,22 @@ boolean isPseudoElement = false; jj_consume_token(RPARAN); break; default: - jj_la1[154] = jj_gen; + jj_la1[156] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_101: + label_102: while (true) { jj_consume_token(SEMICOLON); - label_102: + label_103: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[155] = jj_gen; - break label_102; + jj_la1[157] = jj_gen; + break label_103; } jj_consume_token(S); } @@ -3464,8 +3508,8 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[156] = jj_gen; - break label_101; + jj_la1[158] = jj_gen; + break label_102; } } documentHandler.includeDirective(name, args); @@ -3502,41 +3546,41 @@ boolean isPseudoElement = false; Token n = null; n = jj_consume_token(VARIABLE); variable = n.image; - label_103: + label_104: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[157] = jj_gen; - break label_103; + jj_la1[159] = jj_gen; + break label_104; } jj_consume_token(S); } jj_consume_token(COLON); - label_104: + label_105: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[158] = jj_gen; - break label_104; + jj_la1[160] = jj_gen; + break label_105; } jj_consume_token(S); } jj_consume_token(APPEND); - label_105: + label_106: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[159] = jj_gen; - break label_105; + jj_la1[161] = jj_gen; + break label_106; } jj_consume_token(S); } @@ -3546,19 +3590,19 @@ boolean isPseudoElement = false; jj_consume_token(RPARAN); break; default: - jj_la1[160] = jj_gen; + jj_la1[162] = jj_gen; ; } jj_consume_token(COMMA); - label_106: + label_107: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[161] = jj_gen; - break label_106; + jj_la1[163] = jj_gen; + break label_107; } jj_consume_token(S); } @@ -3566,60 +3610,60 @@ boolean isPseudoElement = false; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: jj_consume_token(COMMA); - label_107: + label_108: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[162] = jj_gen; - break label_107; + jj_la1[164] = jj_gen; + break label_108; } jj_consume_token(S); } n = jj_consume_token(IDENT); separator = n.image; - label_108: + label_109: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[163] = jj_gen; - break label_108; + jj_la1[165] = jj_gen; + break label_109; } jj_consume_token(S); } break; default: - jj_la1[164] = jj_gen; + jj_la1[166] = jj_gen; ; } jj_consume_token(RPARAN); - label_109: + label_110: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[165] = jj_gen; - break label_109; + jj_la1[167] = jj_gen; + break label_110; } jj_consume_token(S); } jj_consume_token(SEMICOLON); - label_110: + label_111: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[166] = jj_gen; - break label_110; + jj_la1[168] = jj_gen; + break label_111; } jj_consume_token(S); } @@ -3637,41 +3681,41 @@ boolean isPseudoElement = false; Token n = null; n = jj_consume_token(VARIABLE); variable = n.image; - label_111: + label_112: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[167] = jj_gen; - break label_111; + jj_la1[169] = jj_gen; + break label_112; } jj_consume_token(S); } jj_consume_token(COLON); - label_112: + label_113: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[168] = jj_gen; - break label_112; + jj_la1[170] = jj_gen; + break label_113; } jj_consume_token(S); } jj_consume_token(REMOVE); - label_113: + label_114: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[169] = jj_gen; - break label_113; + jj_la1[171] = jj_gen; + break label_114; } jj_consume_token(S); } @@ -3681,19 +3725,19 @@ boolean isPseudoElement = false; jj_consume_token(RPARAN); break; default: - jj_la1[170] = jj_gen; + jj_la1[172] = jj_gen; ; } jj_consume_token(COMMA); - label_114: + label_115: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[171] = jj_gen; - break label_114; + jj_la1[173] = jj_gen; + break label_115; } jj_consume_token(S); } @@ -3701,60 +3745,60 @@ boolean isPseudoElement = false; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: jj_consume_token(COMMA); - label_115: + label_116: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[172] = jj_gen; - break label_115; + jj_la1[174] = jj_gen; + break label_116; } jj_consume_token(S); } n = jj_consume_token(IDENT); separator = n.image; - label_116: + label_117: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[173] = jj_gen; - break label_116; + jj_la1[175] = jj_gen; + break label_117; } jj_consume_token(S); } break; default: - jj_la1[174] = jj_gen; + jj_la1[176] = jj_gen; ; } jj_consume_token(RPARAN); - label_117: + label_118: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[175] = jj_gen; - break label_117; + jj_la1[177] = jj_gen; + break label_118; } jj_consume_token(S); } jj_consume_token(SEMICOLON); - label_118: + label_119: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[176] = jj_gen; - break label_118; + jj_la1[178] = jj_gen; + break label_119; } jj_consume_token(S); } @@ -3772,41 +3816,41 @@ boolean isPseudoElement = false; Token n = null; n = jj_consume_token(VARIABLE); variable = n.image; - label_119: + label_120: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[177] = jj_gen; - break label_119; + jj_la1[179] = jj_gen; + break label_120; } jj_consume_token(S); } jj_consume_token(COLON); - label_120: + label_121: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[178] = jj_gen; - break label_120; + jj_la1[180] = jj_gen; + break label_121; } jj_consume_token(S); } jj_consume_token(CONTAINS); - label_121: + label_122: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[179] = jj_gen; - break label_121; + jj_la1[181] = jj_gen; + break label_122; } jj_consume_token(S); } @@ -3816,19 +3860,19 @@ boolean isPseudoElement = false; jj_consume_token(RPARAN); break; default: - jj_la1[180] = jj_gen; + jj_la1[182] = jj_gen; ; } jj_consume_token(COMMA); - label_122: + label_123: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[181] = jj_gen; - break label_122; + jj_la1[183] = jj_gen; + break label_123; } jj_consume_token(S); } @@ -3836,60 +3880,60 @@ boolean isPseudoElement = false; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: jj_consume_token(COMMA); - label_123: + label_124: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[182] = jj_gen; - break label_123; + jj_la1[184] = jj_gen; + break label_124; } jj_consume_token(S); } n = jj_consume_token(IDENT); separator = n.image; - label_124: + label_125: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[183] = jj_gen; - break label_124; + jj_la1[185] = jj_gen; + break label_125; } jj_consume_token(S); } break; default: - jj_la1[184] = jj_gen; + jj_la1[186] = jj_gen; ; } jj_consume_token(RPARAN); - label_125: + label_126: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[185] = jj_gen; - break label_125; + jj_la1[187] = jj_gen; + break label_126; } jj_consume_token(S); } jj_consume_token(SEMICOLON); - label_126: + label_127: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[186] = jj_gen; - break label_126; + jj_la1[188] = jj_gen; + break label_127; } jj_consume_token(S); } @@ -4001,20 +4045,20 @@ boolean isPseudoElement = false; exclusive = false; break; default: - jj_la1[187] = jj_gen; + jj_la1[189] = jj_gen; jj_consume_token(-1); throw new ParseException(); } to = skipStatementUntilLeftBrace(); - label_127: + label_128: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[188] = jj_gen; - break label_127; + jj_la1[190] = jj_gen; + break label_128; } jj_consume_token(S); } @@ -4035,31 +4079,31 @@ boolean isPseudoElement = false; final public void extendDirective() throws ParseException { ArrayList<String> list; jj_consume_token(EXTEND_SYM); - label_128: + label_129: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[189] = jj_gen; - break label_128; + jj_la1[191] = jj_gen; + break label_129; } jj_consume_token(S); } list = selectorList(); - label_129: + label_130: while (true) { jj_consume_token(SEMICOLON); - label_130: + label_131: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[190] = jj_gen; - break label_130; + jj_la1[192] = jj_gen; + break label_131; } jj_consume_token(S); } @@ -4068,8 +4112,8 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[191] = jj_gen; - break label_129; + jj_la1[193] = jj_gen; + break label_130; } } documentHandler.extendDirective(list); @@ -4096,28 +4140,28 @@ boolean isPseudoElement = false; LexicalUnit exp; name = property(); jj_consume_token(COLON); - label_131: + label_132: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[192] = jj_gen; - break label_131; + jj_la1[194] = jj_gen; + break label_132; } jj_consume_token(S); } jj_consume_token(LBRACE); - label_132: + label_133: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[193] = jj_gen; - break label_132; + jj_la1[195] = jj_gen; + break label_133; } jj_consume_token(S); } @@ -4127,29 +4171,29 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[194] = jj_gen; + jj_la1[196] = jj_gen; ; } - label_133: + label_134: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[195] = jj_gen; - break label_133; + jj_la1[197] = jj_gen; + break label_134; } jj_consume_token(SEMICOLON); - label_134: + label_135: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[196] = jj_gen; - break label_134; + jj_la1[198] = jj_gen; + break label_135; } jj_consume_token(S); } @@ -4158,21 +4202,21 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[197] = jj_gen; + jj_la1[199] = jj_gen; ; } } jj_consume_token(RBRACE); documentHandler.endNestedProperties(name); - label_135: + label_136: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[198] = jj_gen; - break label_135; + jj_la1[200] = jj_gen; + break label_136; } jj_consume_token(S); } @@ -4191,15 +4235,15 @@ LexicalUnit exp; name = property(); save = token; jj_consume_token(COLON); - label_136: + label_137: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[199] = jj_gen; - break label_136; + jj_la1[201] = jj_gen; + break label_137; } jj_consume_token(S); } @@ -4238,7 +4282,7 @@ LexicalUnit exp; important = prio(); break; default: - jj_la1[200] = jj_gen; + jj_la1[202] = jj_gen; ; } Token next = getToken(1); @@ -4256,15 +4300,15 @@ LexicalUnit exp; break; case LBRACE: jj_consume_token(LBRACE); - label_137: + label_138: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[201] = jj_gen; - break label_137; + jj_la1[203] = jj_gen; + break label_138; } jj_consume_token(S); } @@ -4274,29 +4318,29 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[202] = jj_gen; + jj_la1[204] = jj_gen; ; } - label_138: + label_139: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[203] = jj_gen; - break label_138; + jj_la1[205] = jj_gen; + break label_139; } jj_consume_token(SEMICOLON); - label_139: + label_140: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[204] = jj_gen; - break label_139; + jj_la1[206] = jj_gen; + break label_140; } jj_consume_token(S); } @@ -4305,27 +4349,27 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[205] = jj_gen; + jj_la1[207] = jj_gen; ; } } jj_consume_token(RBRACE); - label_140: + label_141: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[206] = jj_gen; - break label_140; + jj_la1[208] = jj_gen; + break label_141; } jj_consume_token(S); } documentHandler.endNestedProperties(name); break; default: - jj_la1[207] = jj_gen; + jj_la1[209] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4375,15 +4419,15 @@ LexicalUnit exp; name = property(); save = token; jj_consume_token(COLON); - label_141: + label_142: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[208] = jj_gen; - break label_141; + jj_la1[210] = jj_gen; + break label_142; } jj_consume_token(S); } @@ -4393,7 +4437,7 @@ LexicalUnit exp; important = prio(); break; default: - jj_la1[209] = jj_gen; + jj_la1[211] = jj_gen; ; } documentHandler.property(name, exp, important); @@ -4436,15 +4480,15 @@ LexicalUnit exp; */ final public boolean prio() throws ParseException { jj_consume_token(IMPORTANT_SYM); - label_142: + label_143: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[210] = jj_gen; - break label_142; + jj_la1[212] = jj_gen; + break label_143; } jj_consume_token(S); } @@ -4454,15 +4498,15 @@ LexicalUnit exp; final public boolean guarded() throws ParseException { jj_consume_token(GUARDED_SYM); - label_143: + label_144: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[211] = jj_gen; - break label_143; + jj_la1[213] = jj_gen; + break label_144; } jj_consume_token(S); } @@ -4478,15 +4522,15 @@ LexicalUnit exp; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case DIV: n = jj_consume_token(DIV); - label_144: + label_145: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[212] = jj_gen; - break label_144; + jj_la1[214] = jj_gen; + break label_145; } jj_consume_token(S); } @@ -4496,15 +4540,15 @@ LexicalUnit exp; break; case COMMA: n = jj_consume_token(COMMA); - label_145: + label_146: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[213] = jj_gen; - break label_145; + jj_la1[215] = jj_gen; + break label_146; } jj_consume_token(S); } @@ -4513,7 +4557,7 @@ LexicalUnit exp; prev);} break; default: - jj_la1[214] = jj_gen; + jj_la1[216] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4528,12 +4572,12 @@ LexicalUnit exp; char op; first = term(null); res = first; - label_146: + label_147: while (true) { if (jj_2_15(2)) { ; } else { - break label_146; + break label_147; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: @@ -4541,7 +4585,7 @@ LexicalUnit exp; res = operator(res); break; default: - jj_la1[215] = jj_gen; + jj_la1[217] = jj_gen; ; } res = term(res); @@ -4564,7 +4608,7 @@ LexicalUnit exp; {if (true) return '+';} break; default: - jj_la1[216] = jj_gen; + jj_la1[218] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4612,7 +4656,7 @@ LexicalUnit exp; result = variableTerm(prev); break; default: - jj_la1[217] = jj_gen; + jj_la1[219] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4663,7 +4707,7 @@ LexicalUnitImpl result = null; op = unaryOperator(); break; default: - jj_la1[218] = jj_gen; + jj_la1[220] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4768,7 +4812,7 @@ LexicalUnitImpl result = null; result = function(op, prev); break; default: - jj_la1[219] = jj_gen; + jj_la1[221] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4795,7 +4839,7 @@ LexicalUnitImpl result = null; s+="."; break; default: - jj_la1[220] = jj_gen; + jj_la1[222] = jj_gen; ; } n = jj_consume_token(IDENT); @@ -4842,25 +4886,25 @@ LexicalUnitImpl result = null; result = unicode(prev); break; default: - jj_la1[221] = jj_gen; + jj_la1[223] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[222] = jj_gen; + jj_la1[224] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_147: + label_148: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[223] = jj_gen; - break label_147; + jj_la1[225] = jj_gen; + break label_148; } jj_consume_token(S); } @@ -4876,15 +4920,15 @@ LexicalUnitImpl result = null; Token n; LexicalUnit params = null; n = jj_consume_token(FUNCTION); - label_148: + label_149: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[224] = jj_gen; - break label_148; + jj_la1[226] = jj_gen; + break label_149; } jj_consume_token(S); } @@ -4926,7 +4970,7 @@ LexicalUnitImpl result = null; params = expr(); break; default: - jj_la1[225] = jj_gen; + jj_la1[227] = jj_gen; ; } jj_consume_token(RPARAN); @@ -5397,15 +5441,15 @@ LexicalUnitImpl result = null; */ final public void _parseRule() throws ParseException { String ret = null; - label_149: + label_150: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[226] = jj_gen; - break label_149; + jj_la1[228] = jj_gen; + break label_150; } jj_consume_token(S); } @@ -5433,7 +5477,7 @@ LexicalUnitImpl result = null; fontFace(); break; default: - jj_la1[227] = jj_gen; + jj_la1[229] = jj_gen; ret = skipStatement(); if ((ret == null) || (ret.length() == 0)) { {if (true) return;} @@ -5448,15 +5492,15 @@ LexicalUnitImpl result = null; } final public void _parseImportRule() throws ParseException { - label_150: + label_151: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[228] = jj_gen; - break label_150; + jj_la1[230] = jj_gen; + break label_151; } jj_consume_token(S); } @@ -5464,15 +5508,15 @@ LexicalUnitImpl result = null; } final public void _parseMediaRule() throws ParseException { - label_151: + label_152: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[229] = jj_gen; - break label_151; + jj_la1[231] = jj_gen; + break label_152; } jj_consume_token(S); } @@ -5480,15 +5524,15 @@ LexicalUnitImpl result = null; } final public void _parseDeclarationBlock() throws ParseException { - label_152: + label_153: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[230] = jj_gen; - break label_152; + jj_la1[232] = jj_gen; + break label_153; } jj_consume_token(S); } @@ -5497,29 +5541,29 @@ LexicalUnitImpl result = null; declaration(); break; default: - jj_la1[231] = jj_gen; + jj_la1[233] = jj_gen; ; } - label_153: + label_154: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[232] = jj_gen; - break label_153; + jj_la1[234] = jj_gen; + break label_154; } jj_consume_token(SEMICOLON); - label_154: + label_155: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[233] = jj_gen; - break label_154; + jj_la1[235] = jj_gen; + break label_155; } jj_consume_token(S); } @@ -5528,7 +5572,7 @@ LexicalUnitImpl result = null; declaration(); break; default: - jj_la1[234] = jj_gen; + jj_la1[236] = jj_gen; ; } } @@ -5537,15 +5581,15 @@ LexicalUnitImpl result = null; final public ArrayList<String> _parseSelectors() throws ParseException { ArrayList<String> p = null; try { - label_155: + label_156: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[235] = jj_gen; - break label_155; + jj_la1[237] = jj_gen; + break label_156; } jj_consume_token(S); } @@ -5662,75 +5706,66 @@ LexicalUnitImpl result = null; finally { jj_save(14, xla); } } - private boolean jj_3R_202() { - if (jj_scan_token(PX)) return true; - return false; - } - - private boolean jj_3R_201() { + private boolean jj_3R_203() { if (jj_scan_token(IN)) return true; return false; } - private boolean jj_3R_200() { + private boolean jj_3R_202() { if (jj_scan_token(PC)) return true; return false; } - private boolean jj_3_1() { - if (jj_3R_156()) return true; + private boolean jj_3R_201() { + if (jj_scan_token(MM)) return true; return false; } - private boolean jj_3R_199() { - if (jj_scan_token(MM)) return true; + private boolean jj_3_1() { + if (jj_3R_157()) return true; return false; } - private boolean jj_3R_198() { + private boolean jj_3R_200() { if (jj_scan_token(CM)) return true; return false; } - private boolean jj_3R_180() { + private boolean jj_3R_182() { if (jj_scan_token(LBRACE)) return true; return false; } - private boolean jj_3R_197() { + private boolean jj_3R_199() { if (jj_scan_token(PT)) return true; return false; } - private boolean jj_3R_196() { + private boolean jj_3R_198() { if (jj_scan_token(PERCENTAGE)) return true; return false; } - private boolean jj_3R_185() { - if (jj_3R_221()) return true; + private boolean jj_3R_187() { + if (jj_3R_223()) return true; return false; } - private boolean jj_3R_195() { + private boolean jj_3R_197() { if (jj_scan_token(NUMBER)) return true; return false; } - private boolean jj_3R_194() { - if (jj_3R_236()) return true; + private boolean jj_3R_196() { + if (jj_3R_239()) return true; return false; } - private boolean jj_3R_181() { + private boolean jj_3R_183() { Token xsp; xsp = jj_scanpos; - if (jj_3R_194()) jj_scanpos = xsp; + if (jj_3R_196()) jj_scanpos = 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()) { @@ -5763,7 +5798,11 @@ LexicalUnitImpl result = null; jj_scanpos = xsp; if (jj_3R_212()) { jj_scanpos = xsp; - if (jj_3R_213()) return true; + if (jj_3R_213()) { + jj_scanpos = xsp; + if (jj_3R_214()) { + jj_scanpos = xsp; + if (jj_3R_215()) return true; } } } @@ -5786,22 +5825,22 @@ LexicalUnitImpl result = null; } private boolean jj_3_4() { - if (jj_3R_159()) return true; if (jj_3R_160()) return true; + if (jj_3R_161()) return true; return false; } - private boolean jj_3R_179() { - if (jj_3R_193()) return true; + private boolean jj_3R_181() { + if (jj_3R_195()) return true; return false; } - private boolean jj_3R_163() { + private boolean jj_3R_164() { Token xsp; xsp = jj_scanpos; - if (jj_3R_181()) { + if (jj_3R_183()) { jj_scanpos = xsp; - if (jj_3R_182()) return true; + if (jj_3R_184()) return true; } while (true) { xsp = jj_scanpos; @@ -5811,22 +5850,22 @@ LexicalUnitImpl result = null; } private boolean jj_3_7() { - if (jj_3R_156()) return true; + if (jj_3R_157()) return true; return false; } - private boolean jj_3R_191() { + private boolean jj_3R_193() { if (jj_scan_token(COLON)) return true; return false; } private boolean jj_3_6() { - if (jj_3R_161()) return true; + if (jj_3R_162()) return true; return false; } - private boolean jj_3R_161() { - if (jj_3R_178()) return true; + private boolean jj_3R_162() { + if (jj_3R_180()) return true; if (jj_scan_token(COLON)) return true; Token xsp; while (true) { @@ -5834,24 +5873,24 @@ LexicalUnitImpl result = null; if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_179()) { + if (jj_3R_181()) { jj_scanpos = xsp; - if (jj_3R_180()) return true; + if (jj_3R_182()) return true; } return false; } - private boolean jj_3R_239() { + private boolean jj_3R_242() { if (jj_scan_token(HASH)) return true; return false; } - private boolean jj_3R_221() { - if (jj_3R_242()) return true; + private boolean jj_3R_223() { + if (jj_3R_245()) return true; return false; } - private boolean jj_3R_166() { + private boolean jj_3R_167() { if (jj_scan_token(VARIABLE)) return true; Token xsp; while (true) { @@ -5873,46 +5912,46 @@ LexicalUnitImpl result = null; } private boolean jj_3_14() { - if (jj_3R_166()) return true; + if (jj_3R_167()) return true; return false; } - private boolean jj_3R_240() { + private boolean jj_3R_243() { if (jj_scan_token(URL)) return true; return false; } - private boolean jj_3R_184() { - if (jj_3R_163()) return true; + private boolean jj_3R_186() { + if (jj_3R_164()) return true; return false; } - private boolean jj_3R_168() { + private boolean jj_3R_169() { Token xsp; xsp = jj_scanpos; - if (jj_3R_184()) { + if (jj_3R_186()) { jj_scanpos = xsp; - if (jj_3R_185()) return true; + if (jj_3R_187()) return true; } return false; } private boolean jj_3_5() { - if (jj_3R_161()) return true; + if (jj_3R_162()) return true; return false; } - private boolean jj_3R_167() { - if (jj_3R_183()) return true; + private boolean jj_3R_168() { + if (jj_3R_185()) return true; return false; } private boolean jj_3_2() { - if (jj_3R_156()) return true; + if (jj_3R_157()) return true; return false; } - private boolean jj_3R_164() { + private boolean jj_3R_165() { if (jj_scan_token(VARIABLE)) return true; Token xsp; while (true) { @@ -5933,22 +5972,22 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_245() { + private boolean jj_3R_248() { if (jj_scan_token(PLUS)) return true; return false; } - private boolean jj_3R_244() { + private boolean jj_3R_247() { if (jj_scan_token(MINUS)) return true; return false; } - private boolean jj_3R_236() { + private boolean jj_3R_239() { Token xsp; xsp = jj_scanpos; - if (jj_3R_244()) { + if (jj_3R_247()) { jj_scanpos = xsp; - if (jj_3R_245()) return true; + if (jj_3R_248()) return true; } return false; } @@ -5956,18 +5995,18 @@ LexicalUnitImpl result = null; private boolean jj_3_15() { Token xsp; xsp = jj_scanpos; - if (jj_3R_167()) jj_scanpos = xsp; - if (jj_3R_168()) return true; + if (jj_3R_168()) jj_scanpos = xsp; + if (jj_3R_169()) return true; return false; } private boolean jj_3_13() { - if (jj_3R_165()) return true; + if (jj_3R_166()) return true; return false; } - private boolean jj_3R_193() { - if (jj_3R_168()) return true; + private boolean jj_3R_195() { + if (jj_3R_169()) return true; Token xsp; while (true) { xsp = jj_scanpos; @@ -5976,17 +6015,17 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_241() { + private boolean jj_3R_244() { if (jj_scan_token(UNICODERANGE)) return true; return false; } - private boolean jj_3R_246() { - if (jj_3R_193()) return true; + private boolean jj_3R_249() { + if (jj_3R_195()) return true; return false; } - private boolean jj_3R_165() { + private boolean jj_3R_166() { if (jj_scan_token(VARIABLE)) return true; Token xsp; while (true) { @@ -6007,12 +6046,12 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_248() { + private boolean jj_3R_251() { if (jj_scan_token(INTERPOLATION)) return true; return false; } - private boolean jj_3R_220() { + private boolean jj_3R_222() { if (jj_scan_token(COMMA)) return true; Token xsp; while (true) { @@ -6022,7 +6061,7 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_237() { + private boolean jj_3R_240() { if (jj_scan_token(FUNCTION)) return true; Token xsp; while (true) { @@ -6030,17 +6069,17 @@ LexicalUnitImpl result = null; if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_246()) jj_scanpos = xsp; + if (jj_3R_249()) jj_scanpos = xsp; if (jj_scan_token(RPARAN)) return true; return false; } private boolean jj_3_10() { - if (jj_3R_161()) return true; + if (jj_3R_162()) return true; return false; } - private boolean jj_3R_219() { + private boolean jj_3R_221() { if (jj_scan_token(DIV)) return true; Token xsp; while (true) { @@ -6050,27 +6089,27 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_183() { + private boolean jj_3R_185() { Token xsp; xsp = jj_scanpos; - if (jj_3R_219()) { + if (jj_3R_221()) { jj_scanpos = xsp; - if (jj_3R_220()) return true; + if (jj_3R_222()) return true; } return false; } - private boolean jj_3R_192() { + private boolean jj_3R_194() { if (jj_scan_token(LBRACKET)) return true; return false; } - private boolean jj_3R_158() { - if (jj_3R_161()) return true; + private boolean jj_3R_159() { + if (jj_3R_162()) return true; return false; } - private boolean jj_3R_178() { + private boolean jj_3R_180() { if (jj_scan_token(IDENT)) return true; Token xsp; while (true) { @@ -6080,12 +6119,12 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_218() { - if (jj_3R_241()) return true; + private boolean jj_3R_220() { + if (jj_3R_244()) return true; return false; } - private boolean jj_3R_242() { + private boolean jj_3R_245() { if (jj_scan_token(VARIABLE)) return true; Token xsp; while (true) { @@ -6095,17 +6134,17 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_217() { - if (jj_3R_240()) return true; + private boolean jj_3R_219() { + if (jj_3R_243()) return true; return false; } private boolean jj_3_12() { - if (jj_3R_164()) return true; + if (jj_3R_165()) return true; return false; } - private boolean jj_3R_156() { + private boolean jj_3R_157() { Token xsp; xsp = jj_scanpos; if (jj_3_12()) { @@ -6118,116 +6157,112 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_216() { - if (jj_3R_239()) return true; + private boolean jj_3R_218() { + if (jj_3R_242()) return true; return false; } - private boolean jj_3R_235() { + private boolean jj_3R_238() { if (jj_scan_token(PARENT)) return true; return false; } - private boolean jj_3R_234() { + private boolean jj_3R_237() { if (jj_scan_token(ANY)) return true; return false; } - private boolean jj_3R_247() { + private boolean jj_3R_250() { if (jj_scan_token(IDENT)) return true; return false; } - private boolean jj_3R_243() { + private boolean jj_3R_246() { Token xsp; xsp = jj_scanpos; - if (jj_3R_247()) { + if (jj_3R_250()) { jj_scanpos = xsp; - if (jj_3R_248()) return true; + if (jj_3R_251()) return true; } return false; } - private boolean jj_3R_233() { + private boolean jj_3R_236() { Token xsp; - if (jj_3R_243()) return true; + if (jj_3R_246()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_243()) { jj_scanpos = xsp; break; } + if (jj_3R_246()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_188() { + private boolean jj_3R_190() { Token xsp; xsp = jj_scanpos; - if (jj_3R_233()) { + if (jj_3R_236()) { jj_scanpos = xsp; - if (jj_3R_234()) { + if (jj_3R_237()) { jj_scanpos = xsp; - if (jj_3R_235()) return true; + if (jj_3R_238()) return true; } } return false; } - private boolean jj_3R_230() { + private boolean jj_3R_232() { if (jj_scan_token(S)) return true; return false; } - private boolean jj_3R_229() { + private boolean jj_3R_231() { if (jj_scan_token(DOT)) return true; return false; } - private boolean jj_3R_157() { - if (jj_3R_169()) return true; + private boolean jj_3R_158() { + if (jj_3R_170()) return true; return false; } - private boolean jj_3R_228() { + private boolean jj_3R_230() { if (jj_scan_token(EQ)) return true; return false; } - private boolean jj_3R_227() { + private boolean jj_3R_229() { if (jj_scan_token(RPARAN)) return true; return false; } - private boolean jj_3R_226() { + private boolean jj_3R_228() { if (jj_scan_token(FUNCTION)) return true; return false; } - private boolean jj_3R_225() { + private boolean jj_3R_227() { if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_224() { + private boolean jj_3R_226() { if (jj_scan_token(INTERPOLATION)) return true; return false; } - private boolean jj_3R_223() { + private boolean jj_3R_225() { if (jj_scan_token(NUMBER)) return true; return false; } - private boolean jj_3R_222() { + private boolean jj_3R_224() { if (jj_scan_token(IDENT)) return true; return false; } - private boolean jj_3R_186() { + private boolean jj_3R_188() { Token xsp; xsp = jj_scanpos; - 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()) { @@ -6240,7 +6275,11 @@ LexicalUnitImpl result = null; jj_scanpos = xsp; if (jj_3R_229()) { jj_scanpos = xsp; - if (jj_3R_230()) return true; + if (jj_3R_230()) { + jj_scanpos = xsp; + if (jj_3R_231()) { + jj_scanpos = xsp; + if (jj_3R_232()) return true; } } } @@ -6255,19 +6294,19 @@ LexicalUnitImpl result = null; private boolean jj_3_3() { Token xsp; xsp = jj_scanpos; - if (jj_3R_157()) { + if (jj_3R_158()) { jj_scanpos = xsp; - if (jj_3R_158()) return true; + if (jj_3R_159()) return true; } return false; } - private boolean jj_3R_190() { + private boolean jj_3R_192() { if (jj_scan_token(DOT)) return true; return false; } - private boolean jj_3R_169() { + private boolean jj_3R_170() { if (jj_scan_token(MICROSOFT_RULE)) return true; Token xsp; while (true) { @@ -6275,15 +6314,15 @@ LexicalUnitImpl result = null; if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } if (jj_scan_token(COLON)) return true; - if (jj_3R_186()) return true; + if (jj_3R_188()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_186()) { jj_scanpos = xsp; break; } + if (jj_3R_188()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_162() { + private boolean jj_3R_163() { if (jj_scan_token(COMMA)) return true; Token xsp; while (true) { @@ -6293,51 +6332,64 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_238() { + private boolean jj_3R_241() { if (jj_scan_token(DOT)) return true; return false; } - private boolean jj_3R_232() { + private boolean jj_3R_235() { + if (jj_scan_token(SIBLING)) return true; + return false; + } + + private boolean jj_3R_234() { if (jj_scan_token(PRECEDES)) return true; return false; } - private boolean jj_3R_215() { + private boolean jj_3R_217() { Token xsp; xsp = jj_scanpos; - if (jj_3R_238()) jj_scanpos = xsp; + if (jj_3R_241()) jj_scanpos = xsp; if (jj_scan_token(IDENT)) return true; return false; } - private boolean jj_3R_231() { + private boolean jj_3R_233() { if (jj_scan_token(PLUS)) return true; return false; } - private boolean jj_3R_187() { + private boolean jj_3_8() { + if (jj_3R_162()) return true; + return false; + } + + private boolean jj_3R_189() { Token xsp; xsp = jj_scanpos; - if (jj_3R_231()) { + if (jj_3R_233()) { jj_scanpos = xsp; - if (jj_3R_232()) return true; + if (jj_3R_234()) { + jj_scanpos = xsp; + if (jj_3R_235()) return true; + } } return false; } - private boolean jj_3_8() { - if (jj_3R_161()) return true; + private boolean jj_3R_216() { + if (jj_scan_token(STRING)) return true; return false; } - private boolean jj_3R_214() { - if (jj_scan_token(STRING)) return true; + private boolean jj_3R_215() { + if (jj_3R_240()) return true; return false; } - private boolean jj_3R_171() { - if (jj_scan_token(PRECEDES)) return true; + private boolean jj_3R_173() { + if (jj_scan_token(SIBLING)) return true; Token xsp; while (true) { xsp = jj_scanpos; @@ -6346,23 +6398,28 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_213() { - if (jj_3R_237()) return true; + private boolean jj_3R_172() { + if (jj_scan_token(PRECEDES)) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(1)) { jj_scanpos = xsp; break; } + } return false; } - private boolean jj_3R_182() { + private boolean jj_3R_184() { Token xsp; xsp = jj_scanpos; - if (jj_3R_214()) { - jj_scanpos = xsp; - if (jj_3R_215()) { - jj_scanpos = xsp; if (jj_3R_216()) { jj_scanpos = xsp; if (jj_3R_217()) { jj_scanpos = xsp; - if (jj_3R_218()) return true; + if (jj_3R_218()) { + jj_scanpos = xsp; + if (jj_3R_219()) { + jj_scanpos = xsp; + if (jj_3R_220()) return true; } } } @@ -6370,15 +6427,23 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_172() { + private boolean jj_3_11() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_163()) jj_scanpos = xsp; + if (jj_3R_164()) return true; + return false; + } + + private boolean jj_3R_174() { if (jj_scan_token(S)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_187()) jj_scanpos = xsp; + if (jj_3R_189()) jj_scanpos = xsp; return false; } - private boolean jj_3R_170() { + private boolean jj_3R_171() { if (jj_scan_token(PLUS)) return true; Token xsp; while (true) { @@ -6388,109 +6453,104 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_159() { + private boolean jj_3R_160() { Token xsp; xsp = jj_scanpos; - if (jj_3R_170()) { - jj_scanpos = xsp; if (jj_3R_171()) { jj_scanpos = xsp; - if (jj_3R_172()) return true; + if (jj_3R_172()) { + jj_scanpos = xsp; + if (jj_3R_173()) { + jj_scanpos = xsp; + if (jj_3R_174()) return true; + } } } return false; } - private boolean jj_3_11() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_162()) jj_scanpos = xsp; - if (jj_3R_163()) return true; - return false; - } - - private boolean jj_3R_212() { + private boolean jj_3R_214() { if (jj_scan_token(DIMEN)) return true; return false; } - private boolean jj_3R_211() { + private boolean jj_3R_213() { if (jj_scan_token(KHZ)) return true; return false; } - private boolean jj_3R_210() { + private boolean jj_3R_212() { if (jj_scan_token(HZ)) return true; return false; } - private boolean jj_3R_209() { + private boolean jj_3R_211() { if (jj_scan_token(MS)) return true; return false; } - private boolean jj_3R_177() { - if (jj_3R_192()) return true; + private boolean jj_3R_179() { + if (jj_3R_194()) return true; return false; } - private boolean jj_3R_208() { + private boolean jj_3R_210() { if (jj_scan_token(SECOND)) return true; return false; } - private boolean jj_3R_176() { - if (jj_3R_191()) return true; + private boolean jj_3R_178() { + if (jj_3R_193()) return true; return false; } - private boolean jj_3R_175() { - if (jj_3R_190()) return true; + private boolean jj_3R_177() { + if (jj_3R_192()) return true; return false; } - private boolean jj_3R_207() { + private boolean jj_3R_209() { if (jj_scan_token(GRAD)) return true; return false; } - private boolean jj_3R_174() { - if (jj_3R_189()) return true; + private boolean jj_3R_176() { + if (jj_3R_191()) return true; return false; } private boolean jj_3_9() { - if (jj_3R_156()) return true; + if (jj_3R_157()) return true; return false; } - private boolean jj_3R_206() { + private boolean jj_3R_208() { if (jj_scan_token(RAD)) return true; return false; } - private boolean jj_3R_205() { + private boolean jj_3R_207() { if (jj_scan_token(DEG)) return true; return false; } - private boolean jj_3R_173() { - if (jj_3R_188()) return true; + private boolean jj_3R_175() { + if (jj_3R_190()) return true; return false; } - private boolean jj_3R_160() { + private boolean jj_3R_161() { Token xsp; xsp = jj_scanpos; - if (jj_3R_173()) { - jj_scanpos = xsp; - if (jj_3R_174()) { - jj_scanpos = xsp; if (jj_3R_175()) { jj_scanpos = xsp; if (jj_3R_176()) { jj_scanpos = xsp; - if (jj_3R_177()) return true; + if (jj_3R_177()) { + jj_scanpos = xsp; + if (jj_3R_178()) { + jj_scanpos = xsp; + if (jj_3R_179()) return true; } } } @@ -6498,21 +6558,26 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_189() { + private boolean jj_3R_191() { if (jj_scan_token(HASH)) return true; return false; } - private boolean jj_3R_204() { + private boolean jj_3R_206() { if (jj_scan_token(EXS)) return true; return false; } - private boolean jj_3R_203() { + private boolean jj_3R_205() { if (jj_scan_token(EMS)) return true; return false; } + private boolean jj_3R_204() { + if (jj_scan_token(PX)) return true; + return false; + } + /** Generated Token Manager. */ public ParserTokenManager token_source; /** Current token. */ @@ -6523,7 +6588,7 @@ LexicalUnitImpl result = null; private Token jj_scanpos, jj_lastpos; private int jj_la; private int jj_gen; - final private int[] jj_la1 = new int[236]; + final private int[] jj_la1 = new int[238]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -6535,16 +6600,16 @@ LexicalUnitImpl result = null; jj_la1_init_3(); } private static void jj_la1_init_0() { - jj_la1_0 = new int[] {0x0,0xc02,0xc02,0x0,0xc00,0x2,0x2,0x2,0x0,0xe8000000,0xc00,0x2,0xc00,0x2,0x0,0x2,0x0,0x2,0x2,0x2,0xe9f45400,0xe9f45400,0x2,0x400000,0x2,0x2,0x2,0x2,0x0,0x0,0x2,0x0,0x800000,0x2,0x0,0x2,0x2,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,0x1f45400,0x2,0x2,0x1100000,0x2,0x1100000,0x1100002,0x2,0x80080002,0x80080002,0x2,0x2,0x2,0x2,0x2,0xe8000000,0x0,0x0,0x0,0xe8000000,0x2,0x400000,0x2,0x2,0x88000000,0x88000000,0x88000000,0x88000000,0x88000000,0x88000000,0x88000000,0x88000000,0x88000000,0x88000000,0xe8000000,0x0,0x0,0x0,0x0,0x60000000,0x2,0x2,0xfc000,0x2,0x0,0x2,0xfc000,0x0,0x2,0x2,0x0,0x2,0x0,0x2,0x800000,0x27380002,0x2,0xe8000000,0x0,0xe8000000,0x2,0x0,0x2,0x27380002,0x0,0x2,0xe8000000,0x0,0xe8000000,0x2,0x27380002,0x2,0x2,0x2,0x0,0x2,0xe8000000,0x0,0x0,0xe8000000,0x2,0x2,0x400000,0x2,0x2,0x2,0x2,0x0,0x2,0xe8000000,0x0,0x0,0xe8000000,0x2,0x400000,0x2,0x2,0x2,0x400000,0x0,0x0,0x80300000,0x2,0x0,0x400000,0x2,0x80300000,0x2,0x0,0x2,0x0,0x2,0x800000,0x2,0x2,0x2,0x0,0x2,0x2,0x2,0x400000,0x2,0x2,0x2,0x2,0x2,0x0,0x2,0x2,0x2,0x400000,0x2,0x2,0x2,0x2,0x2,0x0,0x2,0x2,0x2,0x400000,0x2,0x2,0x0,0x2,0x2,0x2,0x800000,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,0x2,0x0,0x2,0x0,0x800000,0x2,0x0,0x2,0x80301000,0x2,0x0,0x2,0x2,0x2,0x2,0x4400000,0x4400000,0x300000,0x80300000,0x300000,0x0,0x80000000,0x80000000,0x80300000,0x2,0x2,0x80300000,0x2,0xe8000000,0x2,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,}; + jj_la1_0 = new int[] {0x0,0xc02,0xc02,0x0,0xc00,0x2,0x2,0x2,0x0,0xd0000000,0xc00,0x2,0xc00,0x2,0x0,0x2,0x0,0x2,0x2,0x2,0xd3f45400,0xd3f45400,0x2,0x400000,0x2,0x2,0x2,0x2,0x0,0x0,0x2,0x0,0x800000,0x2,0x0,0x2,0x2,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,0x3f45400,0x2,0x2,0x2,0x3100000,0x2,0x3100000,0x3100002,0x2,0x80002,0x80002,0x2,0x2,0x2,0x2,0x2,0xd0000000,0x0,0x0,0x0,0xd0000000,0x2,0x400000,0x2,0x2,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0xd0000000,0x0,0x0,0x0,0x0,0xc0000000,0x2,0x2,0xfc000,0x2,0x0,0x2,0xfc000,0x0,0x2,0xd0000000,0x2,0x0,0x2,0x0,0x2,0x800000,0x4d380002,0x2,0xd0000000,0x0,0xd0000000,0x2,0x0,0x2,0x4d380002,0x0,0x2,0xd0000000,0x0,0xd0000000,0x2,0x4d380002,0x2,0x2,0x2,0x0,0x2,0xd0000000,0x0,0x0,0xd0000000,0x2,0x2,0x400000,0x2,0x2,0x2,0x2,0x0,0x2,0xd0000000,0x0,0x0,0xd0000000,0x2,0x400000,0x2,0x2,0x2,0x400000,0x0,0x0,0x300000,0x2,0x0,0x400000,0x2,0x300000,0x2,0x0,0x2,0x0,0x2,0x800000,0x2,0x2,0x2,0x0,0x2,0x2,0x2,0x400000,0x2,0x2,0x2,0x2,0x2,0x0,0x2,0x2,0x2,0x400000,0x2,0x2,0x2,0x2,0x2,0x0,0x2,0x2,0x2,0x400000,0x2,0x2,0x0,0x2,0x2,0x2,0x800000,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,0x2,0x0,0x2,0x0,0x800000,0x2,0x0,0x2,0x301000,0x2,0x0,0x2,0x2,0x2,0x2,0x8400000,0x8400000,0x300000,0x300000,0x300000,0x0,0x0,0x0,0x300000,0x2,0x2,0x300000,0x2,0xd0000000,0x2,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,}; } private static void jj_la1_init_1() { - jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x283000c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc2,0xc2,0x0,0x0,0x0,0x0,0x0,0xa82000c0,0x0,0x20000000,0x88200000,0xc0,0x0,0x0,0x0,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,0x0,0x3f,0x0,0x802000c0,0x80200000,0xc0,0x0,0x40000000,0x0,0x3f,0x0,0x0,0x802000c0,0x80200000,0xc0,0x0,0x3f,0x0,0x0,0x0,0x0,0x0,0x802000c0,0x200000,0x80000000,0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x882000c0,0x200000,0x88000000,0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x40,0x40,0x0,0x40,0x0,0x0,0x40,0x0,0x40,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x60000,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,0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x50600181,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x381,0x381,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x185,0x185,0x0,0x0,0x0,0x0,0x0,0x50400181,0x0,0x40000000,0x10400000,0x181,0x0,0x0,0x0,0x0,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x181,0x100,0x100,0x100,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x181,0x0,0x0,0x0,0x0,0x0,0x0,0x7e,0x0,0x400181,0x400000,0x181,0x0,0x80000000,0x0,0x7e,0x0,0x0,0x400181,0x400000,0x181,0x0,0x7e,0x0,0x0,0x0,0x0,0x0,0x400181,0x400000,0x0,0x181,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10400181,0x400000,0x10000000,0x181,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x80,0x81,0x0,0x80,0x0,0x0,0x81,0x0,0x80,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0xc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x1,0x1,0x0,0x0,0x1,0x0,0x181,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; } private static void jj_la1_init_2() { - jj_la1_2 = new int[] {0x80000000,0x0,0x0,0x20000000,0x0,0x0,0x0,0x0,0x400,0x50000440,0x0,0x0,0x0,0x0,0x220,0x0,0x40,0x0,0x0,0x0,0xf0000ae0,0xf0000ae0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x40,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x40,0x0,0xe0000aa0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc0,0xc0,0x0,0x0,0x0,0x0,0x0,0x50000444,0x44,0x0,0x40000400,0x10000040,0x0,0x0,0x0,0x0,0x10000000,0x10000000,0x0,0x0,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000040,0x40,0x40,0x40,0x40,0x40,0x0,0x0,0x0,0x0,0x60,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x10,0x0,0x0,0x4c0,0x0,0x50000440,0x40000400,0x10000040,0x0,0x0,0x0,0x4c0,0x8,0x0,0x50000440,0x40000400,0x10000040,0x0,0x4c0,0x0,0x0,0x0,0x440,0x0,0x50000440,0x0,0x40000400,0x10000040,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x50000440,0x40000000,0x400,0x10000040,0x0,0x0,0x0,0x0,0x0,0x0,0x400,0x400,0x1ffffee0,0x0,0x0,0x0,0x0,0x1ffffee0,0x0,0x0,0x0,0x440,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,0x40,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x40,0x0,0x1ffffee0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1ffffee0,0x0,0xffff880,0x0,0x10000260,0x1ffffae0,0x0,0x0,0x1ffffee0,0x0,0x70000040,0x0,0x0,0x0,0x40,0x0,0x0,0x40,0x0,}; + jj_la1_2 = new int[] {0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x800,0xa0000880,0x0,0x0,0x0,0x0,0x440,0x0,0x80,0x0,0x0,0x0,0xe00015c0,0xe00015c0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0xc0001540,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x180,0x0,0x0,0x0,0x0,0x0,0xa0000889,0x88,0x0,0x80000801,0x20000080,0x0,0x0,0x0,0x0,0x20000000,0x20000000,0x0,0x0,0x20000000,0x20000000,0x20000000,0x20000000,0x20000000,0x20000000,0x20000080,0x80,0x80,0x80,0x80,0x80,0x0,0x0,0x0,0x0,0xc0,0x0,0x0,0x0,0x0,0x20000180,0x0,0x80,0x0,0x20,0x0,0x0,0x980,0x0,0xa0000881,0x80000801,0x20000080,0x0,0x0,0x0,0x980,0x10,0x0,0xa0000881,0x80000801,0x20000080,0x0,0x980,0x0,0x0,0x0,0x880,0x0,0xa0000881,0x0,0x80000801,0x20000080,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0xa0000881,0x80000000,0x801,0x20000080,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x800,0x3ffffdc0,0x0,0x0,0x0,0x0,0x3ffffdc0,0x0,0x0,0x0,0x880,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,0x80,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x3ffffdc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3ffffdc0,0x0,0x1ffff100,0x0,0x200004c0,0x3ffff5c0,0x0,0x0,0x3ffffdc0,0x0,0xe0000080,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,}; } private static void jj_la1_init_3() { - jj_la1_3 = new int[] {0x0,0x4,0x4,0x0,0x4,0x0,0x0,0x0,0x0,0x3,0x4,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6200f,0x6200f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6200f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x20000,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,0x20000,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,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x22000,0x0,0x0,0x0,0x0,0x22000,0x0,0x0,0x0,0x20000,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,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x22000,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x22000,0x0,0x20000,0x0,0x2000,0x22000,0x0,0x0,0x22000,0x0,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_3 = new int[] {0x1,0x8,0x8,0x0,0x8,0x0,0x0,0x0,0x0,0x6,0x8,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc401f,0xc401f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc401f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x40000,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,0x40000,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,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x44000,0x0,0x0,0x0,0x0,0x44000,0x0,0x0,0x0,0x40000,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,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x44000,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x44000,0x0,0x40000,0x0,0x4000,0x44000,0x0,0x0,0x44000,0x0,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; } final private JJCalls[] jj_2_rtns = new JJCalls[15]; private boolean jj_rescan = false; @@ -6556,7 +6621,7 @@ LexicalUnitImpl result = null; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 236; i++) jj_la1[i] = -1; + for (int i = 0; i < 238; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6566,7 +6631,7 @@ LexicalUnitImpl result = null; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 236; i++) jj_la1[i] = -1; + for (int i = 0; i < 238; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6576,7 +6641,7 @@ LexicalUnitImpl result = null; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 236; i++) jj_la1[i] = -1; + for (int i = 0; i < 238; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6586,7 +6651,7 @@ LexicalUnitImpl result = null; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 236; i++) jj_la1[i] = -1; + for (int i = 0; i < 238; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -6698,12 +6763,12 @@ LexicalUnitImpl result = null; /** Generate ParseException. */ public ParseException generateParseException() { jj_expentries.clear(); - boolean[] la1tokens = new boolean[115]; + boolean[] la1tokens = new boolean[116]; if (jj_kind >= 0) { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 236; i++) { + for (int i = 0; i < 238; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1<<j)) != 0) { @@ -6721,7 +6786,7 @@ LexicalUnitImpl result = null; } } } - for (int i = 0; i < 115; i++) { + for (int i = 0; i < 116; i++) { if (la1tokens[i]) { jj_expentry = new int[1]; jj_expentry[0] = i; diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj index 2a8dde2ef6..47ffc4b6b9 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj @@ -501,6 +501,7 @@ TOKEN : | < COMMA : "," > | < SEMICOLON : ";" > | < PRECEDES : ">" > + | < SIBLING : "~" > | < SUCCEEDS : "<" > | < DIV : "/" > | < LBRACKET : "[" > @@ -964,6 +965,7 @@ void skipUnknownRule() : | n=";" | n="+" | n=">" +| n="~" | n="-" | n=<UNKNOWN> ) { @@ -987,8 +989,10 @@ char connector = ' '; { "+" ( <S> )* { return '+'; } | ">" ( <S> )* { return '>'; } + | "~" ( <S> )* { return '~'; } | <S> ( ( "+" { connector = '+'; } - | ">" { connector = '>'; } ) + | ">" { connector = '>'; } + | "~" { connector = '~'; } ) ( <S> )* )? { return connector; } } @@ -1167,10 +1171,9 @@ String simple_selector(String selector, char comb) : selector = selector + comb + simple_current; break; case '+': - selector = selector + " " + comb + " " + simple_current; - break; case '>': - selector = selector + " " + comb + " " + simple_current; + case '~': + selector = selector + " " + comb + " " + simple_current; break; default: throw new ParseException("invalid state. send a bug report"); @@ -1286,7 +1289,8 @@ String attrib(String pred) : */ String pseudo(String pred) : {Token n; -Token language; +Token param; +String d; boolean isPseudoElement = false; } { @@ -1310,21 +1314,21 @@ boolean isPseudoElement = false; } } } - | ( n=<FUNCTION> ( <S> )* language=<IDENT> ( <S> )* ")" - { - String f = convertIdent(n.image); - if (f.equals("lang(")) { - String d = convertIdent(language.image); + | ( n=<FUNCTION> ( <S> )* ( + param=<IDENT> { d = convertIdent(param.image); } + | param=<NUMBER> { d = param.image; } + | d=simple_selector(null, ' ') + ) ( <S> )* ")" + { + String f = convertIdent(n.image); + String colons = isPseudoElement ? "::" : ":"; + String pseudofn = colons + f + d + ")"; if (pred == null) { - return d; + return pseudofn; } else { - return pred + d; - } - } else { - throw new CSSParseException("invalid pseudo function name " - + f, getLocator()); - } - } + return pred + pseudofn; + } + } ) ) } diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/ParserConstants.java b/theme-compiler/src/com/vaadin/sass/internal/parser/ParserConstants.java index 22b7dbbb0f..4a04851a5d 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/ParserConstants.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/ParserConstants.java @@ -47,185 +47,187 @@ public interface ParserConstants { /** RegularExpression Id. */ int PRECEDES = 24; /** RegularExpression Id. */ - int SUCCEEDS = 25; + int SIBLING = 25; /** RegularExpression Id. */ - int DIV = 26; + int SUCCEEDS = 26; /** RegularExpression Id. */ - int LBRACKET = 27; + int DIV = 27; /** RegularExpression Id. */ - int RBRACKET = 28; + int LBRACKET = 28; /** RegularExpression Id. */ - int ANY = 29; + int RBRACKET = 29; /** RegularExpression Id. */ - int PARENT = 30; + int ANY = 30; /** RegularExpression Id. */ - int DOT = 31; + int PARENT = 31; /** RegularExpression Id. */ - int LPARAN = 32; + int DOT = 32; /** RegularExpression Id. */ - int RPARAN = 33; + int LPARAN = 33; /** RegularExpression Id. */ - int COMPARE = 34; + int RPARAN = 34; /** RegularExpression Id. */ - int OR = 35; + int COMPARE = 35; /** RegularExpression Id. */ - int AND = 36; + int OR = 36; /** RegularExpression Id. */ - int NOT_EQ = 37; + int AND = 37; /** RegularExpression Id. */ - int COLON = 38; + int NOT_EQ = 38; /** RegularExpression Id. */ - int INTERPOLATION = 39; + int COLON = 39; /** RegularExpression Id. */ - int NONASCII = 40; + int INTERPOLATION = 40; /** RegularExpression Id. */ - int H = 41; + int NONASCII = 41; /** RegularExpression Id. */ - int UNICODE = 42; + int H = 42; /** RegularExpression Id. */ - int ESCAPE = 43; + int UNICODE = 43; /** RegularExpression Id. */ - int NMSTART = 44; + int ESCAPE = 44; /** RegularExpression Id. */ - int NMCHAR = 45; + int NMSTART = 45; /** RegularExpression Id. */ - int STRINGCHAR = 46; + int NMCHAR = 46; /** RegularExpression Id. */ - int D = 47; + int STRINGCHAR = 47; /** RegularExpression Id. */ - int NAME = 48; + int D = 48; /** RegularExpression Id. */ - int TO = 49; + int NAME = 49; /** RegularExpression Id. */ - int THROUGH = 50; + int TO = 50; /** RegularExpression Id. */ - int EACH_IN = 51; + int THROUGH = 51; /** RegularExpression Id. */ - int MIXIN_SYM = 52; + int EACH_IN = 52; /** RegularExpression Id. */ - int INCLUDE_SYM = 53; + int MIXIN_SYM = 53; /** RegularExpression Id. */ - int FUNCTION_SYM = 54; + int INCLUDE_SYM = 54; /** RegularExpression Id. */ - int RETURN_SYM = 55; + int FUNCTION_SYM = 55; /** RegularExpression Id. */ - int DEBUG_SYM = 56; + int RETURN_SYM = 56; /** RegularExpression Id. */ - int WARN_SYM = 57; + int DEBUG_SYM = 57; /** RegularExpression Id. */ - int FOR_SYM = 58; + int WARN_SYM = 58; /** RegularExpression Id. */ - int EACH_SYM = 59; + int FOR_SYM = 59; /** RegularExpression Id. */ - int WHILE_SYM = 60; + int EACH_SYM = 60; /** RegularExpression Id. */ - int IF_SYM = 61; + int WHILE_SYM = 61; /** RegularExpression Id. */ - int ELSE_SYM = 62; + int IF_SYM = 62; /** RegularExpression Id. */ - int EXTEND_SYM = 63; + int ELSE_SYM = 63; /** RegularExpression Id. */ - int MOZ_DOCUMENT_SYM = 64; + int EXTEND_SYM = 64; /** RegularExpression Id. */ - int SUPPORTS_SYM = 65; + int MOZ_DOCUMENT_SYM = 65; /** RegularExpression Id. */ - int MICROSOFT_RULE = 66; + int SUPPORTS_SYM = 66; /** RegularExpression Id. */ - int IF = 67; + int MICROSOFT_RULE = 67; /** RegularExpression Id. */ - int GUARDED_SYM = 68; + int IF = 68; /** RegularExpression Id. */ - int STRING = 69; + int GUARDED_SYM = 69; /** RegularExpression Id. */ - int IDENT = 70; + int STRING = 70; /** RegularExpression Id. */ - int NUMBER = 71; + int IDENT = 71; /** RegularExpression Id. */ - int _URL = 72; + int NUMBER = 72; /** RegularExpression Id. */ - int URL = 73; + int _URL = 73; /** RegularExpression Id. */ - int VARIABLE = 74; + int URL = 74; /** RegularExpression Id. */ - int PERCENTAGE = 75; + int VARIABLE = 75; /** RegularExpression Id. */ - int PT = 76; + int PERCENTAGE = 76; /** RegularExpression Id. */ - int MM = 77; + int PT = 77; /** RegularExpression Id. */ - int CM = 78; + int MM = 78; /** RegularExpression Id. */ - int PC = 79; + int CM = 79; /** RegularExpression Id. */ - int IN = 80; + int PC = 80; /** RegularExpression Id. */ - int PX = 81; + int IN = 81; /** RegularExpression Id. */ - int EMS = 82; + int PX = 82; /** RegularExpression Id. */ - int EXS = 83; + int EMS = 83; /** RegularExpression Id. */ - int DEG = 84; + int EXS = 84; /** RegularExpression Id. */ - int RAD = 85; + int DEG = 85; /** RegularExpression Id. */ - int GRAD = 86; + int RAD = 86; /** RegularExpression Id. */ - int MS = 87; + int GRAD = 87; /** RegularExpression Id. */ - int SECOND = 88; + int MS = 88; /** RegularExpression Id. */ - int HZ = 89; + int SECOND = 89; /** RegularExpression Id. */ - int KHZ = 90; + int HZ = 90; /** RegularExpression Id. */ - int DIMEN = 91; + int KHZ = 91; /** RegularExpression Id. */ - int HASH = 92; + int DIMEN = 92; /** RegularExpression Id. */ - int IMPORT_SYM = 93; + int HASH = 93; /** RegularExpression Id. */ - int MEDIA_SYM = 94; + int IMPORT_SYM = 94; /** RegularExpression Id. */ - int CHARSET_SYM = 95; + int MEDIA_SYM = 95; /** RegularExpression Id. */ - int PAGE_SYM = 96; + int CHARSET_SYM = 96; /** RegularExpression Id. */ - int FONT_FACE_SYM = 97; + int PAGE_SYM = 97; /** RegularExpression Id. */ - int ATKEYWORD = 98; + int FONT_FACE_SYM = 98; /** RegularExpression Id. */ - int IMPORTANT_SYM = 99; + int ATKEYWORD = 99; /** RegularExpression Id. */ - int RANGE0 = 100; + int IMPORTANT_SYM = 100; /** RegularExpression Id. */ - int RANGE1 = 101; + int RANGE0 = 101; /** RegularExpression Id. */ - int RANGE2 = 102; + int RANGE1 = 102; /** RegularExpression Id. */ - int RANGE3 = 103; + int RANGE2 = 103; /** RegularExpression Id. */ - int RANGE4 = 104; + int RANGE3 = 104; /** RegularExpression Id. */ - int RANGE5 = 105; + int RANGE4 = 105; /** RegularExpression Id. */ - int RANGE6 = 106; + int RANGE5 = 106; /** RegularExpression Id. */ - int RANGE = 107; + int RANGE6 = 107; /** RegularExpression Id. */ - int UNI = 108; + int RANGE = 108; /** RegularExpression Id. */ - int UNICODERANGE = 109; + int UNI = 109; /** RegularExpression Id. */ - int REMOVE = 110; + int UNICODERANGE = 110; /** RegularExpression Id. */ - int APPEND = 111; + int REMOVE = 111; /** RegularExpression Id. */ - int CONTAINS = 112; + int APPEND = 112; /** RegularExpression Id. */ - int FUNCTION = 113; + int CONTAINS = 113; /** RegularExpression Id. */ - int UNKNOWN = 114; + int FUNCTION = 114; + /** RegularExpression Id. */ + int UNKNOWN = 115; /** Lexical state. */ int DEFAULT = 0; @@ -263,6 +265,7 @@ public interface ParserConstants { "\",\"", "\";\"", "\">\"", + "\"~\"", "\"<\"", "\"/\"", "\"[\"", diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java b/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java index 6715e3beda..57b6745996 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java @@ -37,170 +37,170 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1) switch (pos) { case 0: - if ((active0 & 0xfff0000000000000L) != 0L || (active1 & 0x3e0000003L) != 0L) + if ((active0 & 0xffe0000000000000L) != 0L || (active1 & 0x7c0000007L) != 0L) return 111; if ((active0 & 0x10000L) != 0L) return 79; - if ((active0 & 0xe000000000000L) != 0L || (active1 & 0x8L) != 0L) - { - jjmatchedKind = 70; + if ((active0 & 0x100000000L) != 0L) return 441; - } - if ((active0 & 0x80000000L) != 0L) + if ((active0 & 0x4000000000L) != 0L) return 442; - if ((active0 & 0x2000000000L) != 0L) + if ((active0 & 0x1c000000000000L) != 0L || (active1 & 0x10L) != 0L) + { + jjmatchedKind = 71; return 443; - if ((active0 & 0x4000044L) != 0L) + } + if ((active0 & 0x8000044L) != 0L) return 3; if ((active0 & 0x200800L) != 0L) return 42; return -1; case 1: - if ((active0 & 0x4000000000000L) != 0L) + if ((active0 & 0xffe0000000000000L) != 0L || (active1 & 0x7c0000005L) != 0L) { - jjmatchedKind = 70; + jjmatchedKind = 99; jjmatchedPos = 1; - return 441; + return 444; } - if ((active1 & 0x1L) != 0L) - return 112; - if ((active0 & 0xa000000000000L) != 0L || (active1 & 0x8L) != 0L) - return 441; - if ((active0 & 0xfff0000000000000L) != 0L || (active1 & 0x3e0000002L) != 0L) + if ((active0 & 0x8000000000000L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 71; jjmatchedPos = 1; - return 444; + return 443; } + if ((active1 & 0x2L) != 0L) + return 112; + if ((active0 & 0x14000000000000L) != 0L || (active1 & 0x10L) != 0L) + return 443; if ((active0 & 0x40L) != 0L) return 1; return -1; case 2: - if ((active0 & 0xdff0000000000000L) != 0L || (active1 & 0x3e0000003L) != 0L) + if ((active0 & 0x4000000000000000L) != 0L) + return 444; + if ((active0 & 0x8000000000000L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 71; jjmatchedPos = 2; - return 444; + return 443; } - if ((active0 & 0x2000000000000000L) != 0L) - return 444; - if ((active0 & 0x4000000000000L) != 0L) + if ((active0 & 0xbfe0000000000000L) != 0L || (active1 & 0x7c0000007L) != 0L) { - jjmatchedKind = 70; + jjmatchedKind = 99; jjmatchedPos = 2; - return 441; + return 444; } return -1; case 3: - if ((active0 & 0x4000000000000L) != 0L) + if ((active0 & 0x8000000000000L) != 0L) { - jjmatchedKind = 70; + jjmatchedKind = 71; jjmatchedPos = 3; - return 441; + return 443; } - if ((active0 & 0xdbf0000000000000L) != 0L || (active1 & 0x3e0000003L) != 0L) + if ((active0 & 0x800000000000000L) != 0L) + return 444; + if ((active0 & 0xb7e0000000000000L) != 0L || (active1 & 0x7c0000007L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 99; jjmatchedPos = 3; return 444; } - if ((active0 & 0x400000000000000L) != 0L) - return 444; return -1; case 4: - if ((active0 & 0x91f0000000000000L) != 0L || (active1 & 0x2e0000003L) != 0L) + if ((active0 & 0x9400000000000000L) != 0L || (active1 & 0x200000000L) != 0L) + return 444; + if ((active0 & 0x23e0000000000000L) != 0L || (active1 & 0x5c0000007L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 99; jjmatchedPos = 4; return 444; } - if ((active0 & 0x4a00000000000000L) != 0L || (active1 & 0x100000000L) != 0L) - return 444; - if ((active0 & 0x4000000000000L) != 0L) + if ((active0 & 0x8000000000000L) != 0L) { - jjmatchedKind = 70; + jjmatchedKind = 71; jjmatchedPos = 4; - return 441; + return 443; } return -1; case 5: - if ((active0 & 0x1110000000000000L) != 0L || (active1 & 0x40000000L) != 0L) - return 444; - if ((active0 & 0x80e0000000000000L) != 0L || (active1 & 0x2a0000003L) != 0L) + if ((active0 & 0x8000000000000L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 71; jjmatchedPos = 5; - return 444; + return 443; } - if ((active0 & 0x4000000000000L) != 0L) + if ((active0 & 0x1c0000000000000L) != 0L || (active1 & 0x540000007L) != 0L) { - jjmatchedKind = 70; + jjmatchedKind = 99; jjmatchedPos = 5; - return 441; + return 444; } + if ((active0 & 0x2220000000000000L) != 0L || (active1 & 0x80000000L) != 0L) + return 444; return -1; case 6: - if ((active0 & 0x4000000000000L) != 0L) - return 441; - if ((active0 & 0x8080000000000000L) != 0L || (active1 & 0x20000000L) != 0L) - return 444; - if ((active0 & 0x60000000000000L) != 0L || (active1 & 0x280000003L) != 0L) + if ((active0 & 0xc0000000000000L) != 0L || (active1 & 0x500000006L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 99; jjmatchedPos = 6; return 444; } + if ((active0 & 0x8000000000000L) != 0L) + return 443; + if ((active0 & 0x100000000000000L) != 0L || (active1 & 0x40000001L) != 0L) + return 444; return -1; case 7: - if ((active0 & 0x20000000000000L) != 0L || (active1 & 0x80000000L) != 0L) - return 444; - if ((active0 & 0x40000000000000L) != 0L || (active1 & 0x200000003L) != 0L) + if ((active0 & 0x80000000000000L) != 0L || (active1 & 0x400000006L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 99; jjmatchedPos = 7; return 444; } + if ((active0 & 0x40000000000000L) != 0L || (active1 & 0x100000000L) != 0L) + return 444; return -1; case 8: - if ((active1 & 0x200000001L) != 0L) + if ((active0 & 0x80000000000000L) != 0L || (active1 & 0x4L) != 0L) + return 444; + if ((active1 & 0x400000002L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 99; jjmatchedPos = 8; return 444; } - if ((active0 & 0x40000000000000L) != 0L || (active1 & 0x2L) != 0L) - return 444; return -1; case 9: - if ((active1 & 0x1L) != 0L) + if ((active1 & 0x400000000L) != 0L) + return 444; + if ((active1 & 0x2L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 99; jjmatchedPos = 9; return 444; } - if ((active1 & 0x200000000L) != 0L) - return 444; return -1; case 10: - if ((active1 & 0x1L) != 0L) + if ((active1 & 0x2L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 99; jjmatchedPos = 10; return 444; } return -1; case 11: - if ((active1 & 0x1L) != 0L) + if ((active1 & 0x2L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 99; jjmatchedPos = 11; return 444; } return -1; case 12: - if ((active1 & 0x1L) != 0L) + if ((active1 & 0x2L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 99; jjmatchedPos = 12; return 444; } @@ -224,18 +224,18 @@ private int jjMoveStringLiteralDfa0_0() switch(curChar) { case 33: - return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L); case 36: return jjMoveStringLiteralDfa1_0(0x10000L, 0x0L); case 38: - jjmatchedKind = 30; - return jjMoveStringLiteralDfa1_0(0x1000000000L, 0x0L); + jjmatchedKind = 31; + return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x0L); case 40: - return jjStopAtPos(0, 32); - case 41: return jjStopAtPos(0, 33); + case 41: + return jjStopAtPos(0, 34); case 42: - jjmatchedKind = 29; + jjmatchedKind = 30; return jjMoveStringLiteralDfa1_0(0x20000L, 0x0L); case 43: return jjStopAtPos(0, 20); @@ -245,43 +245,44 @@ private int jjMoveStringLiteralDfa0_0() jjmatchedKind = 21; return jjMoveStringLiteralDfa1_0(0x800L, 0x0L); case 46: - return jjStartNfaWithStates_0(0, 31, 442); + return jjStartNfaWithStates_0(0, 32, 441); case 47: - jjmatchedKind = 26; + jjmatchedKind = 27; return jjMoveStringLiteralDfa1_0(0x44L, 0x0L); case 58: - return jjStopAtPos(0, 38); + return jjStopAtPos(0, 39); case 59: return jjStopAtPos(0, 23); case 60: - jjmatchedKind = 25; + jjmatchedKind = 26; return jjMoveStringLiteralDfa1_0(0x400L, 0x0L); case 61: jjmatchedKind = 19; - return jjMoveStringLiteralDfa1_0(0x400000000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x800000000L, 0x0L); case 62: return jjStopAtPos(0, 24); case 64: - return jjMoveStringLiteralDfa1_0(0xfff0000000000000L, 0x3e0000003L); + return jjMoveStringLiteralDfa1_0(0xffe0000000000000L, 0x7c0000007L); case 91: - return jjStopAtPos(0, 27); - case 93: return jjStopAtPos(0, 28); + case 93: + return jjStopAtPos(0, 29); case 94: return jjMoveStringLiteralDfa1_0(0x8000L, 0x0L); case 73: case 105: - return jjMoveStringLiteralDfa1_0(0x8000000000000L, 0x8L); + return jjMoveStringLiteralDfa1_0(0x10000000000000L, 0x10L); case 84: case 116: - return jjMoveStringLiteralDfa1_0(0x6000000000000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0xc000000000000L, 0x0L); case 123: return jjStopAtPos(0, 12); case 124: - return jjMoveStringLiteralDfa1_0(0x800004000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x1000004000L, 0x0L); case 125: return jjStopAtPos(0, 13); case 126: + jjmatchedKind = 25; return jjMoveStringLiteralDfa1_0(0x40000L, 0x0L); default : return jjMoveNfa_0(4, 0); @@ -299,15 +300,15 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1) case 33: return jjMoveStringLiteralDfa2_0(active0, 0x400L, active1, 0L); case 38: - if ((active0 & 0x1000000000L) != 0L) - return jjStopAtPos(1, 36); + if ((active0 & 0x2000000000L) != 0L) + return jjStopAtPos(1, 37); break; case 42: if ((active0 & 0x40L) != 0L) return jjStartNfaWithStates_0(1, 6, 1); break; case 45: - return jjMoveStringLiteralDfa2_0(active0, 0x800L, active1, 0x1L); + return jjMoveStringLiteralDfa2_0(active0, 0x800L, active1, 0x2L); case 47: if ((active0 & 0x4L) != 0L) return jjStopAtPos(1, 2); @@ -323,59 +324,59 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1) return jjStopAtPos(1, 17); else if ((active0 & 0x40000L) != 0L) return jjStopAtPos(1, 18); - else if ((active0 & 0x400000000L) != 0L) - return jjStopAtPos(1, 34); - else if ((active0 & 0x2000000000L) != 0L) - return jjStopAtPos(1, 37); + else if ((active0 & 0x800000000L) != 0L) + return jjStopAtPos(1, 35); + else if ((active0 & 0x4000000000L) != 0L) + return jjStopAtPos(1, 38); break; case 67: case 99: - return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80000000L); + return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x100000000L); case 68: case 100: - return jjMoveStringLiteralDfa2_0(active0, 0x100000000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0L); case 69: case 101: - return jjMoveStringLiteralDfa2_0(active0, 0xc800000000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x9000000000000000L, active1, 0x1L); case 70: case 102: - if ((active1 & 0x8L) != 0L) - return jjStartNfaWithStates_0(1, 67, 441); - return jjMoveStringLiteralDfa2_0(active0, 0x440000000000000L, active1, 0x200000000L); + if ((active1 & 0x10L) != 0L) + return jjStartNfaWithStates_0(1, 68, 443); + return jjMoveStringLiteralDfa2_0(active0, 0x880000000000000L, active1, 0x400000000L); case 72: case 104: - return jjMoveStringLiteralDfa2_0(active0, 0x4000000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x8000000000000L, active1, 0L); case 73: case 105: - return jjMoveStringLiteralDfa2_0(active0, 0x2020000000000000L, active1, 0x20000000L); + return jjMoveStringLiteralDfa2_0(active0, 0x4040000000000000L, active1, 0x40000000L); case 77: case 109: - return jjMoveStringLiteralDfa2_0(active0, 0x10000000000000L, active1, 0x40000000L); + return jjMoveStringLiteralDfa2_0(active0, 0x20000000000000L, active1, 0x80000000L); case 78: case 110: - if ((active0 & 0x8000000000000L) != 0L) - return jjStartNfaWithStates_0(1, 51, 441); + if ((active0 & 0x10000000000000L) != 0L) + return jjStartNfaWithStates_0(1, 52, 443); break; case 79: case 111: - if ((active0 & 0x2000000000000L) != 0L) - return jjStartNfaWithStates_0(1, 49, 441); + if ((active0 & 0x4000000000000L) != 0L) + return jjStartNfaWithStates_0(1, 50, 443); break; case 80: case 112: - return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x100000000L); + return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x200000000L); case 82: case 114: - return jjMoveStringLiteralDfa2_0(active0, 0x80000000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x100000000000000L, active1, 0L); case 83: case 115: - return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2L); + return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x4L); case 87: case 119: - return jjMoveStringLiteralDfa2_0(active0, 0x1200000000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x2400000000000000L, active1, 0L); case 124: - if ((active0 & 0x800000000L) != 0L) - return jjStopAtPos(1, 35); + if ((active0 & 0x1000000000L) != 0L) + return jjStopAtPos(1, 36); break; default : break; @@ -401,42 +402,42 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a break; case 65: case 97: - return jjMoveStringLiteralDfa3_0(active0, 0xa00000000000000L, active1, 0x100000000L); + return jjMoveStringLiteralDfa3_0(active0, 0x1400000000000000L, active1, 0x200000000L); case 69: case 101: - return jjMoveStringLiteralDfa3_0(active0, 0x180000000000000L, active1, 0x40000000L); + return jjMoveStringLiteralDfa3_0(active0, 0x300000000000000L, active1, 0x80000000L); case 70: case 102: - if ((active0 & 0x2000000000000000L) != 0L) - return jjStartNfaWithStates_0(2, 61, 444); + if ((active0 & 0x4000000000000000L) != 0L) + return jjStartNfaWithStates_0(2, 62, 444); break; case 72: case 104: - return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000000L, active1, 0x80000000L); + return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000000L, active1, 0x100000000L); case 73: case 105: - return jjMoveStringLiteralDfa3_0(active0, 0x10000000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_0(active0, 0x20000000000000L, active1, 0L); case 76: case 108: - return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000000L, active1, 0L); case 77: case 109: - return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x20000001L); + return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x40000002L); case 78: case 110: - return jjMoveStringLiteralDfa3_0(active0, 0x20000000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 0L); case 79: case 111: - return jjMoveStringLiteralDfa3_0(active0, 0x400000000000000L, active1, 0x200000000L); + return jjMoveStringLiteralDfa3_0(active0, 0x800000000000000L, active1, 0x400000000L); case 82: case 114: - return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 0x2L); + return jjMoveStringLiteralDfa3_0(active0, 0x80000000000000L, active1, 0x4L); case 88: case 120: - return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x1L); default : break; } @@ -459,45 +460,45 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a break; case 65: case 97: - return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80000000L); + return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000000L); case 66: case 98: - return jjMoveStringLiteralDfa4_0(active0, 0x100000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0x200000000000000L, active1, 0L); case 67: case 99: - return jjMoveStringLiteralDfa4_0(active0, 0x820000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0x1040000000000000L, active1, 0L); case 68: case 100: - return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x40000000L); + return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80000000L); case 71: case 103: - return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000000L); + return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x200000000L); case 73: case 105: - return jjMoveStringLiteralDfa4_0(active0, 0x1000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0x2000000000000000L, active1, 0L); case 78: case 110: - return jjMoveStringLiteralDfa4_0(active0, 0x40000000000000L, active1, 0x200000000L); + return jjMoveStringLiteralDfa4_0(active0, 0x80000000000000L, active1, 0x400000000L); case 79: case 111: - return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000L, active1, 0x1L); + return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000L, active1, 0x2L); case 80: case 112: - return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x20000002L); + return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x40000004L); case 82: case 114: - if ((active0 & 0x400000000000000L) != 0L) - return jjStartNfaWithStates_0(3, 58, 444); - return jjMoveStringLiteralDfa4_0(active0, 0x200000000000000L, active1, 0L); + if ((active0 & 0x800000000000000L) != 0L) + return jjStartNfaWithStates_0(3, 59, 444); + return jjMoveStringLiteralDfa4_0(active0, 0x400000000000000L, active1, 0L); case 83: case 115: - return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000000L, active1, 0L); case 84: case 116: - return jjMoveStringLiteralDfa4_0(active0, 0x8080000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0x100000000000000L, active1, 0x1L); case 88: case 120: - return jjMoveStringLiteralDfa4_0(active0, 0x10000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0x20000000000000L, active1, 0L); default : break; } @@ -516,48 +517,48 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a { case 67: case 99: - return jjMoveStringLiteralDfa5_0(active0, 0x40000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_0(active0, 0x80000000000000L, active1, 0L); case 69: case 101: - if ((active0 & 0x4000000000000000L) != 0L) - return jjStartNfaWithStates_0(4, 62, 444); - else if ((active1 & 0x100000000L) != 0L) - return jjStartNfaWithStates_0(4, 96, 444); - return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000000L, active1, 0L); + if ((active0 & 0x8000000000000000L) != 0L) + return jjStartNfaWithStates_0(4, 63, 444); + else if ((active1 & 0x200000000L) != 0L) + return jjStartNfaWithStates_0(4, 97, 444); + return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1L); case 72: case 104: - if ((active0 & 0x800000000000000L) != 0L) - return jjStartNfaWithStates_0(4, 59, 444); + if ((active0 & 0x1000000000000000L) != 0L) + return jjStartNfaWithStates_0(4, 60, 444); break; case 73: case 105: - return jjMoveStringLiteralDfa5_0(active0, 0x10000000000000L, active1, 0x40000000L); + return jjMoveStringLiteralDfa5_0(active0, 0x20000000000000L, active1, 0x80000000L); case 76: case 108: - return jjMoveStringLiteralDfa5_0(active0, 0x1020000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_0(active0, 0x2040000000000000L, active1, 0L); case 78: case 110: - if ((active0 & 0x200000000000000L) != 0L) - return jjStartNfaWithStates_0(4, 57, 444); + if ((active0 & 0x400000000000000L) != 0L) + return jjStartNfaWithStates_0(4, 58, 444); break; case 79: case 111: - return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x20000000L); + return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x40000000L); case 80: case 112: - return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2L); + return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4L); case 82: case 114: - return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x80000000L); + return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x100000000L); case 84: case 116: - return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x200000000L); + return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000000L); case 85: case 117: - return jjMoveStringLiteralDfa5_0(active0, 0x184000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_0(active0, 0x308000000000000L, active1, 0L); case 90: case 122: - return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1L); + return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2L); default : break; } @@ -575,42 +576,42 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a switch(curChar) { case 45: - return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x200000001L); + return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x400000002L); case 65: case 97: - if ((active1 & 0x40000000L) != 0L) - return jjStartNfaWithStates_0(5, 94, 444); + if ((active1 & 0x80000000L) != 0L) + return jjStartNfaWithStates_0(5, 95, 444); break; case 69: case 101: - if ((active0 & 0x1000000000000000L) != 0L) - return jjStartNfaWithStates_0(5, 60, 444); + if ((active0 & 0x2000000000000000L) != 0L) + return jjStartNfaWithStates_0(5, 61, 444); break; case 71: case 103: - if ((active0 & 0x100000000000000L) != 0L) - return jjStartNfaWithStates_0(5, 56, 444); - return jjMoveStringLiteralDfa6_0(active0, 0x4000000000000L, active1, 0L); + if ((active0 & 0x200000000000000L) != 0L) + return jjStartNfaWithStates_0(5, 57, 444); + return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000L, active1, 0L); case 78: case 110: - if ((active0 & 0x10000000000000L) != 0L) - return jjStartNfaWithStates_0(5, 52, 444); - return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000000L, active1, 0L); + if ((active0 & 0x20000000000000L) != 0L) + return jjStartNfaWithStates_0(5, 53, 444); + return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x1L); case 79: case 111: - return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2L); + return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x4L); case 82: case 114: - return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L, active1, 0x20000000L); + return jjMoveStringLiteralDfa6_0(active0, 0x100000000000000L, active1, 0x40000000L); case 83: case 115: - return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x80000000L); + return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x100000000L); case 84: case 116: - return jjMoveStringLiteralDfa6_0(active0, 0x40000000000000L, active1, 0L); + return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa6_0(active0, 0x20000000000000L, active1, 0L); + return jjMoveStringLiteralDfa6_0(active0, 0x40000000000000L, active1, 0L); default : break; } @@ -629,35 +630,35 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long a { case 68: case 100: - if ((active0 & 0x8000000000000000L) != 0L) - return jjStartNfaWithStates_0(6, 63, 444); - return jjMoveStringLiteralDfa7_0(active0, 0x20000000000000L, active1, 0x1L); + if ((active1 & 0x1L) != 0L) + return jjStartNfaWithStates_0(6, 64, 444); + return jjMoveStringLiteralDfa7_0(active0, 0x40000000000000L, active1, 0x2L); case 69: case 101: - return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x80000000L); + return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x100000000L); case 70: case 102: - return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x200000000L); + return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x400000000L); case 72: case 104: - if ((active0 & 0x4000000000000L) != 0L) - return jjStartNfaWithStates_0(6, 50, 441); + if ((active0 & 0x8000000000000L) != 0L) + return jjStartNfaWithStates_0(6, 51, 443); break; case 73: case 105: - return jjMoveStringLiteralDfa7_0(active0, 0x40000000000000L, active1, 0L); + return jjMoveStringLiteralDfa7_0(active0, 0x80000000000000L, active1, 0L); case 78: case 110: - if ((active0 & 0x80000000000000L) != 0L) - return jjStartNfaWithStates_0(6, 55, 444); + if ((active0 & 0x100000000000000L) != 0L) + return jjStartNfaWithStates_0(6, 56, 444); break; case 82: case 114: - return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x2L); + return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x4L); case 84: case 116: - if ((active1 & 0x20000000L) != 0L) - return jjStartNfaWithStates_0(6, 93, 444); + if ((active1 & 0x40000000L) != 0L) + return jjStartNfaWithStates_0(6, 94, 444); break; default : break; @@ -677,20 +678,20 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long a { case 65: case 97: - return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x200000000L); + return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x400000000L); case 69: case 101: - if ((active0 & 0x20000000000000L) != 0L) - return jjStartNfaWithStates_0(7, 53, 444); + if ((active0 & 0x40000000000000L) != 0L) + return jjStartNfaWithStates_0(7, 54, 444); break; case 79: case 111: - return jjMoveStringLiteralDfa8_0(active0, 0x40000000000000L, active1, 0x1L); + return jjMoveStringLiteralDfa8_0(active0, 0x80000000000000L, active1, 0x2L); case 84: case 116: - if ((active1 & 0x80000000L) != 0L) - return jjStartNfaWithStates_0(7, 95, 444); - return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x2L); + if ((active1 & 0x100000000L) != 0L) + return jjStartNfaWithStates_0(7, 96, 444); + return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x4L); default : break; } @@ -709,16 +710,16 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long a { case 67: case 99: - return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x200000001L); + return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x400000002L); case 78: case 110: - if ((active0 & 0x40000000000000L) != 0L) - return jjStartNfaWithStates_0(8, 54, 444); + if ((active0 & 0x80000000000000L) != 0L) + return jjStartNfaWithStates_0(8, 55, 444); break; case 83: case 115: - if ((active1 & 0x2L) != 0L) - return jjStartNfaWithStates_0(8, 65, 444); + if ((active1 & 0x4L) != 0L) + return jjStartNfaWithStates_0(8, 66, 444); break; default : break; @@ -738,12 +739,12 @@ private int jjMoveStringLiteralDfa9_0(long old0, long active0, long old1, long a { case 69: case 101: - if ((active1 & 0x200000000L) != 0L) - return jjStartNfaWithStates_0(9, 97, 444); + if ((active1 & 0x400000000L) != 0L) + return jjStartNfaWithStates_0(9, 98, 444); break; case 85: case 117: - return jjMoveStringLiteralDfa10_0(active1, 0x1L); + return jjMoveStringLiteralDfa10_0(active1, 0x2L); default : break; } @@ -762,7 +763,7 @@ private int jjMoveStringLiteralDfa10_0(long old1, long active1) { case 77: case 109: - return jjMoveStringLiteralDfa11_0(active1, 0x1L); + return jjMoveStringLiteralDfa11_0(active1, 0x2L); default : break; } @@ -781,7 +782,7 @@ private int jjMoveStringLiteralDfa11_0(long old1, long active1) { case 69: case 101: - return jjMoveStringLiteralDfa12_0(active1, 0x1L); + return jjMoveStringLiteralDfa12_0(active1, 0x2L); default : break; } @@ -800,7 +801,7 @@ private int jjMoveStringLiteralDfa12_0(long old1, long active1) { case 78: case 110: - return jjMoveStringLiteralDfa13_0(active1, 0x1L); + return jjMoveStringLiteralDfa13_0(active1, 0x2L); default : break; } @@ -819,8 +820,8 @@ private int jjMoveStringLiteralDfa13_0(long old1, long active1) { case 84: case 116: - if ((active1 & 0x1L) != 0L) - return jjStartNfaWithStates_0(13, 64, 444); + if ((active1 & 0x2L) != 0L) + return jjStartNfaWithStates_0(13, 65, 444); break; default : break; @@ -856,7 +857,7 @@ private int jjMoveNfa_0(int startState, int curPos) { switch(jjstateSet[--i]) { - case 442: + case 441: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(0, 4); if ((0x3ff000000000000L & l) != 0L) @@ -893,8 +894,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAddTwoStates(205, 206); if ((0x3ff000000000000L & l) != 0L) { - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAdd(204); } break; @@ -902,7 +903,7 @@ private int jjMoveNfa_0(int startState, int curPos) if (curChar == 45) jjCheckNAdd(80); break; - case 443: + case 442: if ((0x100003600L & l) != 0L) jjCheckNAddTwoStates(189, 198); if ((0x100003600L & l) != 0L) @@ -912,24 +913,24 @@ private int jjMoveNfa_0(int startState, int curPos) case 113: if ((0x3ff200000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddTwoStates(113, 114); break; - case 441: + case 443: if ((0x3ff200000000000L & l) != 0L) jjCheckNAddStates(5, 8); else if ((0x100003600L & l) != 0L) jjCheckNAddTwoStates(169, 170); else if (curChar == 40) { - if (kind > 113) - kind = 113; + if (kind > 114) + kind = 114; } if ((0x3ff200000000000L & l) != 0L) { - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(158, 159); } break; @@ -940,8 +941,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 4: if ((0x3ff000000000000L & l) != 0L) { - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(9, 82); } else if ((0x100003600L & l) != 0L) @@ -1079,8 +1080,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAddStates(115, 118); break; case 46: - if (curChar == 34 && kind > 69) - kind = 69; + if (curChar == 34 && kind > 70) + kind = 70; break; case 48: if (curChar == 12) @@ -1139,8 +1140,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAddStates(111, 114); break; case 63: - if (curChar == 39 && kind > 69) - kind = 69; + if (curChar == 39 && kind > 70) + kind = 70; break; case 65: if (curChar == 12) @@ -1197,106 +1198,106 @@ private int jjMoveNfa_0(int startState, int curPos) case 81: if ((0x3ff200000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddTwoStates(81, 82); break; case 83: if ((0xffffffff00000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddTwoStates(81, 82); break; case 84: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(278, 281); break; case 85: if ((0x100003600L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddTwoStates(81, 82); break; case 86: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(282, 288); break; case 87: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(289, 291); break; case 88: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(292, 295); break; case 89: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(296, 300); break; case 90: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(301, 306); break; case 93: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(307, 310); break; case 94: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(311, 317); break; case 95: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(318, 320); break; case 96: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(321, 324); break; case 97: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(325, 329); break; case 98: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(330, 335); break; case 99: @@ -1306,162 +1307,162 @@ private int jjMoveNfa_0(int startState, int curPos) case 100: if ((0x3ff200000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddTwoStates(100, 101); break; case 102: if ((0xffffffff00000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddTwoStates(100, 101); break; case 103: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(336, 339); break; case 104: if ((0x100003600L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddTwoStates(100, 101); break; case 105: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(340, 346); break; case 106: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(347, 349); break; case 107: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(350, 353); break; case 108: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(354, 358); break; case 109: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(359, 364); break; case 115: if ((0xffffffff00000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddTwoStates(113, 114); break; case 116: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(365, 368); break; case 117: if ((0x100003600L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddTwoStates(113, 114); break; case 118: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(369, 375); break; case 119: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(376, 378); break; case 120: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(379, 382); break; case 121: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(383, 387); break; case 122: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(388, 393); break; case 125: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(394, 397); break; case 126: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(398, 404); break; case 127: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(405, 407); break; case 128: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(408, 411); break; case 129: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(412, 416); break; case 130: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(417, 422); break; case 132: @@ -1469,86 +1470,86 @@ private int jjMoveNfa_0(int startState, int curPos) jjAddStates(423, 424); break; case 133: - if (curChar == 40 && kind > 110) - kind = 110; + if (curChar == 40 && kind > 111) + kind = 111; break; case 140: if ((0x100003600L & l) != 0L) jjAddStates(425, 426); break; case 141: - if (curChar == 40 && kind > 111) - kind = 111; + if (curChar == 40 && kind > 112) + kind = 112; break; case 148: if ((0x100003600L & l) != 0L) jjAddStates(427, 428); break; case 149: - if (curChar == 40 && kind > 112) - kind = 112; + if (curChar == 40 && kind > 113) + kind = 113; break; case 158: if ((0x3ff200000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(158, 159); break; case 160: if ((0xffffffff00000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(158, 159); break; case 161: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(429, 432); break; case 162: if ((0x100003600L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(158, 159); break; case 163: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(433, 439); break; case 164: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(440, 442); break; case 165: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(443, 446); break; case 166: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(447, 451); break; case 167: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(452, 457); break; case 168: @@ -1560,8 +1561,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAddTwoStates(169, 170); break; case 170: - if (curChar == 40 && kind > 113) - kind = 113; + if (curChar == 40 && kind > 114) + kind = 114; break; case 172: if ((0xffffffff00000000L & l) != 0L) @@ -1619,8 +1620,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 204: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAdd(204); break; case 205: @@ -1628,8 +1629,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAddTwoStates(205, 206); break; case 206: - if (curChar == 37 && kind > 75) - kind = 75; + if (curChar == 37 && kind > 76) + kind = 76; break; case 207: if ((0x3ff000000000000L & l) != 0L) @@ -1702,106 +1703,106 @@ private int jjMoveNfa_0(int startState, int curPos) case 259: if ((0x3ff200000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddTwoStates(259, 260); break; case 261: if ((0xffffffff00000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddTwoStates(259, 260); break; case 262: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(493, 496); break; case 263: if ((0x100003600L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddTwoStates(259, 260); break; case 264: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(497, 503); break; case 265: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(504, 506); break; case 266: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(507, 510); break; case 267: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(511, 515); break; case 268: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(516, 521); break; case 271: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(522, 525); break; case 272: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(526, 532); break; case 273: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(533, 535); break; case 274: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(536, 539); break; case 275: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(540, 544); break; case 276: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(545, 550); break; case 278: @@ -1817,8 +1818,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAddTwoStates(280, 281); break; case 281: - if (curChar == 41 && kind > 73) - kind = 73; + if (curChar == 41 && kind > 74) + kind = 74; break; case 283: if ((0xffffffff00000000L & l) != 0L) @@ -1983,20 +1984,20 @@ private int jjMoveNfa_0(int startState, int curPos) case 329: if (curChar != 63) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjstateSet[jjnewStateCnt++] = 330; break; case 330: if (curChar != 63) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddStates(695, 698); break; case 331: - if (curChar == 63 && kind > 109) - kind = 109; + if (curChar == 63 && kind > 110) + kind = 110; break; case 332: case 347: @@ -2005,29 +2006,29 @@ private int jjMoveNfa_0(int startState, int curPos) case 357: if (curChar != 63) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAdd(331); break; case 333: if (curChar != 63) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddTwoStates(331, 332); break; case 334: if (curChar != 63) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddStates(699, 701); break; case 335: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjAddStates(702, 707); break; case 336: @@ -2043,8 +2044,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAdd(339); break; case 339: - if ((0x3ff000000000000L & l) != 0L && kind > 109) - kind = 109; + if ((0x3ff000000000000L & l) != 0L && kind > 110) + kind = 110; break; case 340: if ((0x3ff000000000000L & l) != 0L) @@ -2061,8 +2062,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 343: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAdd(331); break; case 344: @@ -2076,8 +2077,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 346: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjstateSet[jjnewStateCnt++] = 347; break; case 348: @@ -2087,57 +2088,57 @@ private int jjMoveNfa_0(int startState, int curPos) case 349: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjstateSet[jjnewStateCnt++] = 350; break; case 350: if (curChar != 63) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddTwoStates(331, 351); break; case 352: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjstateSet[jjnewStateCnt++] = 353; break; case 353: if (curChar != 63) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddStates(708, 710); break; case 355: if (curChar != 63) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddTwoStates(331, 354); break; case 356: if (curChar != 63) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddStates(711, 714); break; case 358: if (curChar != 63) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddTwoStates(331, 357); break; case 359: if (curChar != 63) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddStates(715, 717); break; case 360: @@ -2155,36 +2156,36 @@ private int jjMoveNfa_0(int startState, int curPos) case 363: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjstateSet[jjnewStateCnt++] = 364; break; case 364: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddStates(718, 721); break; case 365: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAdd(339); break; case 366: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddTwoStates(339, 365); break; case 367: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddStates(722, 724); break; case 368: @@ -2210,43 +2211,43 @@ private int jjMoveNfa_0(int startState, int curPos) case 374: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(737, 740); break; case 375: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(741, 747); break; case 376: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(748, 750); break; case 377: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(751, 754); break; case 378: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(755, 759); break; case 379: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(760, 765); break; case 380: @@ -2272,15 +2273,15 @@ private int jjMoveNfa_0(int startState, int curPos) case 386: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(9, 82); break; case 387: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAdd(387); break; case 388: @@ -2511,8 +2512,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAddStates(5, 8); if ((0x7fffffe07fffffeL & l) != 0L) { - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(158, 159); } if ((0x200000002000L & l) != 0L) @@ -2521,14 +2522,14 @@ private int jjMoveNfa_0(int startState, int curPos) case 79: if ((0x7fffffe07fffffeL & l) != 0L) { - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddTwoStates(81, 82); } else if (curChar == 92) jjCheckNAddTwoStates(83, 93); break; - case 443: + case 442: if ((0x20000000200L & l) != 0L) jjstateSet[jjnewStateCnt++] = 197; else if ((0x1000000010L & l) != 0L) @@ -2537,22 +2538,22 @@ private int jjMoveNfa_0(int startState, int curPos) case 444: if ((0x7fffffe87fffffeL & l) != 0L) { - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddTwoStates(113, 114); } else if (curChar == 92) jjCheckNAddTwoStates(115, 116); break; - case 441: + case 443: if ((0x7fffffe87fffffeL & l) != 0L) jjCheckNAddStates(5, 8); else if (curChar == 92) jjCheckNAddTwoStates(160, 161); if ((0x7fffffe87fffffeL & l) != 0L) { - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(158, 159); } else if (curChar == 92) @@ -2561,8 +2562,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 111: if ((0x7fffffe07fffffeL & l) != 0L) { - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddTwoStates(113, 114); } else if (curChar == 92) @@ -2571,8 +2572,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 4: if ((0x7fffffe07fffffeL & l) != 0L) { - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(802, 807); } else if (curChar == 92) @@ -2607,8 +2608,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAddStates(123, 125); break; case 10: - if (curChar == 125 && kind > 39) - kind = 39; + if (curChar == 125 && kind > 40) + kind = 40; break; case 11: if (curChar == 92) @@ -2671,8 +2672,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAddStates(189, 195); break; case 29: - if ((0x4000000040000L & l) != 0L && kind > 66) - kind = 66; + if ((0x4000000040000L & l) != 0L && kind > 67) + kind = 67; break; case 30: case 35: @@ -2792,15 +2793,15 @@ private int jjMoveNfa_0(int startState, int curPos) case 80: if ((0x7fffffe07fffffeL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddTwoStates(81, 82); break; case 81: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddTwoStates(81, 82); break; case 82: @@ -2810,50 +2811,50 @@ private int jjMoveNfa_0(int startState, int curPos) case 83: if ((0x7fffffffffffffffL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddTwoStates(81, 82); break; case 84: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(278, 281); break; case 86: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(282, 288); break; case 87: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(289, 291); break; case 88: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(292, 295); break; case 89: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(296, 300); break; case 90: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(301, 306); break; case 92: @@ -2863,50 +2864,50 @@ private int jjMoveNfa_0(int startState, int curPos) case 93: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(307, 310); break; case 94: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(311, 317); break; case 95: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(318, 320); break; case 96: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(321, 324); break; case 97: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(325, 329); break; case 98: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(330, 335); break; case 100: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddTwoStates(100, 101); break; case 101: @@ -2916,50 +2917,50 @@ private int jjMoveNfa_0(int startState, int curPos) case 102: if ((0x7fffffffffffffffL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddTwoStates(100, 101); break; case 103: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(336, 339); break; case 105: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(340, 346); break; case 106: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(347, 349); break; case 107: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(350, 353); break; case 108: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(354, 358); break; case 109: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(359, 364); break; case 110: @@ -2969,15 +2970,15 @@ private int jjMoveNfa_0(int startState, int curPos) case 112: if ((0x7fffffe07fffffeL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddTwoStates(113, 114); break; case 113: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddTwoStates(113, 114); break; case 114: @@ -2987,50 +2988,50 @@ private int jjMoveNfa_0(int startState, int curPos) case 115: if ((0x7fffffffffffffffL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddTwoStates(113, 114); break; case 116: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(365, 368); break; case 118: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(369, 375); break; case 119: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(376, 378); break; case 120: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(379, 382); break; case 121: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(383, 387); break; case 122: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(388, 393); break; case 124: @@ -3040,43 +3041,43 @@ private int jjMoveNfa_0(int startState, int curPos) case 125: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(394, 397); break; case 126: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(398, 404); break; case 127: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(405, 407); break; case 128: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(408, 411); break; case 129: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(412, 416); break; case 130: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(417, 422); break; case 131: @@ -3162,8 +3163,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 158: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(158, 159); break; case 159: @@ -3173,50 +3174,50 @@ private int jjMoveNfa_0(int startState, int curPos) case 160: if ((0x7fffffffffffffffL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(158, 159); break; case 161: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(429, 432); break; case 163: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(433, 439); break; case 164: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(440, 442); break; case 165: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(443, 446); break; case 166: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(447, 451); break; case 167: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(452, 457); break; case 168: @@ -3257,8 +3258,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAddStates(486, 492); break; case 182: - if ((0x10000000100000L & l) != 0L && kind > 68) - kind = 68; + if ((0x10000000100000L & l) != 0L && kind > 69) + kind = 69; break; case 183: if ((0x100000001000L & l) != 0L) @@ -3285,8 +3286,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 187; break; case 190: - if ((0x10000000100000L & l) != 0L && kind > 99) - kind = 99; + if ((0x10000000100000L & l) != 0L && kind > 100) + kind = 100; break; case 191: if ((0x400000004000L & l) != 0L) @@ -3323,8 +3324,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 200: if ((0x7fffffe07fffffeL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(158, 159); break; case 201: @@ -3334,77 +3335,77 @@ private int jjMoveNfa_0(int startState, int curPos) case 202: if ((0x7fffffe07fffffeL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(802, 807); break; case 208: - if ((0x10000000100000L & l) != 0L && kind > 76) - kind = 76; + if ((0x10000000100000L & l) != 0L && kind > 77) + kind = 77; break; case 209: if ((0x1000000010000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 208; break; case 211: - if ((0x200000002000L & l) != 0L && kind > 77) - kind = 77; + if ((0x200000002000L & l) != 0L && kind > 78) + kind = 78; break; case 212: if ((0x200000002000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 211; break; case 214: - if ((0x200000002000L & l) != 0L && kind > 78) - kind = 78; + if ((0x200000002000L & l) != 0L && kind > 79) + kind = 79; break; case 215: if ((0x800000008L & l) != 0L) jjstateSet[jjnewStateCnt++] = 214; break; case 217: - if ((0x800000008L & l) != 0L && kind > 79) - kind = 79; + if ((0x800000008L & l) != 0L && kind > 80) + kind = 80; break; case 218: if ((0x1000000010000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 217; break; case 220: - if ((0x400000004000L & l) != 0L && kind > 80) - kind = 80; + if ((0x400000004000L & l) != 0L && kind > 81) + kind = 81; break; case 221: if ((0x20000000200L & l) != 0L) jjstateSet[jjnewStateCnt++] = 220; break; case 223: - if ((0x100000001000000L & l) != 0L && kind > 81) - kind = 81; + if ((0x100000001000000L & l) != 0L && kind > 82) + kind = 82; break; case 224: if ((0x1000000010000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 223; break; case 226: - if ((0x200000002000L & l) != 0L && kind > 82) - kind = 82; + if ((0x200000002000L & l) != 0L && kind > 83) + kind = 83; break; case 227: if ((0x2000000020L & l) != 0L) jjstateSet[jjnewStateCnt++] = 226; break; case 229: - if ((0x100000001000000L & l) != 0L && kind > 83) - kind = 83; + if ((0x100000001000000L & l) != 0L && kind > 84) + kind = 84; break; case 230: if ((0x2000000020L & l) != 0L) jjstateSet[jjnewStateCnt++] = 229; break; case 232: - if ((0x8000000080L & l) != 0L && kind > 84) - kind = 84; + if ((0x8000000080L & l) != 0L && kind > 85) + kind = 85; break; case 233: if ((0x2000000020L & l) != 0L) @@ -3415,8 +3416,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 233; break; case 236: - if ((0x1000000010L & l) != 0L && kind > 85) - kind = 85; + if ((0x1000000010L & l) != 0L && kind > 86) + kind = 86; break; case 237: if ((0x200000002L & l) != 0L) @@ -3427,8 +3428,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 237; break; case 240: - if ((0x1000000010L & l) != 0L && kind > 86) - kind = 86; + if ((0x1000000010L & l) != 0L && kind > 87) + kind = 87; break; case 241: if ((0x200000002L & l) != 0L) @@ -3443,28 +3444,28 @@ private int jjMoveNfa_0(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 242; break; case 245: - if ((0x8000000080000L & l) != 0L && kind > 87) - kind = 87; + if ((0x8000000080000L & l) != 0L && kind > 88) + kind = 88; break; case 246: if ((0x200000002000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 245; break; case 248: - if ((0x8000000080000L & l) != 0L && kind > 88) - kind = 88; + if ((0x8000000080000L & l) != 0L && kind > 89) + kind = 89; break; case 250: - if ((0x400000004000000L & l) != 0L && kind > 89) - kind = 89; + if ((0x400000004000000L & l) != 0L && kind > 90) + kind = 90; break; case 251: if ((0x10000000100L & l) != 0L) jjstateSet[jjnewStateCnt++] = 250; break; case 253: - if ((0x400000004000000L & l) != 0L && kind > 90) - kind = 90; + if ((0x400000004000000L & l) != 0L && kind > 91) + kind = 91; break; case 254: if ((0x10000000100L & l) != 0L) @@ -3477,15 +3478,15 @@ private int jjMoveNfa_0(int startState, int curPos) case 258: if ((0x7fffffe07fffffeL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddTwoStates(259, 260); break; case 259: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddTwoStates(259, 260); break; case 260: @@ -3495,50 +3496,50 @@ private int jjMoveNfa_0(int startState, int curPos) case 261: if ((0x7fffffffffffffffL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddTwoStates(259, 260); break; case 262: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(493, 496); break; case 264: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(497, 503); break; case 265: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(504, 506); break; case 266: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(507, 510); break; case 267: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(511, 515); break; case 268: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(516, 521); break; case 270: @@ -3548,43 +3549,43 @@ private int jjMoveNfa_0(int startState, int curPos) case 271: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(522, 525); break; case 272: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(526, 532); break; case 273: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(533, 535); break; case 274: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(536, 539); break; case 275: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(540, 544); break; case 276: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(545, 550); break; case 277: @@ -3709,8 +3710,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 335: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjAddStates(702, 707); break; case 336: @@ -3726,8 +3727,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAdd(339); break; case 339: - if ((0x7e0000007eL & l) != 0L && kind > 109) - kind = 109; + if ((0x7e0000007eL & l) != 0L && kind > 110) + kind = 110; break; case 340: if ((0x7e0000007eL & l) != 0L) @@ -3744,8 +3745,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 343: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjstateSet[jjnewStateCnt++] = 331; break; case 344: @@ -3759,8 +3760,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 346: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjstateSet[jjnewStateCnt++] = 347; break; case 348: @@ -3770,15 +3771,15 @@ private int jjMoveNfa_0(int startState, int curPos) case 349: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjstateSet[jjnewStateCnt++] = 350; break; case 352: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjstateSet[jjnewStateCnt++] = 353; break; case 361: @@ -3788,36 +3789,36 @@ private int jjMoveNfa_0(int startState, int curPos) case 363: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjstateSet[jjnewStateCnt++] = 364; break; case 364: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddStates(718, 721); break; case 365: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAdd(339); break; case 366: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddTwoStates(339, 365); break; case 367: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddStates(722, 724); break; case 368: @@ -3847,43 +3848,43 @@ private int jjMoveNfa_0(int startState, int curPos) case 374: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(737, 740); break; case 375: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(741, 747); break; case 376: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(748, 750); break; case 377: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(751, 754); break; case 378: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(755, 759); break; case 379: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(760, 765); break; case 380: @@ -3923,8 +3924,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 83: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddTwoStates(81, 82); break; case 444: @@ -3932,15 +3933,15 @@ private int jjMoveNfa_0(int startState, int curPos) case 115: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddTwoStates(113, 114); break; - case 441: + case 443: if ((jjbitVec0[i2] & l2) != 0L) { - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(158, 159); } if ((jjbitVec0[i2] & l2) != 0L) @@ -3949,15 +3950,15 @@ private int jjMoveNfa_0(int startState, int curPos) case 111: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddTwoStates(113, 114); break; case 4: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 40) - kind = 40; + if (kind > 41) + kind = 41; jjCheckNAddStates(802, 807); break; case 2: @@ -3984,16 +3985,16 @@ private int jjMoveNfa_0(int startState, int curPos) case 102: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddTwoStates(100, 101); break; case 158: case 160: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(158, 159); break; case 168: @@ -4006,8 +4007,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 269: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddTwoStates(259, 260); break; case 279: @@ -4251,14 +4252,14 @@ static final int[] jjnextStates = { public static final String[] jjstrLiteralImages = { "", null, null, null, null, null, null, null, null, null, "\74\41\55\55", "\55\55\76", "\173", "\175", "\174\75", "\136\75", "\44\75", "\52\75", "\176\75", "\75", -"\53", "\55", "\54", "\73", "\76", "\74", "\57", "\133", "\135", "\52", "\46", "\56", -"\50", "\51", "\75\75", "\174\174", "\46\46", "\41\75", "\72", null, null, null, null, +"\53", "\55", "\54", "\73", "\76", "\176", "\74", "\57", "\133", "\135", "\52", +"\46", "\56", "\50", "\51", "\75\75", "\174\174", "\46\46", "\41\75", "\72", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, -null, null, }; +null, null, null, null, null, }; /** Lexer state names. */ public static final String[] lexStateNames = { @@ -4274,10 +4275,10 @@ public static final int[] jjnewLexState = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }; static final long[] jjtoToken = { - 0xfffe01fffffffc03L, 0x7e00ffffffeffL, + 0xfffc03fffffffc03L, 0xfc01ffffffdffL, }; static final long[] jjtoSkip = { 0x190L, 0x0L, @@ -4403,9 +4404,9 @@ public Token getNextToken() jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_0(); - if (jjmatchedPos == 0 && jjmatchedKind > 114) + if (jjmatchedPos == 0 && jjmatchedKind > 115) { - jjmatchedKind = 114; + jjmatchedKind = 115; } break; case 1: diff --git a/theme-compiler/tests/resources/automatic/css/selector_types.css b/theme-compiler/tests/resources/automatic/css/selector_types.css new file mode 100644 index 0000000000..b0f98c9267 --- /dev/null +++ b/theme-compiler/tests/resources/automatic/css/selector_types.css @@ -0,0 +1,63 @@ +* { + type: universal; +} + +attrib .attrib { + type: attribute; +} + +.attrib[foo] .attrib[foo="bar"] .attrib[foo~="bar"] .attrib[foo^="bar"] .attrib[foo$="bar"] .attrib[foo*="bar"] .attrib[foo|="bar"] { + type: attribute; +} + +.pseudo:root .pseudo:first-child { + type: pseudo-class; +} + +.pseudo:root .pseudo:first-child { + type: pseudo-class; +} + +.pseudo:nth-child(3) { + type: pseudo-class; +} + +.pseudo:lang(fr) { + type: pseudo-class; +} + +.pseudo:not(s) .pseudo:not(.s) { + type: pseudo-class; +} + +.pseudo::after { + type: pseudo-element; +} + +.pseudo[foo="bar"]::after { + type: pseudo-combined; +} + +.foo.warning { + type: class; +} + +.id#myid { + type: id; +} + +E F { + type: descendant; +} + +E > F { + type: child; +} + +E + F { + type: adjacent; +} + +E ~ F { + type: sibling; +} diff --git a/theme-compiler/tests/resources/automatic/scss/selector_types.scss b/theme-compiler/tests/resources/automatic/scss/selector_types.scss new file mode 100644 index 0000000000..b0f98c9267 --- /dev/null +++ b/theme-compiler/tests/resources/automatic/scss/selector_types.scss @@ -0,0 +1,63 @@ +* { + type: universal; +} + +attrib .attrib { + type: attribute; +} + +.attrib[foo] .attrib[foo="bar"] .attrib[foo~="bar"] .attrib[foo^="bar"] .attrib[foo$="bar"] .attrib[foo*="bar"] .attrib[foo|="bar"] { + type: attribute; +} + +.pseudo:root .pseudo:first-child { + type: pseudo-class; +} + +.pseudo:root .pseudo:first-child { + type: pseudo-class; +} + +.pseudo:nth-child(3) { + type: pseudo-class; +} + +.pseudo:lang(fr) { + type: pseudo-class; +} + +.pseudo:not(s) .pseudo:not(.s) { + type: pseudo-class; +} + +.pseudo::after { + type: pseudo-element; +} + +.pseudo[foo="bar"]::after { + type: pseudo-combined; +} + +.foo.warning { + type: class; +} + +.id#myid { + type: id; +} + +E F { + type: descendant; +} + +E > F { + type: child; +} + +E + F { + type: adjacent; +} + +E ~ F { + type: sibling; +} |