diff options
| author | Mika Murtojarvi <mika@vaadin.com> | 2014-02-21 11:22:06 +0200 |
|---|---|---|
| committer | Mika Murtojarvi <mika@vaadin.com> | 2014-03-10 15:13:17 +0200 |
| commit | 6cd4335da1f45658f9205cff5b0f36db1b553948 (patch) | |
| tree | 49eb762c21d335e6010c3b86ca34284ddaec9c28 /theme-compiler/src | |
| parent | 856725693ba36a08d2dc5cccf94333ac030dba2c (diff) | |
| download | vaadin-framework-6cd4335da1f45658f9205cff5b0f36db1b553948.tar.gz vaadin-framework-6cd4335da1f45658f9205cff5b0f36db1b553948.zip | |
Resolves a case where a missing semicolon was not inferred (#12792)
A rule used in includeDirective has been rewritten so that it is called
when it may be needed.
Change-Id: I6705f478a40727984b644cd2da96a7aae03b7a99
Diffstat (limited to 'theme-compiler/src')
6 files changed, 874 insertions, 903 deletions
diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/CharStream.java b/theme-compiler/src/com/vaadin/sass/internal/parser/CharStream.java index c22f19451b..e43320453c 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/CharStream.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/CharStream.java @@ -127,4 +127,4 @@ interface CharStream { void Done(); } -/* JavaCC - OriginalChecksum=deb80d024b50bdc8bfaadaf528157233 (do not edit this line) */ +/* JavaCC - OriginalChecksum=18aae0a549695f0fec96a11297b442bb (do not edit this line) */ 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 06a413649e..d1460ea2fc 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java @@ -19,6 +19,7 @@ package com.vaadin.sass.internal.parser; import java.io.*; import java.net.*; import java.util.ArrayList; +import java.util.Arrays; import java.util.Locale; import java.util.Map; import java.util.UUID; @@ -561,16 +562,23 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } jj_consume_token(S); } - jj_consume_token(SEMICOLON); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case SEMICOLON: + jj_consume_token(SEMICOLON); + break; + default: + jj_la1[8] = jj_gen; + acceptMissingSemicolon(EOF); + } } catch (ParseException e) { reportError(getLocator(e.currentToken.next), e); - skipStatement(); - // reportWarningSkipText(getLocator(), skipStatement()); + skipStatement(); + // reportWarningSkipText(getLocator(), skipStatement()); } catch (Exception e) { reportError(getLocator(), e); - skipStatement(); - // reportWarningSkipText(getLocator(), skipStatement()); + skipStatement(); + // reportWarningSkipText(getLocator(), skipStatement()); } } @@ -622,7 +630,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { keyframes(); break; default: - jj_la1[8] = jj_gen; + jj_la1[9] = jj_gen; if (jj_2_1(2147483647)) { variable(); } else { @@ -631,7 +639,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { listModifyDirective(); break; default: - jj_la1[9] = jj_gen; + jj_la1[10] = jj_gen; l = getLocator(); ret = skipStatement(); if ((ret == null) || (ret.length() == 0)) { @@ -654,7 +662,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[10] = jj_gen; + jj_la1[11] = jj_gen; break label_8; } ignoreStatement(); @@ -665,7 +673,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[11] = jj_gen; + jj_la1[12] = jj_gen; break label_9; } jj_consume_token(S); @@ -686,7 +694,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { atRuleDeclaration(); break; default: - jj_la1[12] = jj_gen; + jj_la1[13] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -711,7 +719,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[13] = jj_gen; + jj_la1[14] = jj_gen; break label_10; } jj_consume_token(S); @@ -732,7 +740,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } break; default: - jj_la1[14] = jj_gen; + jj_la1[15] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -743,13 +751,20 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[15] = jj_gen; + jj_la1[16] = jj_gen; break label_11; } jj_consume_token(S); } mediaStatement(ml); - jj_consume_token(SEMICOLON); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case SEMICOLON: + jj_consume_token(SEMICOLON); + break; + default: + jj_la1[17] = jj_gen; + acceptMissingSemicolon(RBRACE, EOF); + } label_12: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -757,7 +772,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[16] = jj_gen; + jj_la1[18] = jj_gen; break label_12; } jj_consume_token(S); @@ -792,7 +807,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[17] = jj_gen; + jj_la1[19] = jj_gen; break label_13; } jj_consume_token(S); @@ -810,7 +825,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { animationname += n.image; break; default: - jj_la1[18] = jj_gen; + jj_la1[20] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -820,7 +835,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[19] = jj_gen; + jj_la1[21] = jj_gen; break label_14; } } @@ -831,7 +846,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[20] = jj_gen; + jj_la1[22] = jj_gen; break label_15; } jj_consume_token(S); @@ -845,7 +860,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[21] = jj_gen; + jj_la1[23] = jj_gen; break label_16; } jj_consume_token(S); @@ -860,7 +875,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[22] = jj_gen; + jj_la1[24] = jj_gen; break label_17; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -873,7 +888,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { contentDirective(); break; default: - jj_la1[23] = jj_gen; + jj_la1[25] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -886,7 +901,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[24] = jj_gen; + jj_la1[26] = jj_gen; break label_18; } jj_consume_token(S); @@ -917,7 +932,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { n = jj_consume_token(PERCENTAGE); break; default: - jj_la1[25] = jj_gen; + jj_la1[27] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -929,7 +944,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[26] = jj_gen; + jj_la1[28] = jj_gen; break label_19; } jj_consume_token(S); @@ -941,7 +956,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[27] = jj_gen; + jj_la1[29] = jj_gen; break label_20; } jj_consume_token(COMMA); @@ -952,7 +967,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[28] = jj_gen; + jj_la1[30] = jj_gen; break label_21; } jj_consume_token(S); @@ -968,7 +983,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { n = jj_consume_token(PERCENTAGE); break; default: - jj_la1[29] = jj_gen; + jj_la1[31] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -980,7 +995,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[30] = jj_gen; + jj_la1[32] = jj_gen; break label_22; } jj_consume_token(S); @@ -994,7 +1009,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[31] = jj_gen; + jj_la1[33] = jj_gen; break label_23; } jj_consume_token(S); @@ -1030,7 +1045,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[32] = jj_gen; + jj_la1[34] = jj_gen; break label_24; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1062,7 +1077,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { microsoftExtension(); break; default: - jj_la1[33] = jj_gen; + jj_la1[35] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1075,7 +1090,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[34] = jj_gen; + jj_la1[36] = jj_gen; break label_25; } jj_consume_token(S); @@ -1118,7 +1133,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[35] = jj_gen; + jj_la1[37] = jj_gen; break label_26; } jj_consume_token(S); @@ -1133,7 +1148,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[36] = jj_gen; + jj_la1[38] = jj_gen; break label_27; } jj_consume_token(S); @@ -1180,7 +1195,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[37] = jj_gen; + jj_la1[39] = jj_gen; break label_28; } mediaDirective(); @@ -1193,7 +1208,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[38] = jj_gen; + jj_la1[40] = jj_gen; break label_29; } jj_consume_token(S); @@ -1257,7 +1272,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { contentDirective(); break; default: - jj_la1[39] = jj_gen; + jj_la1[41] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1315,7 +1330,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[40] = jj_gen; + jj_la1[42] = jj_gen; break label_30; } jj_consume_token(S); @@ -1330,14 +1345,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[41] = jj_gen; + jj_la1[43] = jj_gen; break label_31; } jj_consume_token(S); } break; default: - jj_la1[42] = jj_gen; + jj_la1[44] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1345,7 +1360,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { pseudo = pseudo_page(); break; default: - jj_la1[43] = jj_gen; + jj_la1[45] = jj_gen; ; } if (n != null) { @@ -1359,7 +1374,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[44] = jj_gen; + jj_la1[46] = jj_gen; break label_32; } jj_consume_token(S); @@ -1372,7 +1387,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[45] = jj_gen; + jj_la1[47] = jj_gen; ; } label_33: @@ -1382,7 +1397,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[46] = jj_gen; + jj_la1[48] = jj_gen; break label_33; } jj_consume_token(SEMICOLON); @@ -1393,7 +1408,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[47] = jj_gen; + jj_la1[49] = jj_gen; break label_34; } jj_consume_token(S); @@ -1404,7 +1419,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[48] = jj_gen; + jj_la1[50] = jj_gen; ; } } @@ -1416,7 +1431,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[49] = jj_gen; + jj_la1[51] = jj_gen; break label_35; } jj_consume_token(S); @@ -1450,7 +1465,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[50] = jj_gen; + jj_la1[52] = jj_gen; break label_36; } jj_consume_token(S); @@ -1470,7 +1485,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[51] = jj_gen; + jj_la1[53] = jj_gen; break label_37; } jj_consume_token(S); @@ -1483,7 +1498,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[52] = jj_gen; + jj_la1[54] = jj_gen; break label_38; } jj_consume_token(S); @@ -1495,7 +1510,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[53] = jj_gen; + jj_la1[55] = jj_gen; ; } label_39: @@ -1505,7 +1520,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[54] = jj_gen; + jj_la1[56] = jj_gen; break label_39; } jj_consume_token(SEMICOLON); @@ -1516,7 +1531,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[55] = jj_gen; + jj_la1[57] = jj_gen; break label_40; } jj_consume_token(S); @@ -1527,7 +1542,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[56] = jj_gen; + jj_la1[58] = jj_gen; ; } } @@ -1539,7 +1554,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[57] = jj_gen; + jj_la1[59] = jj_gen; break label_41; } jj_consume_token(S); @@ -1641,7 +1656,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { n = jj_consume_token(UNKNOWN); break; default: - jj_la1[58] = jj_gen; + jj_la1[60] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1675,12 +1690,12 @@ char connector = ' '; connector = combinatorChar(); break; default: - jj_la1[59] = jj_gen; + jj_la1[61] = jj_gen; ; } break; default: - jj_la1[60] = jj_gen; + jj_la1[62] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1702,7 +1717,7 @@ char connector = ' '; t = jj_consume_token(SIBLING); break; default: - jj_la1[61] = jj_gen; + jj_la1[63] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1713,7 +1728,7 @@ char connector = ' '; ; break; default: - jj_la1[62] = jj_gen; + jj_la1[64] = jj_gen; break label_42; } jj_consume_token(S); @@ -1735,7 +1750,7 @@ char connector = ' '; ; break; default: - jj_la1[63] = jj_gen; + jj_la1[65] = jj_gen; break label_43; } jj_consume_token(S); @@ -1791,7 +1806,7 @@ char connector = ' '; { value += n.image; } break; default: - jj_la1[64] = jj_gen; + jj_la1[66] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1810,7 +1825,7 @@ char connector = ' '; ; break; default: - jj_la1[65] = jj_gen; + jj_la1[67] = jj_gen; break label_44; } } @@ -1822,7 +1837,7 @@ char connector = ' '; ; break; default: - jj_la1[66] = jj_gen; + jj_la1[68] = jj_gen; break label_45; } jj_consume_token(S); @@ -1847,7 +1862,7 @@ char connector = ' '; s += t.image; break; default: - jj_la1[67] = jj_gen; + jj_la1[69] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1857,7 +1872,7 @@ char connector = ' '; ; break; default: - jj_la1[68] = jj_gen; + jj_la1[70] = jj_gen; break label_46; } } @@ -1868,7 +1883,7 @@ char connector = ' '; ; break; default: - jj_la1[69] = jj_gen; + jj_la1[71] = jj_gen; break label_47; } jj_consume_token(S); @@ -1887,7 +1902,7 @@ char connector = ' '; ; break; default: - jj_la1[70] = jj_gen; + jj_la1[72] = jj_gen; break label_48; } jj_consume_token(S); @@ -1906,7 +1921,7 @@ char connector = ' '; ; break; default: - jj_la1[71] = jj_gen; + jj_la1[73] = jj_gen; break label_49; } jj_consume_token(S); @@ -1934,7 +1949,7 @@ char connector = ' '; ; break; default: - jj_la1[72] = jj_gen; + jj_la1[74] = jj_gen; break label_50; } jj_consume_token(S); @@ -1971,7 +1986,7 @@ char connector = ' '; ; break; default: - jj_la1[73] = jj_gen; + jj_la1[75] = jj_gen; break label_51; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2006,7 +2021,7 @@ char connector = ' '; importDeclaration(); break; default: - jj_la1[74] = jj_gen; + jj_la1[76] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2019,7 +2034,7 @@ char connector = ' '; ; break; default: - jj_la1[75] = jj_gen; + jj_la1[77] = jj_gen; break label_52; } jj_consume_token(S); @@ -2056,7 +2071,7 @@ char connector = ' '; ; break; default: - jj_la1[76] = jj_gen; + jj_la1[78] = jj_gen; break label_53; } jj_consume_token(COMMA); @@ -2067,7 +2082,7 @@ char connector = ' '; ; break; default: - jj_la1[77] = jj_gen; + jj_la1[79] = jj_gen; break label_54; } jj_consume_token(S); @@ -2105,7 +2120,7 @@ char connector = ' '; selector = simple_selector(selector, comb); break; default: - jj_la1[78] = jj_gen; + jj_la1[80] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2126,7 +2141,7 @@ char connector = ' '; ; break; default: - jj_la1[79] = jj_gen; + jj_la1[81] = jj_gen; break label_56; } jj_consume_token(S); @@ -2181,7 +2196,7 @@ char connector = ' '; ; break; default: - jj_la1[80] = jj_gen; + jj_la1[82] = jj_gen; break label_57; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2198,7 +2213,7 @@ char connector = ' '; cond = pseudo(cond); break; default: - jj_la1[81] = jj_gen; + jj_la1[83] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2224,7 +2239,7 @@ char connector = ' '; cond = pseudo(cond); break; default: - jj_la1[82] = jj_gen; + jj_la1[84] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2236,13 +2251,13 @@ char connector = ' '; ; break; default: - jj_la1[83] = jj_gen; + jj_la1[85] = jj_gen; break label_58; } } break; default: - jj_la1[84] = jj_gen; + jj_la1[86] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2299,7 +2314,7 @@ String s = "."; s += t.image; break; default: - jj_la1[85] = jj_gen; + jj_la1[87] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2309,7 +2324,7 @@ String s = "."; ; break; default: - jj_la1[86] = jj_gen; + jj_la1[88] = jj_gen; break label_59; } } @@ -2341,7 +2356,7 @@ String s = "."; s += t.image; break; default: - jj_la1[87] = jj_gen; + jj_la1[89] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2351,7 +2366,7 @@ String s = "."; ; break; default: - jj_la1[88] = jj_gen; + jj_la1[90] = jj_gen; break label_60; } } @@ -2366,7 +2381,7 @@ String s = "."; {if (true) return "&";} break; default: - jj_la1[89] = jj_gen; + jj_la1[91] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2389,7 +2404,7 @@ String s = "."; ; break; default: - jj_la1[90] = jj_gen; + jj_la1[92] = jj_gen; break label_61; } jj_consume_token(S); @@ -2402,7 +2417,7 @@ String s = "."; ; break; default: - jj_la1[91] = jj_gen; + jj_la1[93] = jj_gen; break label_62; } jj_consume_token(S); @@ -2440,7 +2455,7 @@ String s = "."; cases = 6; break; default: - jj_la1[92] = jj_gen; + jj_la1[94] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2451,7 +2466,7 @@ String s = "."; ; break; default: - jj_la1[93] = jj_gen; + jj_la1[95] = jj_gen; break label_63; } jj_consume_token(S); @@ -2466,7 +2481,7 @@ String s = "."; attValue = val.image; break; default: - jj_la1[94] = jj_gen; + jj_la1[96] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2477,14 +2492,14 @@ String s = "."; ; break; default: - jj_la1[95] = jj_gen; + jj_la1[97] = jj_gen; break label_64; } jj_consume_token(S); } break; default: - jj_la1[96] = jj_gen; + jj_la1[98] = jj_gen; ; } jj_consume_token(RBRACKET); @@ -2540,7 +2555,7 @@ boolean isPseudoElement = false; isPseudoElement=true; break; default: - jj_la1[97] = jj_gen; + jj_la1[99] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2573,7 +2588,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[98] = jj_gen; + jj_la1[100] = jj_gen; break label_65; } jj_consume_token(S); @@ -2591,7 +2606,7 @@ boolean isPseudoElement = false; } break; default: - jj_la1[99] = jj_gen; + jj_la1[101] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2628,7 +2643,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[100] = jj_gen; + jj_la1[102] = jj_gen; break label_66; } jj_consume_token(S); @@ -2639,33 +2654,10 @@ boolean isPseudoElement = false; guarded = guarded(); break; default: - jj_la1[101] = jj_gen; + jj_la1[103] = jj_gen; ; } - label_67: - while (true) { - jj_consume_token(SEMICOLON); - label_68: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case S: - ; - break; - default: - jj_la1[102] = jj_gen; - break label_68; - } - jj_consume_token(S); - } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - ; - break; - default: - jj_la1[103] = jj_gen; - break label_67; - } - } + semicolonTerminator(); exp = replaceNullValues(exp); documentHandler.variable(name, exp, guarded); } catch (JumpException e) { @@ -2789,7 +2781,7 @@ boolean isPseudoElement = false; String s = null; String evaluator = ""; jj_consume_token(IF_SYM); - label_69: + label_67: while (true) { s = booleanExpressionToken(); evaluator += s; @@ -2816,11 +2808,11 @@ boolean isPseudoElement = false; break; default: jj_la1[107] = jj_gen; - break label_69; + break label_67; } } jj_consume_token(LBRACE); - label_70: + label_68: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -2828,13 +2820,13 @@ boolean isPseudoElement = false; break; default: jj_la1[108] = jj_gen; - break label_70; + break label_68; } jj_consume_token(S); } documentHandler.startIfElseDirective(); documentHandler.ifDirective(evaluator); - label_71: + label_69: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: @@ -2864,7 +2856,7 @@ boolean isPseudoElement = false; break; default: jj_la1[109] = jj_gen; - break label_71; + break label_69; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: @@ -2901,7 +2893,7 @@ boolean isPseudoElement = false; } } jj_consume_token(RBRACE); - label_72: + label_70: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -2909,11 +2901,11 @@ boolean isPseudoElement = false; break; default: jj_la1[111] = jj_gen; - break label_72; + break label_70; } jj_consume_token(S); } - label_73: + label_71: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ELSE_SYM: @@ -2921,7 +2913,7 @@ boolean isPseudoElement = false; break; default: jj_la1[112] = jj_gen; - break label_73; + break label_71; } elseDirective(); } @@ -2933,7 +2925,7 @@ boolean isPseudoElement = false; Token n = null; String s = null; jj_consume_token(ELSE_SYM); - label_74: + label_72: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -2941,14 +2933,14 @@ boolean isPseudoElement = false; break; default: jj_la1[113] = jj_gen; - break label_74; + break label_72; } jj_consume_token(S); } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IF: jj_consume_token(IF); - label_75: + label_73: while (true) { s = booleanExpressionToken(); evaluator += s; @@ -2975,7 +2967,7 @@ boolean isPseudoElement = false; break; default: jj_la1[114] = jj_gen; - break label_75; + break label_73; } } break; @@ -2984,7 +2976,7 @@ boolean isPseudoElement = false; ; } jj_consume_token(LBRACE); - label_76: + label_74: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -2992,13 +2984,13 @@ boolean isPseudoElement = false; break; default: jj_la1[116] = jj_gen; - break label_76; + break label_74; } jj_consume_token(S); } if(!evaluator.trim().equals("")){ documentHandler.ifDirective(evaluator); } else{ documentHandler.elseDirective(); } - label_77: + label_75: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: @@ -3028,7 +3020,7 @@ boolean isPseudoElement = false; break; default: jj_la1[117] = jj_gen; - break label_77; + break label_75; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: @@ -3065,7 +3057,7 @@ boolean isPseudoElement = false; } } jj_consume_token(RBRACE); - label_78: + label_76: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -3073,7 +3065,7 @@ boolean isPseudoElement = false; break; default: jj_la1[119] = jj_gen; - break label_78; + break label_76; } jj_consume_token(S); } @@ -3153,7 +3145,7 @@ boolean isPseudoElement = false; ArrayList<String> list = null; String listVariable = null; jj_consume_token(EACH_SYM); - label_79: + label_77: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -3161,12 +3153,12 @@ boolean isPseudoElement = false; break; default: jj_la1[121] = jj_gen; - break label_79; + break label_77; } jj_consume_token(S); } var = jj_consume_token(VARIABLE); - label_80: + label_78: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -3174,12 +3166,12 @@ boolean isPseudoElement = false; break; default: jj_la1[122] = jj_gen; - break label_80; + break label_78; } jj_consume_token(S); } jj_consume_token(EACH_IN); - label_81: + label_79: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -3187,7 +3179,7 @@ boolean isPseudoElement = false; break; default: jj_la1[123] = jj_gen; - break label_81; + break label_79; } jj_consume_token(S); } @@ -3206,7 +3198,7 @@ boolean isPseudoElement = false; throw new ParseException(); } jj_consume_token(LBRACE); - label_82: + label_80: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -3214,11 +3206,11 @@ boolean isPseudoElement = false; break; default: jj_la1[125] = jj_gen; - break label_82; + break label_80; } jj_consume_token(S); } - label_83: + label_81: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: @@ -3247,12 +3239,12 @@ boolean isPseudoElement = false; break; default: jj_la1[126] = jj_gen; - break label_83; + break label_81; } ifContentStatement(); } jj_consume_token(RBRACE); - label_84: + label_82: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -3260,7 +3252,7 @@ boolean isPseudoElement = false; break; default: jj_la1[127] = jj_gen; - break label_84; + break label_82; } jj_consume_token(S); } @@ -3271,7 +3263,7 @@ boolean isPseudoElement = false; ArrayList<String > strings = new ArrayList<String >(); Token input; input = jj_consume_token(IDENT); - label_85: + label_83: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -3279,12 +3271,12 @@ boolean isPseudoElement = false; break; default: jj_la1[128] = jj_gen; - break label_85; + break label_83; } jj_consume_token(S); } strings.add(input.image); - label_86: + label_84: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: @@ -3292,10 +3284,10 @@ boolean isPseudoElement = false; break; default: jj_la1[129] = jj_gen; - break label_86; + break label_84; } jj_consume_token(COMMA); - label_87: + label_85: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -3303,13 +3295,13 @@ boolean isPseudoElement = false; break; default: jj_la1[130] = jj_gen; - break label_87; + break label_85; } jj_consume_token(S); } input = jj_consume_token(IDENT); strings.add(input.image); - label_88: + label_86: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -3317,7 +3309,7 @@ boolean isPseudoElement = false; break; default: jj_la1[131] = jj_gen; - break label_88; + break label_86; } jj_consume_token(S); } @@ -3331,7 +3323,7 @@ boolean isPseudoElement = false; ArrayList<VariableNode> args = null; String body; jj_consume_token(MIXIN_SYM); - label_89: + label_87: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -3339,7 +3331,7 @@ boolean isPseudoElement = false; break; default: jj_la1[132] = jj_gen; - break label_89; + break label_87; } jj_consume_token(S); } @@ -3352,7 +3344,7 @@ boolean isPseudoElement = false; name = functionName(); args = arglist(); jj_consume_token(RPARAN); - label_90: + label_88: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -3360,7 +3352,7 @@ boolean isPseudoElement = false; break; default: jj_la1[133] = jj_gen; - break label_90; + break label_88; } jj_consume_token(S); } @@ -3371,7 +3363,7 @@ boolean isPseudoElement = false; throw new ParseException(); } jj_consume_token(LBRACE); - label_91: + label_89: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -3379,12 +3371,12 @@ boolean isPseudoElement = false; break; default: jj_la1[135] = jj_gen; - break label_91; + break label_89; } jj_consume_token(S); } documentHandler.startMixinDirective(name, args); - label_92: + label_90: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: @@ -3415,7 +3407,7 @@ boolean isPseudoElement = false; break; default: jj_la1[136] = jj_gen; - break label_92; + break label_90; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: @@ -3455,7 +3447,7 @@ boolean isPseudoElement = false; } } jj_consume_token(RBRACE); - label_93: + label_91: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -3463,7 +3455,7 @@ boolean isPseudoElement = false; break; default: jj_la1[138] = jj_gen; - break label_93; + break label_91; } jj_consume_token(S); } @@ -3477,7 +3469,7 @@ boolean isPseudoElement = false; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case VARIABLE: arg = mixinArg(); - label_94: + label_92: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: @@ -3485,10 +3477,10 @@ boolean isPseudoElement = false; break; default: jj_la1[139] = jj_gen; - break label_94; + break label_92; } jj_consume_token(COMMA); - label_95: + label_93: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -3496,7 +3488,7 @@ boolean isPseudoElement = false; break; default: jj_la1[140] = jj_gen; - break label_95; + break label_93; } jj_consume_token(S); } @@ -3542,7 +3534,7 @@ boolean isPseudoElement = false; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COLON: jj_consume_token(COLON); - label_96: + label_94: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -3550,23 +3542,23 @@ boolean isPseudoElement = false; break; default: jj_la1[142] = jj_gen; - break label_96; + break label_94; } jj_consume_token(S); } first = nonVariableTerm(null); prev = first; - label_97: + label_95: while (true) { if (jj_2_5(3)) { ; } else { - break label_97; + break label_95; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: jj_consume_token(COMMA); - label_98: + label_96: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -3574,7 +3566,7 @@ boolean isPseudoElement = false; break; default: jj_la1[143] = jj_gen; - break label_98; + break label_96; } jj_consume_token(S); } @@ -3647,7 +3639,7 @@ boolean isPseudoElement = false; case FUNCTION: first = term(null); args.add(first); prev = first; - label_99: + label_97: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: @@ -3688,12 +3680,12 @@ boolean isPseudoElement = false; break; default: jj_la1[147] = jj_gen; - break label_99; + break label_97; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COLON: jj_consume_token(COLON); - label_100: + label_98: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -3701,7 +3693,7 @@ boolean isPseudoElement = false; break; default: jj_la1[148] = jj_gen; - break label_100; + break label_98; } jj_consume_token(S); } @@ -3713,7 +3705,7 @@ boolean isPseudoElement = false; next = term(prev); prev.setNextLexicalUnit(next); prev = next; } - label_101: + label_99: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: @@ -3721,10 +3713,10 @@ boolean isPseudoElement = false; break; default: jj_la1[150] = jj_gen; - break label_101; + break label_99; } jj_consume_token(COMMA); - label_102: + label_100: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -3732,13 +3724,13 @@ boolean isPseudoElement = false; break; default: jj_la1[151] = jj_gen; - break label_102; + break label_100; } jj_consume_token(S); } first = term(null); args.add(first); prev = first; - label_103: + label_101: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: @@ -3779,12 +3771,12 @@ boolean isPseudoElement = false; break; default: jj_la1[152] = jj_gen; - break label_103; + break label_101; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COLON: jj_consume_token(COLON); - label_104: + label_102: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -3792,7 +3784,7 @@ boolean isPseudoElement = false; break; default: jj_la1[153] = jj_gen; - break label_104; + break label_102; } jj_consume_token(S); } @@ -3818,7 +3810,7 @@ boolean isPseudoElement = false; String name; ArrayList<LexicalUnitImpl> args=null; jj_consume_token(INCLUDE_SYM); - label_105: + label_103: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -3826,7 +3818,7 @@ boolean isPseudoElement = false; break; default: jj_la1[156] = jj_gen; - break label_105; + break label_103; } jj_consume_token(S); } @@ -3843,7 +3835,7 @@ boolean isPseudoElement = false; name = functionName(); args = argValuelist(); jj_consume_token(RPARAN); - label_106: + label_104: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -3851,7 +3843,7 @@ boolean isPseudoElement = false; break; default: jj_la1[157] = jj_gen; - break label_106; + break label_104; } jj_consume_token(S); } @@ -3866,23 +3858,20 @@ boolean isPseudoElement = false; case LBRACE: includeDirectiveBlockContents(); break; - case SEMICOLON: - includeDirectiveTerminator(); - break; default: jj_la1[159] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + semicolonTerminator(); } documentHandler.endInclude(); } - final public void includeDirectiveTerminator() throws ParseException { - try { - label_107: + final public void semicolonTerminator() throws ParseException { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case SEMICOLON: + label_105: while (true) { jj_consume_token(SEMICOLON); - label_108: + label_106: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: @@ -3890,7 +3879,7 @@ boolean isPseudoElement = false; break; default: jj_la1[160] = jj_gen; - break label_108; + break label_106; } jj_consume_token(S); } @@ -3900,29 +3889,44 @@ boolean isPseudoElement = false; break; default: jj_la1[161] = jj_gen; - break label_107; + break label_105; } } - } catch (ParseException e) { - acceptMissingSemicolonBeforeRbrace(e); + break; + default: + jj_la1[162] = jj_gen; + acceptMissingSemicolon(RBRACE, EOF); + } + } + + void acceptMissingSemicolon(Integer... acceptedTerminators) throws ParseException, ParseException { + Token next = getToken(1); + ArrayList<Integer> terminators = new ArrayList<Integer>(Arrays.asList(acceptedTerminators)); + if (!terminators.contains(next.kind)){ + String message = "encountered \u005c"" + next.image + "\u005c". Was expecting one of \u005c";\u005c""; + for(int term : acceptedTerminators){ + message += ", " + tokenImage[term]; + } + ParseException e = new ParseException(message); + throw e; } } final public void includeDirectiveBlockContents() throws ParseException { jj_consume_token(LBRACE); - label_109: + label_107: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[162] = jj_gen; - break label_109; + jj_la1[163] = jj_gen; + break label_107; } jj_consume_token(S); } - label_110: + label_108: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: @@ -3944,8 +3948,8 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[163] = jj_gen; - break label_110; + jj_la1[164] = jj_gen; + break label_108; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: @@ -3969,21 +3973,21 @@ boolean isPseudoElement = false; keyframeSelector(); break; default: - jj_la1[164] = jj_gen; + jj_la1[165] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } jj_consume_token(RBRACE); - label_111: + label_109: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[165] = jj_gen; - break label_111; + jj_la1[166] = jj_gen; + break label_109; } jj_consume_token(S); } @@ -4006,28 +4010,28 @@ boolean isPseudoElement = false; //refactor, remove those 3 LOOKAHEAD(5). n = jj_consume_token(VARIABLE); variable = n.image; - label_112: + label_110: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[166] = jj_gen; - break label_112; + jj_la1[167] = jj_gen; + break label_110; } jj_consume_token(S); } jj_consume_token(COLON); - label_113: + label_111: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[167] = jj_gen; - break label_113; + jj_la1[168] = jj_gen; + break label_111; } jj_consume_token(S); } @@ -4042,19 +4046,19 @@ boolean isPseudoElement = false; type = jj_consume_token(CONTAINS); break; default: - jj_la1[168] = jj_gen; + jj_la1[169] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_114: + label_112: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[169] = jj_gen; - break label_114; + jj_la1[170] = jj_gen; + break label_112; } jj_consume_token(S); } @@ -4064,19 +4068,19 @@ boolean isPseudoElement = false; jj_consume_token(RPARAN); break; default: - jj_la1[170] = jj_gen; + jj_la1[171] = jj_gen; ; } jj_consume_token(COMMA); - label_115: + label_113: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[171] = jj_gen; - break label_115; + jj_la1[172] = jj_gen; + break label_113; } jj_consume_token(S); } @@ -4084,35 +4088,35 @@ boolean isPseudoElement = false; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: jj_consume_token(COMMA); - label_116: + label_114: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[172] = jj_gen; - break label_116; + jj_la1[173] = jj_gen; + break label_114; } jj_consume_token(S); } n = jj_consume_token(IDENT); separator = n.image; - label_117: + label_115: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[173] = jj_gen; - break label_117; + jj_la1[174] = jj_gen; + break label_115; } jj_consume_token(S); } break; default: - jj_la1[174] = jj_gen; + jj_la1[175] = jj_gen; ; } jj_consume_token(RPARAN); @@ -4132,28 +4136,28 @@ boolean isPseudoElement = false; default: break; } - label_118: + label_116: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[175] = jj_gen; - break label_118; + jj_la1[176] = jj_gen; + break label_116; } jj_consume_token(S); } jj_consume_token(SEMICOLON); - label_119: + label_117: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[176] = jj_gen; - break label_119; + jj_la1[177] = jj_gen; + break label_117; } jj_consume_token(S); } @@ -4170,41 +4174,41 @@ boolean isPseudoElement = false; Token n = null; n = jj_consume_token(VARIABLE); variable = n.image; - label_120: + label_118: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[177] = jj_gen; - break label_120; + jj_la1[178] = jj_gen; + break label_118; } jj_consume_token(S); } jj_consume_token(COLON); - label_121: + label_119: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[178] = jj_gen; - break label_121; + jj_la1[179] = jj_gen; + break label_119; } jj_consume_token(S); } jj_consume_token(APPEND); - label_122: + label_120: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[179] = jj_gen; - break label_122; + jj_la1[180] = jj_gen; + break label_120; } jj_consume_token(S); } @@ -4214,19 +4218,19 @@ boolean isPseudoElement = false; jj_consume_token(RPARAN); break; default: - jj_la1[180] = jj_gen; + jj_la1[181] = jj_gen; ; } jj_consume_token(COMMA); - label_123: + label_121: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[181] = jj_gen; - break label_123; + jj_la1[182] = jj_gen; + break label_121; } jj_consume_token(S); } @@ -4234,35 +4238,35 @@ boolean isPseudoElement = false; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: jj_consume_token(COMMA); - label_124: + label_122: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[182] = jj_gen; - break label_124; + jj_la1[183] = jj_gen; + break label_122; } jj_consume_token(S); } n = jj_consume_token(IDENT); separator = n.image; - label_125: + label_123: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[183] = jj_gen; - break label_125; + jj_la1[184] = jj_gen; + break label_123; } jj_consume_token(S); } break; default: - jj_la1[184] = jj_gen; + jj_la1[185] = jj_gen; ; } jj_consume_token(RPARAN); @@ -4280,41 +4284,41 @@ boolean isPseudoElement = false; Token n = null; n = jj_consume_token(VARIABLE); variable = n.image; - label_126: + label_124: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[185] = jj_gen; - break label_126; + jj_la1[186] = jj_gen; + break label_124; } jj_consume_token(S); } jj_consume_token(COLON); - label_127: + label_125: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[186] = jj_gen; - break label_127; + jj_la1[187] = jj_gen; + break label_125; } jj_consume_token(S); } jj_consume_token(REMOVE); - label_128: + label_126: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[187] = jj_gen; - break label_128; + jj_la1[188] = jj_gen; + break label_126; } jj_consume_token(S); } @@ -4324,19 +4328,19 @@ boolean isPseudoElement = false; jj_consume_token(RPARAN); break; default: - jj_la1[188] = jj_gen; + jj_la1[189] = jj_gen; ; } jj_consume_token(COMMA); - label_129: + label_127: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[189] = jj_gen; - break label_129; + jj_la1[190] = jj_gen; + break label_127; } jj_consume_token(S); } @@ -4344,35 +4348,35 @@ boolean isPseudoElement = false; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: jj_consume_token(COMMA); - label_130: + label_128: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[190] = jj_gen; - break label_130; + jj_la1[191] = jj_gen; + break label_128; } jj_consume_token(S); } n = jj_consume_token(IDENT); separator = n.image; - label_131: + label_129: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[191] = jj_gen; - break label_131; + jj_la1[192] = jj_gen; + break label_129; } jj_consume_token(S); } break; default: - jj_la1[192] = jj_gen; + jj_la1[193] = jj_gen; ; } jj_consume_token(RPARAN); @@ -4392,46 +4396,46 @@ boolean isPseudoElement = false; case VARIABLE: n = jj_consume_token(VARIABLE); variable = n.image; - label_132: + label_130: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[193] = jj_gen; - break label_132; + jj_la1[194] = jj_gen; + break label_130; } jj_consume_token(S); } jj_consume_token(COLON); - label_133: + label_131: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[194] = jj_gen; - break label_133; + jj_la1[195] = jj_gen; + break label_131; } jj_consume_token(S); } break; default: - jj_la1[195] = jj_gen; + jj_la1[196] = jj_gen; ; } jj_consume_token(CONTAINS); - label_134: + label_132: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[196] = jj_gen; - break label_134; + jj_la1[197] = jj_gen; + break label_132; } jj_consume_token(S); } @@ -4441,19 +4445,19 @@ boolean isPseudoElement = false; jj_consume_token(RPARAN); break; default: - jj_la1[197] = jj_gen; + jj_la1[198] = jj_gen; ; } jj_consume_token(COMMA); - label_135: + label_133: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[198] = jj_gen; - break label_135; + jj_la1[199] = jj_gen; + break label_133; } jj_consume_token(S); } @@ -4461,35 +4465,35 @@ boolean isPseudoElement = false; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: jj_consume_token(COMMA); - label_136: + label_134: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[199] = jj_gen; - break label_136; + jj_la1[200] = jj_gen; + break label_134; } jj_consume_token(S); } n = jj_consume_token(IDENT); separator = n.image; - label_137: + label_135: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[200] = jj_gen; - break label_137; + jj_la1[201] = jj_gen; + break label_135; } jj_consume_token(S); } break; default: - jj_la1[201] = jj_gen; + jj_la1[202] = jj_gen; ; } jj_consume_token(RPARAN); @@ -4594,7 +4598,7 @@ boolean isPseudoElement = false; warnDirective(); break; default: - jj_la1[202] = jj_gen; + jj_la1[203] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4605,22 +4609,25 @@ boolean isPseudoElement = false; String content = skipStatementUntil(new int[] {SEMICOLON,RBRACE,EOF}); // TODO should evaluate the content expression, call documentHandler.debugDirective() etc. Logger.getLogger(Parser.class.getName()).log(Level.INFO, content); - try { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case SEMICOLON: jj_consume_token(SEMICOLON); - label_138: + label_136: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[203] = jj_gen; - break label_138; + jj_la1[204] = jj_gen; + break label_136; } jj_consume_token(S); } - } catch (ParseException e) { - acceptMissingSemicolonBeforeRbrace(e); + break; + default: + jj_la1[205] = jj_gen; + acceptMissingSemicolon(RBRACE, EOF); } } @@ -4629,22 +4636,25 @@ boolean isPseudoElement = false; String content = skipStatementUntil(new int[] {SEMICOLON,RBRACE,EOF}); // TODO should evaluate the content expression, call documentHandler.warnDirective() etc. Logger.getLogger(Parser.class.getName()).log(Level.SEVERE, content); - try { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case SEMICOLON: jj_consume_token(SEMICOLON); - label_139: + label_137: 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_137; } jj_consume_token(S); } - } catch (ParseException e) { - acceptMissingSemicolonBeforeRbrace(e); + break; + default: + jj_la1[207] = jj_gen; + acceptMissingSemicolon(RBRACE, EOF); } } @@ -4668,20 +4678,20 @@ boolean isPseudoElement = false; exclusive = false; break; default: - jj_la1[205] = jj_gen; + jj_la1[208] = jj_gen; jj_consume_token(-1); throw new ParseException(); } to = skipStatementUntilLeftBrace(); - label_140: + label_138: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[206] = jj_gen; - break label_140; + jj_la1[209] = jj_gen; + break label_138; } jj_consume_token(S); } @@ -4702,91 +4712,56 @@ boolean isPseudoElement = false; final public void extendDirective() throws ParseException { ArrayList<String> list; jj_consume_token(EXTEND_SYM); - label_141: + label_139: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[207] = jj_gen; - break label_141; + jj_la1[210] = jj_gen; + break label_139; } jj_consume_token(S); } list = selectorList(); documentHandler.extendDirective(list); - try { - label_142: - while (true) { - jj_consume_token(SEMICOLON); - label_143: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case S: - ; - break; - default: - jj_la1[208] = jj_gen; - break label_143; - } - jj_consume_token(S); - } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - ; - break; - default: - jj_la1[209] = jj_gen; - break label_142; - } - } - } catch (ParseException e) { - acceptMissingSemicolonBeforeRbrace(e); - } + semicolonTerminator(); } final public void contentDirective() throws ParseException { jj_consume_token(CONTENT_SYM); - label_144: + label_140: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[210] = jj_gen; - break label_144; + jj_la1[211] = jj_gen; + break label_140; } jj_consume_token(S); } - try { - label_145: + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case SEMICOLON: + jj_consume_token(SEMICOLON); + label_141: while (true) { - jj_consume_token(SEMICOLON); - label_146: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case S: - ; - break; - default: - jj_la1[211] = jj_gen; - break label_146; - } - jj_consume_token(S); - } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: + case S: ; break; default: jj_la1[212] = jj_gen; - break label_145; + break label_141; } + jj_consume_token(S); } - } catch (ParseException e) { - acceptMissingSemicolonBeforeRbrace(e); + break; + default: + jj_la1[213] = jj_gen; + acceptMissingSemicolon(RBRACE, EOF); } documentHandler.contentDirective(); } @@ -4812,28 +4787,28 @@ boolean isPseudoElement = false; LexicalUnit exp; name = property(); jj_consume_token(COLON); - label_147: + label_142: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[213] = jj_gen; - break label_147; + jj_la1[214] = jj_gen; + break label_142; } jj_consume_token(S); } jj_consume_token(LBRACE); - label_148: + label_143: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[214] = jj_gen; - break label_148; + jj_la1[215] = jj_gen; + break label_143; } jj_consume_token(S); } @@ -4844,29 +4819,29 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[215] = jj_gen; + jj_la1[216] = jj_gen; ; } - label_149: + label_144: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[216] = jj_gen; - break label_149; + jj_la1[217] = jj_gen; + break label_144; } jj_consume_token(SEMICOLON); - label_150: + label_145: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[217] = jj_gen; - break label_150; + jj_la1[218] = jj_gen; + break label_145; } jj_consume_token(S); } @@ -4876,21 +4851,21 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[218] = jj_gen; + jj_la1[219] = jj_gen; ; } } jj_consume_token(RBRACE); documentHandler.endNestedProperties(name); - label_151: + label_146: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[219] = jj_gen; - break label_151; + jj_la1[220] = jj_gen; + break label_146; } jj_consume_token(S); } @@ -4907,7 +4882,7 @@ LexicalUnit exp; debuggingDirective(); break; default: - jj_la1[220] = jj_gen; + jj_la1[221] = jj_gen; if (jj_2_6(2147483647)) { styleRule(); } else if (jj_2_7(3)) { @@ -4928,7 +4903,7 @@ LexicalUnit exp; styleRule(); break; default: - jj_la1[221] = jj_gen; + jj_la1[222] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4973,15 +4948,15 @@ LexicalUnit exp; name = property(); save = token; jj_consume_token(COLON); - label_152: + label_147: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[222] = jj_gen; - break label_152; + jj_la1[223] = jj_gen; + break label_147; } jj_consume_token(S); } @@ -5025,7 +5000,7 @@ LexicalUnit exp; important = prio(); break; default: - jj_la1[223] = jj_gen; + jj_la1[224] = jj_gen; ; } Token next = getToken(1); @@ -5044,15 +5019,15 @@ LexicalUnit exp; break; case LBRACE: jj_consume_token(LBRACE); - label_153: + label_148: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[224] = jj_gen; - break label_153; + jj_la1[225] = jj_gen; + break label_148; } jj_consume_token(S); } @@ -5063,29 +5038,29 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[225] = jj_gen; + jj_la1[226] = jj_gen; ; } - label_154: + label_149: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[226] = jj_gen; - break label_154; + jj_la1[227] = jj_gen; + break label_149; } jj_consume_token(SEMICOLON); - label_155: + label_150: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[227] = jj_gen; - break label_155; + jj_la1[228] = jj_gen; + break label_150; } jj_consume_token(S); } @@ -5095,27 +5070,27 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[228] = jj_gen; + jj_la1[229] = jj_gen; ; } } jj_consume_token(RBRACE); - label_156: + label_151: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[229] = jj_gen; - break label_156; + jj_la1[230] = jj_gen; + break label_151; } jj_consume_token(S); } documentHandler.endNestedProperties(name); break; default: - jj_la1[230] = jj_gen; + jj_la1[231] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5165,15 +5140,15 @@ LexicalUnit exp; name = property(); save = token; jj_consume_token(COLON); - label_157: + label_152: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[231] = jj_gen; - break label_157; + jj_la1[232] = jj_gen; + break label_152; } jj_consume_token(S); } @@ -5183,7 +5158,7 @@ LexicalUnit exp; important = prio(); break; default: - jj_la1[232] = jj_gen; + jj_la1[233] = jj_gen; ; } documentHandler.property(name, exp, important); @@ -5226,15 +5201,15 @@ LexicalUnit exp; */ final public boolean prio() throws ParseException { jj_consume_token(IMPORTANT_SYM); - label_158: + label_153: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[233] = jj_gen; - break label_158; + jj_la1[234] = jj_gen; + break label_153; } jj_consume_token(S); } @@ -5244,15 +5219,15 @@ LexicalUnit exp; final public boolean guarded() throws ParseException { jj_consume_token(GUARDED_SYM); - label_159: + label_154: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[234] = jj_gen; - break label_159; + jj_la1[235] = jj_gen; + break label_154; } jj_consume_token(S); } @@ -5277,15 +5252,15 @@ LexicalUnit exp; * 3. parenthesis is not supported now. */ n = jj_consume_token(COMMA); - label_160: + label_155: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[235] = jj_gen; - break label_160; + jj_la1[236] = jj_gen; + break label_155; } jj_consume_token(S); } @@ -5295,15 +5270,15 @@ LexicalUnit exp; break; case DIV: n = jj_consume_token(DIV); - label_161: + label_156: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[236] = jj_gen; - break label_161; + jj_la1[237] = jj_gen; + break label_156; } jj_consume_token(S); } @@ -5313,15 +5288,15 @@ LexicalUnit exp; break; case ANY: n = jj_consume_token(ANY); - label_162: + label_157: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[237] = jj_gen; - break label_162; + jj_la1[238] = jj_gen; + break label_157; } jj_consume_token(S); } @@ -5331,15 +5306,15 @@ LexicalUnit exp; break; case MOD: n = jj_consume_token(MOD); - label_163: + label_158: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[238] = jj_gen; - break label_163; + jj_la1[239] = jj_gen; + break label_158; } jj_consume_token(S); } @@ -5349,7 +5324,7 @@ LexicalUnit exp; break; case PLUS: n = jj_consume_token(PLUS); - label_164: + label_159: while (true) { jj_consume_token(S); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -5357,8 +5332,8 @@ LexicalUnit exp; ; break; default: - jj_la1[239] = jj_gen; - break label_164; + jj_la1[240] = jj_gen; + break label_159; } } {if (true) return LexicalUnitImpl.createAdd(n.beginLine, @@ -5367,7 +5342,7 @@ LexicalUnit exp; break; case MINUS: n = jj_consume_token(MINUS); - label_165: + label_160: while (true) { jj_consume_token(S); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -5375,8 +5350,8 @@ LexicalUnit exp; ; break; default: - jj_la1[240] = jj_gen; - break label_165; + jj_la1[241] = jj_gen; + break label_160; } } {if (true) return LexicalUnitImpl.createMinus(n.beginLine, @@ -5384,7 +5359,7 @@ LexicalUnit exp; prev);} break; default: - jj_la1[241] = jj_gen; + jj_la1[242] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5399,12 +5374,12 @@ LexicalUnit exp; char op; first = term(null); res = first; - label_166: + label_161: while (true) { if (jj_2_8(2)) { ; } else { - break label_166; + break label_161; } if (jj_2_9(2)) { res = operator(res); @@ -5431,7 +5406,7 @@ LexicalUnit exp; {if (true) return '+';} break; default: - jj_la1[242] = jj_gen; + jj_la1[243] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5484,7 +5459,7 @@ LexicalUnit exp; result = variableTerm(prev); break; default: - jj_la1[243] = jj_gen; + jj_la1[244] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5537,7 +5512,7 @@ LexicalUnitImpl result = null; op = unaryOperator(); break; default: - jj_la1[244] = jj_gen; + jj_la1[245] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -5653,7 +5628,7 @@ LexicalUnitImpl result = null; result = function(op, prev); break; default: - jj_la1[245] = jj_gen; + jj_la1[246] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5686,7 +5661,7 @@ LexicalUnitImpl result = null; s+="."; break; default: - jj_la1[246] = jj_gen; + jj_la1[247] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -5703,7 +5678,7 @@ LexicalUnitImpl result = null; n = jj_consume_token(FROM); break; default: - jj_la1[247] = jj_gen; + jj_la1[248] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5750,25 +5725,25 @@ LexicalUnitImpl result = null; result = unicode(prev); break; default: - jj_la1[248] = jj_gen; + jj_la1[249] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[249] = jj_gen; + jj_la1[250] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_167: + label_162: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[250] = jj_gen; - break label_167; + jj_la1[251] = jj_gen; + break label_162; } jj_consume_token(S); } @@ -5784,15 +5759,15 @@ LexicalUnitImpl result = null; Token n; LexicalUnit params = null; n = jj_consume_token(FUNCTION); - label_168: + label_163: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[251] = jj_gen; - break label_168; + jj_la1[252] = jj_gen; + break label_163; } jj_consume_token(S); } @@ -5843,7 +5818,7 @@ LexicalUnitImpl result = null; params = expr(); break; default: - jj_la1[252] = jj_gen; + jj_la1[253] = jj_gen; ; } jj_consume_token(RPARAN); @@ -6335,15 +6310,15 @@ LexicalUnitImpl result = null; // TODO required by original parser but not used by Vaadin? final public void _parseRule() throws ParseException { String ret = null; - label_169: + label_164: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[253] = jj_gen; - break label_169; + jj_la1[254] = jj_gen; + break label_164; } jj_consume_token(S); } @@ -6378,7 +6353,7 @@ LexicalUnitImpl result = null; fontFace(); break; default: - jj_la1[254] = jj_gen; + jj_la1[255] = jj_gen; ret = skipStatement(); if ((ret == null) || (ret.length() == 0)) { {if (true) return;} @@ -6393,15 +6368,15 @@ LexicalUnitImpl result = null; } final public void _parseImportRule() throws ParseException { - label_170: + label_165: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[255] = jj_gen; - break label_170; + jj_la1[256] = jj_gen; + break label_165; } jj_consume_token(S); } @@ -6409,15 +6384,15 @@ LexicalUnitImpl result = null; } final public void _parseMediaRule() throws ParseException { - label_171: + label_166: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[256] = jj_gen; - break label_171; + jj_la1[257] = jj_gen; + break label_166; } jj_consume_token(S); } @@ -6425,15 +6400,15 @@ LexicalUnitImpl result = null; } final public void _parseDeclarationBlock() throws ParseException { - label_172: + label_167: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[257] = jj_gen; - break label_172; + jj_la1[258] = jj_gen; + break label_167; } jj_consume_token(S); } @@ -6443,29 +6418,29 @@ LexicalUnitImpl result = null; declaration(); break; default: - jj_la1[258] = jj_gen; + jj_la1[259] = jj_gen; ; } - label_173: + label_168: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[259] = jj_gen; - break label_173; + jj_la1[260] = jj_gen; + break label_168; } jj_consume_token(SEMICOLON); - label_174: + label_169: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[260] = jj_gen; - break label_174; + jj_la1[261] = jj_gen; + break label_169; } jj_consume_token(S); } @@ -6475,7 +6450,7 @@ LexicalUnitImpl result = null; declaration(); break; default: - jj_la1[261] = jj_gen; + jj_la1[262] = jj_gen; ; } } @@ -6484,15 +6459,15 @@ LexicalUnitImpl result = null; final public ArrayList<String> _parseSelectors() throws ParseException { ArrayList<String> p = null; try { - label_175: + label_170: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[262] = jj_gen; - break label_175; + jj_la1[263] = jj_gen; + break label_170; } jj_consume_token(S); } @@ -6504,13 +6479,6 @@ LexicalUnitImpl result = null; throw new Error("Missing return statement in function"); } - void acceptMissingSemicolonBeforeRbrace(ParseException parseException) throws ParseException { - Token next = getToken(1); - if (next.kind != RBRACE && next.kind!=EOF) { - throw parseException; - } - } - private boolean jj_2_1(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_1(); } @@ -6574,25 +6542,10 @@ LexicalUnitImpl result = null; finally { jj_save(8, xla); } } - private boolean jj_3R_194() { - if (jj_scan_token(VARIABLE)) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(1)) { jj_scanpos = xsp; break; } - } - if (jj_scan_token(COLON)) return true; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(1)) { jj_scanpos = xsp; break; } - } - return false; - } - - private boolean jj_3R_179() { + private boolean jj_3R_174() { Token xsp; xsp = jj_scanpos; - if (jj_3R_194()) jj_scanpos = xsp; + if (jj_3R_189()) jj_scanpos = xsp; if (jj_scan_token(CONTAINS)) return true; while (true) { xsp = jj_scanpos; @@ -6602,12 +6555,12 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_212() { - if (jj_3R_211()) return true; + private boolean jj_3R_209() { + if (jj_3R_208()) return true; return false; } - private boolean jj_3R_211() { + private boolean jj_3R_208() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(18)) { @@ -6624,64 +6577,55 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_191() { + private boolean jj_3R_186() { if (jj_scan_token(S)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_212()) jj_scanpos = xsp; + if (jj_3R_209()) jj_scanpos = xsp; return false; } - private boolean jj_3R_176() { - if (jj_3R_186()) return true; + private boolean jj_3R_171() { + if (jj_3R_181()) return true; if (jj_scan_token(COLON)) return true; Token xsp; while (true) { xsp = jj_scanpos; if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } - if (jj_3R_187()) return true; + if (jj_3R_182()) return true; xsp = jj_scanpos; - if (jj_3R_188()) jj_scanpos = xsp; - if (jj_3R_189()) return true; - while (true) { - xsp = jj_scanpos; - if (jj_3R_189()) { jj_scanpos = xsp; break; } - } + if (jj_3R_183()) jj_scanpos = xsp; + if (jj_3R_184()) return true; return false; } - private boolean jj_3R_190() { - if (jj_3R_211()) return true; + private boolean jj_3R_185() { + if (jj_3R_208()) return true; return false; } - private boolean jj_3R_177() { + private boolean jj_3R_172() { Token xsp; xsp = jj_scanpos; - if (jj_3R_190()) { + if (jj_3R_185()) { jj_scanpos = xsp; - if (jj_3R_191()) return true; + if (jj_3R_186()) return true; } return false; } - private boolean jj_3R_262() { + private boolean jj_3R_260() { if (jj_scan_token(HASH)) return true; return false; } - private boolean jj_3_7() { - if (jj_3R_183()) return true; - return false; - } - - private boolean jj_3R_279() { + private boolean jj_3R_277() { if (jj_scan_token(IDENT)) return true; return false; } - private boolean jj_3R_280() { + private boolean jj_3R_278() { if (jj_scan_token(FUNCTION)) return true; Token xsp; while (true) { @@ -6692,42 +6636,47 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_201() { - if (jj_scan_token(LBRACE)) return true; + private boolean jj_3_7() { + if (jj_3R_178()) return true; return false; } - private boolean jj_3R_278() { - if (jj_scan_token(COLON)) return true; + private boolean jj_3R_196() { + if (jj_scan_token(LBRACE)) return true; return false; } - private boolean jj_3R_200() { - if (jj_3R_187()) return true; + private boolean jj_3R_276() { + if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_265() { + private boolean jj_3R_263() { if (jj_scan_token(COLON)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_278()) jj_scanpos = xsp; + if (jj_3R_276()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_279()) { + if (jj_3R_277()) { jj_scanpos = xsp; - if (jj_3R_280()) return true; + if (jj_3R_278()) return true; } return false; } - private boolean jj_3_6() { + private boolean jj_3R_195() { if (jj_3R_182()) return true; + return false; + } + + private boolean jj_3_6() { + if (jj_3R_177()) return true; if (jj_scan_token(LBRACE)) return true; return false; } - private boolean jj_3R_183() { - if (jj_3R_199()) return true; + private boolean jj_3R_178() { + if (jj_3R_194()) return true; if (jj_scan_token(COLON)) return true; Token xsp; while (true) { @@ -6735,105 +6684,140 @@ LexicalUnitImpl result = null; if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_200()) { + if (jj_3R_195()) { jj_scanpos = xsp; - if (jj_3R_201()) return true; + if (jj_3R_196()) return true; } return false; } - private boolean jj_3R_268() { - if (jj_3R_187()) return true; + private boolean jj_3R_266() { + if (jj_3R_182()) return true; return false; } - private boolean jj_3R_254() { - if (jj_scan_token(FUNCTION)) return true; + private boolean jj_3R_207() { + if (true) { jj_la = 0; jj_scanpos = jj_lastpos; return false;} + return false; + } + + private boolean jj_3R_243() { + if (jj_scan_token(SEMICOLON)) return true; Token xsp; while (true) { xsp = jj_scanpos; if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } - xsp = jj_scanpos; - if (jj_3R_268()) jj_scanpos = xsp; - if (jj_scan_token(RPARAN)) return true; return false; } - private boolean jj_3R_241() { - if (jj_3R_258()) return true; + private boolean jj_3R_252() { + if (jj_scan_token(FUNCTION)) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(1)) { jj_scanpos = xsp; break; } + } + xsp = jj_scanpos; + if (jj_3R_266()) jj_scanpos = xsp; + if (jj_scan_token(RPARAN)) return true; return false; } - private boolean jj_3R_240() { - if (jj_3R_257()) return true; + private boolean jj_3R_206() { + Token xsp; + if (jj_3R_243()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3R_243()) { jj_scanpos = xsp; break; } + } return false; } - private boolean jj_3R_239() { - if (jj_3R_256()) return true; + private boolean jj_3R_184() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_206()) { + jj_scanpos = xsp; + if (jj_3R_207()) return true; + } return false; } - private boolean jj_3R_290() { + private boolean jj_3R_288() { if (jj_scan_token(STRING)) return true; return false; } - private boolean jj_3R_288() { + private boolean jj_3R_286() { if (jj_scan_token(STARMATCH)) return true; return false; } private boolean jj_3R_287() { + if (jj_scan_token(IDENT)) return true; + return false; + } + + private boolean jj_3R_285() { if (jj_scan_token(DOLLARMATCH)) return true; return false; } - private boolean jj_3R_289() { - if (jj_scan_token(IDENT)) return true; + private boolean jj_3R_238() { + if (jj_3R_256()) return true; return false; } - private boolean jj_3R_286() { + private boolean jj_3R_284() { if (jj_scan_token(CARETMATCH)) return true; return false; } - private boolean jj_3R_285() { + private boolean jj_3R_237() { + if (jj_3R_255()) return true; + return false; + } + + private boolean jj_3R_283() { if (jj_scan_token(DASHMATCH)) return true; return false; } - private boolean jj_3R_284() { + private boolean jj_3R_236() { + if (jj_3R_254()) return true; + return false; + } + + private boolean jj_3R_282() { if (jj_scan_token(INCLUDES)) return true; return false; } - private boolean jj_3R_270() { + private boolean jj_3R_268() { if (jj_scan_token(INTERPOLATION)) return true; return false; } - private boolean jj_3R_283() { + private boolean jj_3R_281() { if (jj_scan_token(EQ)) return true; return false; } - private boolean jj_3R_277() { + private boolean jj_3R_275() { Token xsp; xsp = jj_scanpos; + if (jj_3R_281()) { + jj_scanpos = xsp; + if (jj_3R_282()) { + jj_scanpos = xsp; if (jj_3R_283()) { jj_scanpos = xsp; if (jj_3R_284()) { jj_scanpos = xsp; if (jj_3R_285()) { jj_scanpos = xsp; - if (jj_3R_286()) { - jj_scanpos = xsp; - if (jj_3R_287()) { - jj_scanpos = xsp; - if (jj_3R_288()) return true; + if (jj_3R_286()) return true; } } } @@ -6844,9 +6828,9 @@ LexicalUnitImpl result = null; if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_289()) { + if (jj_3R_287()) { jj_scanpos = xsp; - if (jj_3R_290()) return true; + if (jj_3R_288()) return true; } while (true) { xsp = jj_scanpos; @@ -6855,7 +6839,7 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_264() { + private boolean jj_3R_262() { if (jj_scan_token(LBRACKET)) return true; Token xsp; while (true) { @@ -6868,12 +6852,12 @@ LexicalUnitImpl result = null; if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_277()) jj_scanpos = xsp; + if (jj_3R_275()) jj_scanpos = xsp; if (jj_scan_token(RBRACKET)) return true; return false; } - private boolean jj_3R_180() { + private boolean jj_3R_175() { if (jj_scan_token(COMMA)) return true; Token xsp; while (true) { @@ -6883,112 +6867,112 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_282() { + private boolean jj_3R_280() { if (jj_scan_token(INTERPOLATION)) return true; return false; } - private boolean jj_3R_248() { + private boolean jj_3R_246() { if (jj_scan_token(PARENT)) return true; return false; } - private boolean jj_3R_247() { + private boolean jj_3R_245() { if (jj_scan_token(ANY)) return true; return false; } - private boolean jj_3R_255() { - if (jj_scan_token(DOT)) return true; + private boolean jj_3_5() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_175()) jj_scanpos = xsp; + if (jj_3R_176()) return true; return false; } - private boolean jj_3R_238() { + private boolean jj_3R_259() { Token xsp; xsp = jj_scanpos; - if (jj_3R_255()) jj_scanpos = xsp; - xsp = jj_scanpos; - if (jj_scan_token(72)) { - jj_scanpos = xsp; - if (jj_scan_token(49)) { - jj_scanpos = xsp; - if (jj_scan_token(50)) { + if (jj_3R_267()) { jj_scanpos = xsp; - if (jj_scan_token(52)) return true; - } - } + if (jj_3R_268()) return true; } return false; } - private boolean jj_3_5() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_180()) jj_scanpos = xsp; - if (jj_3R_181()) return true; + private boolean jj_3R_267() { + if (jj_scan_token(IDENT)) return true; return false; } - private boolean jj_3R_261() { + private boolean jj_3R_210() { Token xsp; xsp = jj_scanpos; - if (jj_3R_269()) { + if (jj_3R_244()) { jj_scanpos = xsp; - if (jj_3R_270()) return true; + if (jj_3R_245()) { + jj_scanpos = xsp; + if (jj_3R_246()) return true; + } } return false; } - private boolean jj_3R_269() { - if (jj_scan_token(IDENT)) return true; + private boolean jj_3R_244() { + Token xsp; + if (jj_3R_259()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3R_259()) { jj_scanpos = xsp; break; } + } return false; } - private boolean jj_3R_237() { - if (jj_scan_token(STRING)) return true; + private boolean jj_3R_253() { + if (jj_scan_token(DOT)) return true; return false; } - private boolean jj_3R_213() { + private boolean jj_3R_235() { Token xsp; xsp = jj_scanpos; - if (jj_3R_246()) { + if (jj_3R_253()) jj_scanpos = xsp; + xsp = jj_scanpos; + if (jj_scan_token(72)) { jj_scanpos = xsp; - if (jj_3R_247()) { + if (jj_scan_token(49)) { + jj_scanpos = xsp; + if (jj_scan_token(50)) { jj_scanpos = xsp; - if (jj_3R_248()) return true; + if (jj_scan_token(52)) return true; + } } } return false; } - private boolean jj_3R_246() { - Token xsp; - if (jj_3R_261()) return true; - while (true) { - xsp = jj_scanpos; - if (jj_3R_261()) { jj_scanpos = xsp; break; } - } + private boolean jj_3R_234() { + if (jj_scan_token(STRING)) return true; return false; } - private boolean jj_3R_236() { - if (jj_3R_254()) return true; + private boolean jj_3R_233() { + if (jj_3R_252()) return true; return false; } - private boolean jj_3R_196() { + private boolean jj_3R_191() { Token xsp; xsp = jj_scanpos; - if (jj_3R_237()) { + if (jj_3R_234()) { jj_scanpos = xsp; - if (jj_3R_238()) { + if (jj_3R_235()) { jj_scanpos = xsp; - if (jj_3R_239()) { + if (jj_3R_236()) { jj_scanpos = xsp; - if (jj_3R_240()) { + if (jj_3R_237()) { jj_scanpos = xsp; - if (jj_3R_241()) return true; + if (jj_3R_238()) return true; } } } @@ -6996,260 +6980,266 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_235() { - if (jj_scan_token(DIMEN)) return true; - return false; - } - - private boolean jj_3R_276() { + private boolean jj_3R_274() { Token xsp; xsp = jj_scanpos; - if (jj_3R_281()) { + if (jj_3R_279()) { jj_scanpos = xsp; - if (jj_3R_282()) return true; + if (jj_3R_280()) return true; } return false; } - private boolean jj_3R_281() { + private boolean jj_3R_279() { if (jj_scan_token(IDENT)) return true; return false; } - private boolean jj_3R_234() { - if (jj_scan_token(KHZ)) return true; - return false; - } - - private boolean jj_3R_233() { - if (jj_scan_token(HZ)) return true; - return false; - } - - private boolean jj_3R_263() { + private boolean jj_3R_261() { if (jj_scan_token(DOT)) return true; Token xsp; - if (jj_3R_276()) return true; + if (jj_3R_274()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_276()) { jj_scanpos = xsp; break; } + if (jj_3R_274()) { jj_scanpos = xsp; break; } } return false; } private boolean jj_3R_232() { - if (jj_scan_token(MS)) return true; + if (jj_scan_token(DIMEN)) return true; return false; } private boolean jj_3R_231() { - if (jj_scan_token(SECOND)) return true; + if (jj_scan_token(KHZ)) return true; return false; } private boolean jj_3R_230() { - if (jj_scan_token(GRAD)) return true; + if (jj_scan_token(HZ)) return true; return false; } - private boolean jj_3R_252() { - if (jj_3R_265()) return true; + private boolean jj_3R_250() { + if (jj_3R_263()) return true; return false; } - private boolean jj_3R_275() { - if (jj_3R_265()) return true; + private boolean jj_3R_273() { + if (jj_3R_263()) return true; return false; } private boolean jj_3R_229() { - if (jj_scan_token(RAD)) return true; + if (jj_scan_token(MS)) return true; return false; } - private boolean jj_3R_228() { - if (jj_scan_token(DEG)) return true; + private boolean jj_3R_271() { + if (jj_3R_261()) return true; return false; } - private boolean jj_3R_273() { - if (jj_3R_263()) return true; + private boolean jj_3R_228() { + if (jj_scan_token(SECOND)) return true; return false; } - private boolean jj_3R_227() { - if (jj_scan_token(EXS)) return true; + private boolean jj_3R_248() { + if (jj_3R_261()) return true; return false; } - private boolean jj_3R_250() { - if (jj_3R_263()) return true; + private boolean jj_3R_227() { + if (jj_scan_token(GRAD)) return true; return false; } private boolean jj_3R_226() { - if (jj_scan_token(REM)) return true; + if (jj_scan_token(RAD)) return true; return false; } private boolean jj_3R_225() { - if (jj_scan_token(LEM)) return true; + if (jj_scan_token(DEG)) return true; return false; } private boolean jj_3R_224() { - if (jj_scan_token(EMS)) return true; - return false; - } - - private boolean jj_3R_223() { - if (jj_scan_token(PX)) return true; + if (jj_scan_token(EXS)) return true; return false; } - private boolean jj_3R_251() { - if (jj_3R_264()) return true; + private boolean jj_3R_249() { + if (jj_3R_262()) return true; return false; } - private boolean jj_3R_274() { - if (jj_3R_264()) return true; + private boolean jj_3R_272() { + if (jj_3R_262()) return true; return false; } - private boolean jj_3R_222() { - if (jj_scan_token(IN)) return true; + private boolean jj_3R_223() { + if (jj_scan_token(REM)) return true; return false; } - private boolean jj_3R_271() { + private boolean jj_3R_269() { Token xsp; xsp = jj_scanpos; - if (jj_3R_272()) { + if (jj_3R_270()) { jj_scanpos = xsp; - if (jj_3R_273()) { + if (jj_3R_271()) { jj_scanpos = xsp; - if (jj_3R_274()) { + if (jj_3R_272()) { jj_scanpos = xsp; - if (jj_3R_275()) return true; + if (jj_3R_273()) return true; } } } return false; } - private boolean jj_3R_272() { - if (jj_3R_262()) return true; + private boolean jj_3R_270() { + if (jj_3R_260()) return true; + return false; + } + + private boolean jj_3R_222() { + if (jj_scan_token(LEM)) return true; return false; } private boolean jj_3R_221() { - if (jj_scan_token(PC)) return true; + if (jj_scan_token(EMS)) return true; return false; } - private boolean jj_3R_214() { + private boolean jj_3R_211() { Token xsp; xsp = jj_scanpos; - if (jj_3R_249()) { + if (jj_3R_247()) { jj_scanpos = xsp; - if (jj_3R_250()) { + if (jj_3R_248()) { jj_scanpos = xsp; - if (jj_3R_251()) { + if (jj_3R_249()) { jj_scanpos = xsp; - if (jj_3R_252()) return true; + if (jj_3R_250()) return true; } } } return false; } - private boolean jj_3R_249() { - if (jj_3R_262()) return true; - return false; - } - - private boolean jj_3R_220() { - if (jj_scan_token(MM)) return true; + private boolean jj_3R_247() { + if (jj_3R_260()) return true; return false; } - private boolean jj_3R_193() { + private boolean jj_3R_188() { Token xsp; - if (jj_3R_214()) return true; + if (jj_3R_211()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_214()) { jj_scanpos = xsp; break; } + if (jj_3R_211()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_219() { - if (jj_scan_token(CM)) return true; + private boolean jj_3R_220() { + if (jj_scan_token(PX)) return true; return false; } - private boolean jj_3R_192() { - if (jj_3R_213()) return true; + private boolean jj_3R_187() { + if (jj_3R_210()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_271()) { jj_scanpos = xsp; break; } + if (jj_3R_269()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_218() { - if (jj_scan_token(PT)) return true; + private boolean jj_3R_219() { + if (jj_scan_token(IN)) return true; return false; } - private boolean jj_3R_178() { + private boolean jj_3R_173() { Token xsp; xsp = jj_scanpos; - if (jj_3R_192()) { + if (jj_3R_187()) { jj_scanpos = xsp; - if (jj_3R_193()) return true; + if (jj_3R_188()) return true; } return false; } + private boolean jj_3R_218() { + if (jj_scan_token(PC)) return true; + return false; + } + + private boolean jj_3R_240() { + if (jj_3R_208()) return true; + if (jj_3R_173()) return true; + return false; + } + private boolean jj_3R_217() { - if (jj_scan_token(PERCENTAGE)) return true; + if (jj_scan_token(MM)) return true; return false; } - private boolean jj_3R_243() { - if (jj_3R_211()) return true; - if (jj_3R_178()) return true; + private boolean jj_3R_216() { + if (jj_scan_token(CM)) return true; return false; } - private boolean jj_3R_203() { - if (jj_3R_245()) return true; + private boolean jj_3R_215() { + if (jj_scan_token(PT)) return true; return false; } - private boolean jj_3R_256() { + private boolean jj_3R_214() { + if (jj_scan_token(PERCENTAGE)) return true; + return false; + } + + private boolean jj_3R_198() { + if (jj_3R_242()) return true; + return false; + } + + private boolean jj_3R_254() { if (jj_scan_token(HASH)) return true; return false; } - private boolean jj_3R_216() { + private boolean jj_3R_213() { if (jj_scan_token(NUMBER)) return true; return false; } - private boolean jj_3R_215() { - if (jj_3R_253()) return true; + private boolean jj_3R_212() { + if (jj_3R_251()) return true; return false; } - private boolean jj_3R_195() { + private boolean jj_3R_190() { Token xsp; xsp = jj_scanpos; - if (jj_3R_215()) jj_scanpos = xsp; + if (jj_3R_212()) jj_scanpos = xsp; xsp = jj_scanpos; + if (jj_3R_213()) { + jj_scanpos = xsp; + 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()) { @@ -7284,13 +7274,7 @@ LexicalUnitImpl result = null; jj_scanpos = xsp; if (jj_3R_232()) { jj_scanpos = xsp; - if (jj_3R_233()) { - jj_scanpos = xsp; - if (jj_3R_234()) { - jj_scanpos = xsp; - if (jj_3R_235()) { - jj_scanpos = xsp; - if (jj_3R_236()) return true; + if (jj_3R_233()) return true; } } } @@ -7314,12 +7298,12 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_181() { + private boolean jj_3R_176() { Token xsp; xsp = jj_scanpos; - if (jj_3R_195()) { + if (jj_3R_190()) { jj_scanpos = xsp; - if (jj_3R_196()) return true; + if (jj_3R_191()) return true; } while (true) { xsp = jj_scanpos; @@ -7328,69 +7312,49 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_257() { + private boolean jj_3R_255() { if (jj_scan_token(URL)) return true; return false; } - private boolean jj_3R_245() { - if (jj_3R_186()) return true; - return false; - } - private boolean jj_3_2() { - if (jj_3R_177()) return true; - if (jj_3R_178()) return true; + if (jj_3R_172()) return true; + if (jj_3R_173()) return true; return false; } - private boolean jj_3R_202() { + private boolean jj_3R_242() { if (jj_3R_181()) return true; return false; } - private boolean jj_3R_184() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_202()) { - jj_scanpos = xsp; - if (jj_3R_203()) return true; - } - return false; - } - - private boolean jj_3_9() { - if (jj_3R_185()) return true; - return false; - } - - private boolean jj_3R_198() { + private boolean jj_3R_193() { if (jj_scan_token(COMMA)) return true; Token xsp; while (true) { xsp = jj_scanpos; if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } - if (jj_3R_197()) return true; + if (jj_3R_192()) return true; return false; } - private boolean jj_3R_242() { - if (jj_3R_178()) return true; + private boolean jj_3R_239() { + if (jj_3R_173()) return true; return false; } - private boolean jj_3R_258() { - if (jj_scan_token(UNICODERANGE)) return true; + private boolean jj_3R_197() { + if (jj_3R_176()) return true; return false; } - private boolean jj_3R_197() { + private boolean jj_3R_192() { Token xsp; xsp = jj_scanpos; - if (jj_3R_242()) { + if (jj_3R_239()) { jj_scanpos = xsp; - if (jj_3R_243()) return true; + if (jj_3R_240()) return true; } while (true) { xsp = jj_scanpos; @@ -7403,65 +7367,85 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_267() { + private boolean jj_3R_179() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_197()) { + jj_scanpos = xsp; + if (jj_3R_198()) return true; + } + return false; + } + + private boolean jj_3_9() { + if (jj_3R_180()) return true; + return false; + } + + private boolean jj_3R_256() { + if (jj_scan_token(UNICODERANGE)) return true; + return false; + } + + private boolean jj_3_4() { + if (jj_3R_174()) return true; + return false; + } + + private boolean jj_3R_265() { if (jj_scan_token(PLUS)) return true; return false; } - private boolean jj_3R_253() { + private boolean jj_3R_251() { Token xsp; xsp = jj_scanpos; - if (jj_3R_266()) { + if (jj_3R_264()) { jj_scanpos = xsp; - if (jj_3R_267()) return true; + if (jj_3R_265()) return true; } return false; } - private boolean jj_3R_266() { + private boolean jj_3R_264() { if (jj_scan_token(MINUS)) return true; return false; } - private boolean jj_3_8() { + private boolean jj_3R_177() { + if (jj_3R_192()) return true; Token xsp; - xsp = jj_scanpos; - if (jj_3_9()) jj_scanpos = xsp; - if (jj_3R_184()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3R_193()) { jj_scanpos = xsp; break; } + } return false; } - private boolean jj_3_4() { + private boolean jj_3_8() { + Token xsp; + xsp = jj_scanpos; + if (jj_3_9()) jj_scanpos = xsp; if (jj_3R_179()) return true; return false; } - private boolean jj_3R_187() { - if (jj_3R_184()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3_8()) { jj_scanpos = xsp; break; } - } + private boolean jj_3_1() { + if (jj_3R_171()) return true; return false; } private boolean jj_3R_182() { - if (jj_3R_197()) return true; + if (jj_3R_179()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_198()) { jj_scanpos = xsp; break; } + if (jj_3_8()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3_1() { - if (jj_3R_176()) return true; - return false; - } - - private boolean jj_3R_209() { + private boolean jj_3R_204() { if (jj_scan_token(MINUS)) return true; Token xsp; if (jj_scan_token(1)) return true; @@ -7472,7 +7456,12 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_208() { + private boolean jj_3_3() { + if (jj_3R_171()) return true; + return false; + } + + private boolean jj_3R_203() { if (jj_scan_token(PLUS)) return true; Token xsp; if (jj_scan_token(1)) return true; @@ -7483,12 +7472,12 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3_3() { - if (jj_3R_176()) return true; + private boolean jj_3R_258() { + if (jj_scan_token(INTERPOLATION)) return true; return false; } - private boolean jj_3R_207() { + private boolean jj_3R_202() { if (jj_scan_token(MOD)) return true; Token xsp; while (true) { @@ -7498,7 +7487,7 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_206() { + private boolean jj_3R_201() { if (jj_scan_token(ANY)) return true; Token xsp; while (true) { @@ -7508,12 +7497,7 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_260() { - if (jj_scan_token(INTERPOLATION)) return true; - return false; - } - - private boolean jj_3R_205() { + private boolean jj_3R_200() { if (jj_scan_token(DIV)) return true; Token xsp; while (true) { @@ -7523,7 +7507,7 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_204() { + private boolean jj_3R_199() { if (jj_scan_token(COMMA)) return true; Token xsp; while (true) { @@ -7533,20 +7517,20 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_185() { + private boolean jj_3R_180() { Token xsp; xsp = jj_scanpos; - if (jj_3R_204()) { + if (jj_3R_199()) { jj_scanpos = xsp; - if (jj_3R_205()) { + if (jj_3R_200()) { jj_scanpos = xsp; - if (jj_3R_206()) { + if (jj_3R_201()) { jj_scanpos = xsp; - if (jj_3R_207()) { + if (jj_3R_202()) { jj_scanpos = xsp; - if (jj_3R_208()) { + if (jj_3R_203()) { jj_scanpos = xsp; - if (jj_3R_209()) return true; + if (jj_3R_204()) return true; } } } @@ -7555,8 +7539,8 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_210() { - if (jj_scan_token(GUARDED_SYM)) return true; + private boolean jj_3R_181() { + if (jj_scan_token(VARIABLE)) return true; Token xsp; while (true) { xsp = jj_scanpos; @@ -7565,19 +7549,28 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_186() { - if (jj_scan_token(VARIABLE)) return true; + private boolean jj_3R_241() { Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(1)) { jj_scanpos = xsp; break; } + xsp = jj_scanpos; + if (jj_3R_257()) { + jj_scanpos = xsp; + if (jj_3R_258()) return true; } return false; } - private boolean jj_3R_189() { - if (jj_scan_token(SEMICOLON)) return true; + private boolean jj_3R_257() { + if (jj_scan_token(IDENT)) return true; + return false; + } + + private boolean jj_3R_194() { Token xsp; + if (jj_3R_241()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3R_241()) { jj_scanpos = xsp; break; } + } while (true) { xsp = jj_scanpos; if (jj_scan_token(1)) { jj_scanpos = xsp; break; } @@ -7585,28 +7578,29 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_244() { + private boolean jj_3R_205() { + if (jj_scan_token(GUARDED_SYM)) return true; Token xsp; - xsp = jj_scanpos; - if (jj_3R_259()) { - jj_scanpos = xsp; - if (jj_3R_260()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_259() { - if (jj_scan_token(IDENT)) return true; + private boolean jj_3R_183() { + if (jj_3R_205()) return true; return false; } - private boolean jj_3R_199() { + private boolean jj_3R_189() { + if (jj_scan_token(VARIABLE)) return true; Token xsp; - if (jj_3R_244()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_244()) { jj_scanpos = xsp; break; } + if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } + if (jj_scan_token(COLON)) return true; while (true) { xsp = jj_scanpos; if (jj_scan_token(1)) { jj_scanpos = xsp; break; } @@ -7614,11 +7608,6 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_188() { - if (jj_3R_210()) return true; - return false; - } - /** Generated Token Manager. */ public ParserTokenManager token_source; /** Current token. */ @@ -7629,7 +7618,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[263]; + final private int[] jj_la1 = new int[264]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -7641,16 +7630,16 @@ LexicalUnitImpl result = null; jj_la1_init_3(); } private static void jj_la1_init_0() { - jj_la1_0 = new int[] {0x0,0x302,0x302,0x0,0x300,0x2,0x2,0x2,0xd4c40000,0x0,0x300,0x2,0x300,0x2,0x0,0x2,0x2,0x2,0x0,0x0,0x2,0x2,0x0,0x0,0x2,0x0,0x2,0x100000,0x2,0x0,0x2,0x2,0xd4c40000,0xd4c40000,0x2,0x2,0x2,0xd4fd1500,0x2,0xd4fd1500,0x2,0x2,0x0,0x0,0x2,0x0,0x200000,0x2,0x0,0x2,0x2,0x2,0x2,0x0,0x200000,0x2,0x0,0x2,0x391500,0xc40000,0xc40002,0xc40000,0x2,0x2,0x80120002,0x80120002,0x2,0x0,0x0,0x2,0x2,0x2,0x2,0xd4c40000,0xd4c40000,0x2,0x100000,0x2,0xd4c40000,0x2,0x84000000,0x84000000,0x84000000,0x84000000,0xd4000000,0x0,0x0,0x0,0x0,0x50000000,0x2,0x2,0x3f000,0x2,0x0,0x2,0x3f000,0x0,0x2,0x0,0x2,0x0,0x2,0x200000,0x0,0xd4c40000,0x0,0x134e0002,0x2,0xd4c40000,0xd4c40000,0x2,0x0,0x2,0x134e0002,0x0,0x2,0xd4c40000,0xd4c40000,0x2,0x134e0002,0x2,0x2,0x2,0x0,0x2,0xd4c40000,0x2,0x2,0x100000,0x2,0x2,0x2,0x2,0x0,0x2,0xd4c40000,0xd4c40000,0x2,0x100000,0x2,0x0,0x2,0x2,0x100000,0x0,0x0,0x800c0000,0x2,0x0,0x100000,0x2,0x800c0000,0x2,0x0,0x800c0000,0x2,0x2,0x0,0x200400,0x2,0x200000,0x2,0xd4c40000,0xd4c40000,0x2,0x2,0x2,0x0,0x2,0x0,0x2,0x2,0x2,0x100000,0x2,0x2,0x2,0x2,0x2,0x0,0x2,0x2,0x2,0x100000,0x2,0x2,0x2,0x0,0x2,0x2,0x2,0x100000,0x2,0x2,0x0,0x2,0x0,0x2,0x2,0x2,0x100000,0x0,0x2,0x2,0x0,0x2,0x2,0x2,0x200000,0x2,0x2,0x200000,0x2,0x2,0x0,0x200000,0x2,0x0,0x2,0x0,0xd4c40000,0x2,0x0,0x2,0x0,0x200000,0x2,0x0,0x2,0x800c0400,0x2,0x0,0x2,0x2,0x2,0x2,0x2,0x2,0x2,0x2,0x321c0000,0xc0000,0x800c0000,0xc0000,0x0,0x80000000,0x0,0x80000000,0x800c0000,0x2,0x2,0x800c0000,0x2,0xd4c40000,0x2,0x2,0x2,0x0,0x200000,0x2,0x0,0x2,}; + jj_la1_0 = new int[] {0x0,0x302,0x302,0x0,0x300,0x2,0x2,0x2,0x200000,0xd4c40000,0x0,0x300,0x2,0x300,0x2,0x0,0x2,0x200000,0x2,0x2,0x0,0x0,0x2,0x2,0x0,0x0,0x2,0x0,0x2,0x100000,0x2,0x0,0x2,0x2,0xd4c40000,0xd4c40000,0x2,0x2,0x2,0xd4fd1500,0x2,0xd4fd1500,0x2,0x2,0x0,0x0,0x2,0x0,0x200000,0x2,0x0,0x2,0x2,0x2,0x2,0x0,0x200000,0x2,0x0,0x2,0x391500,0xc40000,0xc40002,0xc40000,0x2,0x2,0x80120002,0x80120002,0x2,0x0,0x0,0x2,0x2,0x2,0x2,0xd4c40000,0xd4c40000,0x2,0x100000,0x2,0xd4c40000,0x2,0x84000000,0x84000000,0x84000000,0x84000000,0xd4000000,0x0,0x0,0x0,0x0,0x50000000,0x2,0x2,0x3f000,0x2,0x0,0x2,0x3f000,0x0,0x2,0x0,0x2,0x0,0x0,0xd4c40000,0x0,0x134e0002,0x2,0xd4c40000,0xd4c40000,0x2,0x0,0x2,0x134e0002,0x0,0x2,0xd4c40000,0xd4c40000,0x2,0x134e0002,0x2,0x2,0x2,0x0,0x2,0xd4c40000,0x2,0x2,0x100000,0x2,0x2,0x2,0x2,0x0,0x2,0xd4c40000,0xd4c40000,0x2,0x100000,0x2,0x0,0x2,0x2,0x100000,0x0,0x0,0x800c0000,0x2,0x0,0x100000,0x2,0x800c0000,0x2,0x0,0x800c0000,0x2,0x2,0x0,0x400,0x2,0x200000,0x200000,0x2,0xd4c40000,0xd4c40000,0x2,0x2,0x2,0x0,0x2,0x0,0x2,0x2,0x2,0x100000,0x2,0x2,0x2,0x2,0x2,0x0,0x2,0x2,0x2,0x100000,0x2,0x2,0x2,0x0,0x2,0x2,0x2,0x100000,0x2,0x2,0x0,0x2,0x0,0x2,0x2,0x2,0x100000,0x0,0x2,0x200000,0x2,0x200000,0x0,0x2,0x2,0x2,0x2,0x200000,0x2,0x2,0x0,0x200000,0x2,0x0,0x2,0x0,0xd4c40000,0x2,0x0,0x2,0x0,0x200000,0x2,0x0,0x2,0x800c0400,0x2,0x0,0x2,0x2,0x2,0x2,0x2,0x2,0x2,0x2,0x321c0000,0xc0000,0x800c0000,0xc0000,0x0,0x80000000,0x0,0x80000000,0x800c0000,0x2,0x2,0x800c0000,0x2,0xd4c40000,0x2,0x2,0x2,0x0,0x200000,0x2,0x0,0x2,}; } private static void jj_la1_init_1() { - jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x566000c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x80,0x0,0x0,0x120000,0x120000,0x0,0x120000,0x0,0x0,0x0,0x120000,0x0,0x0,0x564000c0,0x564000c0,0x0,0x0,0x0,0x60001c0,0x0,0x60001c0,0x0,0x0,0x0,0x40,0x0,0x80,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0xc2,0xc2,0x0,0x80,0x80,0x0,0x0,0x0,0x0,0x564000c0,0x564000c0,0x0,0x0,0x0,0xc0,0x0,0x40,0x40,0x40,0x40,0xc0,0x80,0x80,0x80,0x80,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x50000000,0x64000c0,0x50000000,0x3f,0x0,0x564000c0,0x564000c0,0x0,0x80000000,0x0,0x3f,0x0,0x0,0x564000c0,0x564000c0,0x0,0x3f,0x0,0x0,0x0,0x0,0x0,0x564000c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x564000c0,0x564000c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x40,0x160040,0x0,0x40,0x0,0x0,0x160040,0x0,0x40,0x160000,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x61200c0,0x61200c0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x6000000,0x0,0x0,0x60000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x6000000,0xc0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x160000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x160000,0x0,0x0,0x0,0x160000,0x160000,0x160000,0x0,0x0,0x160000,0x0,0x60000c0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,}; + jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x566000c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x80,0x0,0x0,0x120000,0x120000,0x0,0x120000,0x0,0x0,0x0,0x120000,0x0,0x0,0x564000c0,0x564000c0,0x0,0x0,0x0,0x60001c0,0x0,0x60001c0,0x0,0x0,0x0,0x40,0x0,0x80,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0xc2,0xc2,0x0,0x80,0x80,0x0,0x0,0x0,0x0,0x564000c0,0x564000c0,0x0,0x0,0x0,0xc0,0x0,0x40,0x40,0x40,0x40,0xc0,0x80,0x80,0x80,0x80,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x50000000,0x64000c0,0x50000000,0x3f,0x0,0x564000c0,0x564000c0,0x0,0x80000000,0x0,0x3f,0x0,0x0,0x564000c0,0x564000c0,0x0,0x3f,0x0,0x0,0x0,0x0,0x0,0x564000c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x564000c0,0x564000c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x40,0x160040,0x0,0x40,0x0,0x0,0x160040,0x0,0x40,0x160000,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x61200c0,0x61200c0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x6000000,0x0,0x0,0x0,0x0,0x60000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x6000000,0xc0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x160000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x160000,0x0,0x0,0x0,0x160000,0x160000,0x160000,0x0,0x0,0x160000,0x0,0x60000c0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,}; } private static void jj_la1_init_2() { - jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x1000,0x0,0x0,0x0,0x0,0x880,0x0,0x0,0x0,0x100,0x100,0x0,0x0,0x2008,0x2008,0x0,0x2000,0x0,0x0,0x0,0x2000,0x0,0x0,0x1119,0x1119,0x0,0x0,0x0,0x2b88,0x0,0x2b88,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x2a80,0x0,0x0,0x0,0x0,0x0,0x380,0x380,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x1119,0x1119,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x100,0x100,0x100,0x100,0x100,0x100,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x100,0x0,0x40,0x0,0x0,0x0,0x109,0x1000,0x1300,0x0,0x1109,0x1109,0x0,0x0,0x0,0x1300,0x20,0x0,0x1109,0x1109,0x0,0x1300,0x0,0x0,0x0,0x1100,0x0,0x1109,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x1109,0x1109,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x1000,0x1000,0xfffffb80,0x0,0x0,0x0,0x0,0xfffffb80,0x0,0x0,0xfffffb80,0x0,0x0,0x1100,0x0,0x0,0x0,0x0,0x2100,0x2100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0xfffffb80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffb80,0x0,0xffffe200,0x0,0x100,0x980,0xffffeb80,0x0,0x0,0xfffffb80,0x0,0x100,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,}; + jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x1000,0x0,0x0,0x0,0x0,0x880,0x0,0x0,0x0,0x0,0x100,0x100,0x0,0x0,0x2008,0x2008,0x0,0x2000,0x0,0x0,0x0,0x2000,0x0,0x0,0x1119,0x1119,0x0,0x0,0x0,0x2b88,0x0,0x2b88,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x2a80,0x0,0x0,0x0,0x0,0x0,0x380,0x380,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x1119,0x1119,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x100,0x100,0x100,0x100,0x100,0x100,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x100,0x0,0x40,0x0,0x109,0x1000,0x1300,0x0,0x1109,0x1109,0x0,0x0,0x0,0x1300,0x20,0x0,0x1109,0x1109,0x0,0x1300,0x0,0x0,0x0,0x1100,0x0,0x1109,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x1109,0x1109,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x1000,0x1000,0xfffffb80,0x0,0x0,0x0,0x0,0xfffffb80,0x0,0x0,0xfffffb80,0x0,0x0,0x1100,0x0,0x0,0x0,0x0,0x0,0x2100,0x2100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0xfffffb80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffb80,0x0,0xffffe200,0x0,0x100,0x980,0xffffeb80,0x0,0x0,0xfffffb80,0x0,0x100,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,}; } private static void jj_la1_init_3() { - jj_la1_3 = new int[] {0x8,0x80,0x80,0x2,0x80,0x0,0x0,0x0,0x75,0x0,0x80,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc5,0xc5,0x0,0x0,0x0,0xc401bf,0x0,0xc401bf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc401be,0x0,0x0,0x0,0x0,0x0,0x400000,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc7,0xc7,0x0,0x0,0x0,0x1,0x0,0x1,0x1,0x1,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x0,0x0,0x0,0x45,0x80,0x200000,0x0,0xe5,0xe5,0x0,0x0,0x0,0x200000,0x0,0x0,0xe5,0xe5,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc5,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0xf5,0xf5,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x440001,0x0,0x0,0x0,0x0,0x440001,0x0,0x0,0x440001,0x0,0x0,0x400000,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x0,0x380000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x440001,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x440001,0x0,0x400000,0x0,0x0,0x40001,0x440001,0x0,0x0,0x440001,0x0,0x37,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_3 = new int[] {0x8,0x80,0x80,0x2,0x80,0x0,0x0,0x0,0x0,0x75,0x0,0x80,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc5,0xc5,0x0,0x0,0x0,0xc401bf,0x0,0xc401bf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc401be,0x0,0x0,0x0,0x0,0x0,0x400000,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc7,0xc7,0x0,0x0,0x0,0x1,0x0,0x1,0x1,0x1,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x0,0x45,0x80,0x200000,0x0,0xe5,0xe5,0x0,0x0,0x0,0x200000,0x0,0x0,0xe5,0xe5,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc5,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0xf5,0xf5,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x440001,0x0,0x0,0x0,0x0,0x440001,0x0,0x0,0x440001,0x0,0x0,0x400000,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x0,0x380000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x440001,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x440001,0x0,0x400000,0x0,0x0,0x40001,0x440001,0x0,0x0,0x440001,0x0,0x37,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; } final private JJCalls[] jj_2_rtns = new JJCalls[9]; private boolean jj_rescan = false; @@ -7662,7 +7651,7 @@ LexicalUnitImpl result = null; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 263; i++) jj_la1[i] = -1; + for (int i = 0; i < 264; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -7672,7 +7661,7 @@ LexicalUnitImpl result = null; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 263; i++) jj_la1[i] = -1; + for (int i = 0; i < 264; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -7682,7 +7671,7 @@ LexicalUnitImpl result = null; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 263; i++) jj_la1[i] = -1; + for (int i = 0; i < 264; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -7692,7 +7681,7 @@ LexicalUnitImpl result = null; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 263; i++) jj_la1[i] = -1; + for (int i = 0; i < 264; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -7809,7 +7798,7 @@ LexicalUnitImpl result = null; la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 263; i++) { + for (int i = 0; i < 264; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1<<j)) != 0) { 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 9be5236bc3..e52ad18223 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj @@ -37,6 +37,7 @@ package com.vaadin.sass.internal.parser; import java.io.*; import java.net.*; import java.util.ArrayList; +import java.util.Arrays; import java.util.Locale; import java.util.Map; import java.util.UUID; @@ -752,15 +753,15 @@ void charset() : { Token n; } { try { - <CHARSET_SYM> ( <S> )* n=<STRING> ( <S> )* ";" + <CHARSET_SYM> ( <S> )* n=<STRING> ( <S> )* (";" | acceptMissingSemicolon(EOF)) } catch (ParseException e) { reportError(getLocator(e.currentToken.next), e); - skipStatement(); - // reportWarningSkipText(getLocator(), skipStatement()); + skipStatement(); + // reportWarningSkipText(getLocator(), skipStatement()); } catch (Exception e) { reportError(getLocator(), e); - skipStatement(); - // reportWarningSkipText(getLocator(), skipStatement()); + skipStatement(); + // reportWarningSkipText(getLocator(), skipStatement()); } } @@ -819,7 +820,7 @@ void importDeclaration() : } } ) - ( <S> )* mediaStatement(ml) ";" + ( <S> )* mediaStatement(ml) (";" | acceptMissingSemicolon(RBRACE, EOF)) ( <S> )* { if (ml.getLength() == 0) { @@ -1490,7 +1491,7 @@ void variable() : { try{ name = variableName() - ":" ( <S> )* exp=expr() ( guarded=guarded() )?(";"(<S>)*)+ + ":" ( <S> )* exp=expr() ( guarded=guarded() )? semicolonTerminator() //raw=skipStatementUntilSemiColon() { exp = replaceNullValues(exp); @@ -1765,18 +1766,27 @@ void includeDirective() : (name = property() | name = variableName(){ name = "$"+name;} | (name = functionName() args = argValuelist()) <RPARAN>(<S>)*) {documentHandler.startInclude(name, args);} - (includeDirectiveBlockContents() | includeDirectiveTerminator()) + (includeDirectiveBlockContents() | semicolonTerminator()) {documentHandler.endInclude();} } -void includeDirectiveTerminator(): +void semicolonTerminator(): {} { - try { - (";"(<S>)*)+ - } - catch (ParseException e) { - acceptMissingSemicolonBeforeRbrace(e); + (";"(<S>)*)+ | acceptMissingSemicolon(RBRACE, EOF) +} + +JAVACODE +void acceptMissingSemicolon(Integer... acceptedTerminators) throws ParseException { + Token next = getToken(1); + ArrayList<Integer> terminators = new ArrayList<Integer>(Arrays.asList(acceptedTerminators)); + if (!terminators.contains(next.kind)){ + String message = "encountered \"" + next.image + "\". Was expecting one of \";\""; + for(int term : acceptedTerminators){ + message += ", " + tokenImage[term]; + } + ParseException e = new ParseException(message); + throw e; } } @@ -2017,12 +2027,7 @@ void debugDirective() : // TODO should evaluate the content expression, call documentHandler.debugDirective() etc. Logger.getLogger(Parser.class.getName()).log(Level.INFO, content); } - try { - ";" (<S>)* - } - catch (ParseException e) { - acceptMissingSemicolonBeforeRbrace(e); - } + ( (";" (<S>)*) | acceptMissingSemicolon(RBRACE, EOF)) } void warnDirective() : @@ -2034,12 +2039,7 @@ void warnDirective() : // TODO should evaluate the content expression, call documentHandler.warnDirective() etc. Logger.getLogger(Parser.class.getName()).log(Level.SEVERE, content); } - try { - ";" (<S>)* - } - catch (ParseException e) { - acceptMissingSemicolonBeforeRbrace(e); - } + ( (";" (<S>)*) | acceptMissingSemicolon(RBRACE, EOF)) } Node forDirective() : @@ -2083,12 +2083,7 @@ void extendDirective() : (<S>)* list = selectorList() {documentHandler.extendDirective(list);} - try { - (";"(<S>)*)+ - } - catch (ParseException e) { - acceptMissingSemicolonBeforeRbrace(e); - } + semicolonTerminator() } void contentDirective() : @@ -2096,12 +2091,7 @@ void contentDirective() : { <CONTENT_SYM> (<S>)* - try { - (";"(<S>)*)+ - } - catch (ParseException e) { - acceptMissingSemicolonBeforeRbrace(e); - } + ( (";" (<S>)*) | acceptMissingSemicolon(RBRACE, EOF)) {documentHandler.contentDirective();} } @@ -3142,15 +3132,6 @@ ArrayList<String> _parseSelectors() : } } -JAVACODE -void acceptMissingSemicolonBeforeRbrace( ParseException parseException ) { - Token next = getToken(1); - if (next.kind != RBRACE && next.kind!=EOF) { - throw parseException; - } -} - - /* * Local Variables: * compile-command: javacc Parser.jj & javac Parser.java 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 0db4e4e2f8..bb0f4cbf40 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java @@ -18,6 +18,7 @@ package com.vaadin.sass.internal.parser; import java.io.*; import java.net.*; import java.util.ArrayList; +import java.util.Arrays; import java.util.Locale; import java.util.Map; import java.util.UUID; diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/Token.java b/theme-compiler/src/com/vaadin/sass/internal/parser/Token.java index 26d1121f96..ba29df7d33 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/Token.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Token.java @@ -143,4 +143,4 @@ public class Token implements java.io.Serializable { } } -/* JavaCC - OriginalChecksum=dad2146dc89e68f66e77382c9e448fb7 (do not edit this line) */ +/* JavaCC - OriginalChecksum=8b653fc6be4ca9bd10137ee3ad4c32c4 (do not edit this line) */ diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/TokenMgrError.java b/theme-compiler/src/com/vaadin/sass/internal/parser/TokenMgrError.java index f093357e96..1757cf6705 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/TokenMgrError.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/TokenMgrError.java @@ -159,4 +159,4 @@ public class TokenMgrError extends Error this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason); } } -/* JavaCC - OriginalChecksum=c7c96e9cf4a9320d03dd722437439354 (do not edit this line) */ +/* JavaCC - OriginalChecksum=525946b34c715198d7c29f668b049f5d (do not edit this line) */ |