From a52ceb96590333bbfcb7ddad4815c88c49ac97ab Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Mon, 13 May 2013 16:27:35 +0300 Subject: [PATCH] Support non-trivial SASS media selectors (#11455) This change adds support for media selectors with a query that consist of more than just a single word. Change-Id: Id6a09de8e88984ad052321ae93ffa2e7c2ba1c04 --- .../vaadin/sass/internal/parser/Parser.java | 2030 ++++++++--------- .../com/vaadin/sass/internal/parser/Parser.jj | 34 +- .../vaadin/sass/internal/tree/MediaNode.java | 3 + .../resources/automatic/css/media-import.css | 1 + .../automatic/css/media-multiple.css | 10 + .../tests/resources/automatic/css/media.css | 5 + .../automatic/scss/media-import.scss | 1 + .../automatic/scss/media-multiple.scss | 10 + .../tests/resources/automatic/scss/media.scss | 5 + 9 files changed, 1068 insertions(+), 1031 deletions(-) create mode 100644 theme-compiler/tests/resources/automatic/css/media-import.css create mode 100644 theme-compiler/tests/resources/automatic/css/media-multiple.css create mode 100644 theme-compiler/tests/resources/automatic/css/media.css create mode 100644 theme-compiler/tests/resources/automatic/scss/media-import.scss create mode 100644 theme-compiler/tests/resources/automatic/scss/media-multiple.scss create mode 100644 theme-compiler/tests/resources/automatic/scss/media.scss 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 c80e278d2f..981b9be2b9 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java @@ -152,6 +152,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { /** * This method parses only one rule (style rule or at-rule, except + * * @charset). * * @param source @@ -756,14 +757,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } jj_consume_token(S); } - switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { - case IDENT: - mediaStatement(ml); - break; - default: - jj_la1[16] = jj_gen; - ; - } + mediaStatement(ml); jj_consume_token(SEMICOLON); label_12: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -771,7 +765,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[17] = jj_gen; + jj_la1[16] = jj_gen; break label_12; } jj_consume_token(S); @@ -806,7 +800,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[18] = jj_gen; + jj_la1[17] = jj_gen; break label_13; } jj_consume_token(S); @@ -823,7 +817,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { animationname += n.image; break; default: - jj_la1[19] = jj_gen; + jj_la1[18] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -833,7 +827,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[20] = jj_gen; + jj_la1[19] = jj_gen; break label_14; } } @@ -843,7 +837,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[21] = jj_gen; + jj_la1[20] = jj_gen; break label_15; } jj_consume_token(S); @@ -857,7 +851,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[22] = jj_gen; + jj_la1[21] = jj_gen; break label_16; } jj_consume_token(S); @@ -870,7 +864,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[23] = jj_gen; + jj_la1[22] = jj_gen; break label_17; } keyframeSelector(); @@ -882,7 +876,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[24] = jj_gen; + jj_la1[23] = jj_gen; break label_18; } jj_consume_token(S); @@ -912,7 +906,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[24] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -922,7 +916,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[26] = jj_gen; + jj_la1[25] = jj_gen; break label_19; } jj_consume_token(S); @@ -934,7 +928,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[27] = jj_gen; + jj_la1[26] = jj_gen; break label_20; } jj_consume_token(S); @@ -967,7 +961,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[28] = jj_gen; + jj_la1[27] = jj_gen; break label_21; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -999,7 +993,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { microsoftExtension(); break; default: - jj_la1[29] = jj_gen; + jj_la1[28] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1011,7 +1005,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[30] = jj_gen; + jj_la1[29] = jj_gen; break label_22; } jj_consume_token(S); @@ -1041,6 +1035,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { * @exception ParseException * exception during the parse */ + /* see http://www.w3.org/TR/css3-mediaqueries/ */ final public void media() throws ParseException { boolean start = false; String ret; @@ -1053,7 +1048,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[31] = jj_gen; + jj_la1[30] = jj_gen; break label_23; } jj_consume_token(S); @@ -1068,7 +1063,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[32] = jj_gen; + jj_la1[31] = jj_gen; break label_24; } jj_consume_token(S); @@ -1113,7 +1108,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[33] = jj_gen; + jj_la1[32] = jj_gen; break label_25; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -1159,7 +1154,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { skipUnknownRule(); break; default: - jj_la1[34] = jj_gen; + jj_la1[33] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1171,7 +1166,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[35] = jj_gen; + jj_la1[34] = jj_gen; break label_26; } jj_consume_token(S); @@ -1189,33 +1184,30 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } final public void mediaStatement(MediaListImpl ml) throws ParseException { - String m; - m = medium(); - label_27: while (true) { - switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { - case COMMA: - ; - break; - default: - jj_la1[36] = jj_gen; - break label_27; + Token t; + t = getToken(1); + // loop over comma separated parts, add each to ml + while ((t.kind != LBRACE) && (t.kind != EOF) && (t.kind != SEMICOLON)) { + StringBuffer s = new StringBuffer(); + s.append(getToken(0).image); + while ((t.kind != COMMA) && (t.kind != LBRACE) && (t.kind != EOF) + && (t.kind != SEMICOLON)) { + s.append(t.image); + getNextToken(); + t = getToken(1); } - jj_consume_token(COMMA); - label_28: while (true) { - switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { - case S: - ; - break; - default: - jj_la1[37] = jj_gen; - break label_28; - } - jj_consume_token(S); + if (t.kind == COMMA) { + // skip the comma and the token before it that is still the + // active token + getNextToken(); + getNextToken(); + t = getToken(1); + } + String str = s.toString().trim(); + if (str.length() > 0) { + ml.addItem(str); } - ml.addItem(m); - m = medium(); } - ml.addItem(m); } /** @@ -1225,17 +1217,6 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { final public String medium() throws ParseException { Token n; n = jj_consume_token(IDENT); - label_29: while (true) { - switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { - case S: - ; - break; - default: - jj_la1[38] = jj_gen; - break label_29; - } - jj_consume_token(S); - } { if (true) { return convertIdent(n.image); @@ -1255,34 +1236,34 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { String pseudo = null; try { jj_consume_token(PAGE_SYM); - label_30: while (true) { + label_27: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[39] = jj_gen; - break label_30; + jj_la1[35] = jj_gen; + break label_27; } jj_consume_token(S); } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case IDENT: n = jj_consume_token(IDENT); - label_31: while (true) { + label_28: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[40] = jj_gen; - break label_31; + jj_la1[36] = jj_gen; + break label_28; } jj_consume_token(S); } break; default: - jj_la1[41] = jj_gen; + jj_la1[37] = jj_gen; ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -1290,21 +1271,21 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { pseudo = pseudo_page(); break; default: - jj_la1[42] = jj_gen; + jj_la1[38] = jj_gen; ; } if (n != null) { page = convertIdent(n.image); } jj_consume_token(LBRACE); - label_32: while (true) { + label_29: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[43] = jj_gen; - break label_32; + jj_la1[39] = jj_gen; + break label_29; } jj_consume_token(S); } @@ -1316,27 +1297,27 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[44] = jj_gen; + jj_la1[40] = jj_gen; ; } - label_33: while (true) { + label_30: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[45] = jj_gen; - break label_33; + jj_la1[41] = jj_gen; + break label_30; } jj_consume_token(SEMICOLON); - label_34: while (true) { + label_31: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[46] = jj_gen; - break label_34; + jj_la1[42] = jj_gen; + break label_31; } jj_consume_token(S); } @@ -1346,19 +1327,19 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[47] = jj_gen; + jj_la1[43] = jj_gen; ; } } jj_consume_token(RBRACE); - label_35: while (true) { + label_32: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[48] = jj_gen; - break label_35; + jj_la1[44] = jj_gen; + break label_32; } jj_consume_token(S); } @@ -1384,14 +1365,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { Token n; jj_consume_token(COLON); n = jj_consume_token(IDENT); - label_36: while (true) { + label_33: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[49] = jj_gen; - break label_36; + jj_la1[45] = jj_gen; + break label_33; } jj_consume_token(S); } @@ -1407,26 +1388,26 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { boolean start = false; try { jj_consume_token(FONT_FACE_SYM); - label_37: while (true) { + label_34: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[50] = jj_gen; - break label_37; + jj_la1[46] = jj_gen; + break label_34; } jj_consume_token(S); } jj_consume_token(LBRACE); - label_38: while (true) { + label_35: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[51] = jj_gen; - break label_38; + jj_la1[47] = jj_gen; + break label_35; } jj_consume_token(S); } @@ -1438,27 +1419,27 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[52] = jj_gen; + jj_la1[48] = jj_gen; ; } - label_39: while (true) { + label_36: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[53] = jj_gen; - break label_39; + jj_la1[49] = jj_gen; + break label_36; } jj_consume_token(SEMICOLON); - label_40: while (true) { + label_37: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[54] = jj_gen; - break label_40; + jj_la1[50] = jj_gen; + break label_37; } jj_consume_token(S); } @@ -1468,19 +1449,19 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[55] = jj_gen; + jj_la1[51] = jj_gen; ; } } jj_consume_token(RBRACE); - label_41: while (true) { + label_38: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[56] = jj_gen; - break label_41; + jj_la1[52] = jj_gen; + break label_38; } jj_consume_token(S); } @@ -1582,7 +1563,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { n = jj_consume_token(UNKNOWN); break; default: - jj_la1[57] = jj_gen; + jj_la1[53] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1617,12 +1598,12 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { connector = combinatorChar(); break; default: - jj_la1[58] = jj_gen; + jj_la1[54] = jj_gen; ; } break; default: - jj_la1[59] = jj_gen; + jj_la1[55] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1648,18 +1629,18 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { t = jj_consume_token(SIBLING); break; default: - jj_la1[60] = jj_gen; + jj_la1[56] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_42: while (true) { + label_39: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[61] = jj_gen; - break label_42; + jj_la1[57] = jj_gen; + break label_39; } jj_consume_token(S); } @@ -1677,20 +1658,20 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { String value = ""; // This is not really taking the syntax of filter rules into account n = jj_consume_token(MICROSOFT_RULE); - label_43: while (true) { + label_40: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[62] = jj_gen; - break label_43; + jj_la1[58] = jj_gen; + break label_40; } jj_consume_token(S); } name = n.image; jj_consume_token(COLON); - label_44: while (true) { + label_41: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case IDENT: n = jj_consume_token(IDENT); @@ -1739,7 +1720,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } break; default: - jj_la1[63] = jj_gen; + jj_la1[59] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1758,19 +1739,19 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[64] = jj_gen; - break label_44; + jj_la1[60] = jj_gen; + break label_41; } } jj_consume_token(SEMICOLON); - label_45: while (true) { + label_42: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[65] = jj_gen; - break label_45; + jj_la1[61] = jj_gen; + break label_42; } jj_consume_token(S); } @@ -1784,7 +1765,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { final public String property() throws ParseException { Token t; String s = ""; - label_46: while (true) { + label_43: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case IDENT: t = jj_consume_token(IDENT); @@ -1795,7 +1776,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { s += t.image; break; default: - jj_la1[66] = jj_gen; + jj_la1[62] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1805,18 +1786,18 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[67] = jj_gen; - break label_46; + jj_la1[63] = jj_gen; + break label_43; } } - label_47: while (true) { + label_44: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[68] = jj_gen; - break label_47; + jj_la1[64] = jj_gen; + break label_44; } jj_consume_token(S); } @@ -1831,14 +1812,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { final public String variableName() throws ParseException { Token n; n = jj_consume_token(VARIABLE); - label_48: while (true) { + label_45: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[69] = jj_gen; - break label_48; + jj_la1[65] = jj_gen; + break label_45; } jj_consume_token(S); } @@ -1853,14 +1834,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { final public String functionName() throws ParseException { Token n; n = jj_consume_token(FUNCTION); - label_49: while (true) { + label_46: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[70] = jj_gen; - break label_49; + jj_la1[66] = jj_gen; + break label_46; } jj_consume_token(S); } @@ -1885,20 +1866,20 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { l = selectorList(); save = token; jj_consume_token(LBRACE); - label_50: while (true) { + label_47: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[71] = jj_gen; - break label_50; + jj_la1[67] = jj_gen; + break label_47; } jj_consume_token(S); } start = true; documentHandler.startSelector(l); - label_51: while (true) { + label_48: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: case PRECEDES: @@ -1924,8 +1905,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[72] = jj_gen; - break label_51; + jj_la1[68] = jj_gen; + break label_48; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: @@ -1956,20 +1937,20 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { microsoftExtension(); break; default: - jj_la1[73] = jj_gen; + jj_la1[69] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } jj_consume_token(RBRACE); - label_52: while (true) { + label_49: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[74] = jj_gen; - break label_52; + jj_la1[70] = jj_gen; + break label_49; } jj_consume_token(S); } @@ -1998,24 +1979,24 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ArrayList selectors = new ArrayList(); String selector; selector = selector(); - label_53: while (true) { + label_50: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: ; break; default: - jj_la1[75] = jj_gen; - break label_53; + jj_la1[71] = jj_gen; + break label_50; } jj_consume_token(COMMA); - label_54: while (true) { + label_51: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[76] = jj_gen; - break label_54; + jj_la1[72] = jj_gen; + break label_51; } jj_consume_token(S); } @@ -2057,27 +2038,27 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { selector = simple_selector(selector, comb); break; default: - jj_la1[77] = jj_gen; + jj_la1[73] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_55: while (true) { + label_52: while (true) { if (jj_2_2(2)) { ; } else { - break label_55; + break label_52; } comb = combinator(); selector = simple_selector(selector, comb); } - label_56: while (true) { + label_53: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[78] = jj_gen; - break label_56; + jj_la1[74] = jj_gen; + break label_53; } jj_consume_token(S); } @@ -2126,7 +2107,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case INTERPOLATION: case IDENT: simple_current = element_name(); - label_57: while (true) { + label_54: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case LBRACKET: case DOT: @@ -2135,8 +2116,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[79] = jj_gen; - break label_57; + jj_la1[75] = jj_gen; + break label_54; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case HASH: @@ -2152,7 +2133,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { cond = pseudo(cond); break; default: - jj_la1[80] = jj_gen; + jj_la1[76] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2160,7 +2141,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { break; case HASH: cond = hash(cond); - label_58: while (true) { + label_55: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case LBRACKET: case DOT: @@ -2168,8 +2149,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[81] = jj_gen; - break label_58; + jj_la1[77] = jj_gen; + break label_55; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case DOT: @@ -2182,7 +2163,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { cond = pseudo(cond); break; default: - jj_la1[82] = jj_gen; + jj_la1[78] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2190,7 +2171,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { break; case DOT: cond = _class(cond); - label_59: while (true) { + label_56: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case LBRACKET: case DOT: @@ -2199,8 +2180,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[83] = jj_gen; - break label_59; + jj_la1[79] = jj_gen; + break label_56; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case HASH: @@ -2216,7 +2197,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { cond = pseudo(cond); break; default: - jj_la1[84] = jj_gen; + jj_la1[80] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2224,7 +2205,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { break; case COLON: cond = pseudo(cond); - label_60: while (true) { + label_57: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case LBRACKET: case DOT: @@ -2233,8 +2214,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[85] = jj_gen; - break label_60; + jj_la1[81] = jj_gen; + break label_57; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case HASH: @@ -2250,7 +2231,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { cond = pseudo(cond); break; default: - jj_la1[86] = jj_gen; + jj_la1[82] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2258,7 +2239,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { break; case LBRACKET: cond = attrib(cond); - label_61: while (true) { + label_58: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case LBRACKET: case DOT: @@ -2267,8 +2248,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[87] = jj_gen; - break label_61; + jj_la1[83] = jj_gen; + break label_58; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case HASH: @@ -2284,14 +2265,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { cond = pseudo(cond); break; default: - jj_la1[88] = jj_gen; + jj_la1[84] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } break; default: - jj_la1[89] = jj_gen; + jj_la1[85] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2344,7 +2325,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { Token t; String s = "."; jj_consume_token(DOT); - label_62: while (true) { + label_59: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case IDENT: t = jj_consume_token(IDENT); @@ -2355,7 +2336,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { s += t.image; break; default: - jj_la1[90] = jj_gen; + jj_la1[86] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2365,8 +2346,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[91] = jj_gen; - break label_62; + jj_la1[87] = jj_gen; + break label_59; } } if (pred == null) { @@ -2395,7 +2376,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case INTERPOLATION: case IDENT: - label_63: while (true) { + label_60: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case IDENT: t = jj_consume_token(IDENT); @@ -2406,7 +2387,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { s += t.image; break; default: - jj_la1[92] = jj_gen; + jj_la1[88] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2416,8 +2397,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[93] = jj_gen; - break label_63; + jj_la1[89] = jj_gen; + break label_60; } } { @@ -2443,7 +2424,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } break; default: - jj_la1[94] = jj_gen; + jj_la1[90] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2460,26 +2441,26 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { Token val = null; String attValue = null; jj_consume_token(LBRACKET); - label_64: while (true) { + label_61: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[95] = jj_gen; - break label_64; + jj_la1[91] = jj_gen; + break label_61; } jj_consume_token(S); } att = jj_consume_token(IDENT); - label_65: while (true) { + label_62: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[96] = jj_gen; - break label_65; + jj_la1[92] = jj_gen; + break label_62; } jj_consume_token(S); } @@ -2516,18 +2497,18 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { cases = 6; break; default: - jj_la1[97] = jj_gen; + jj_la1[93] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_66: while (true) { + label_63: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[98] = jj_gen; - break label_66; + jj_la1[94] = jj_gen; + break label_63; } jj_consume_token(S); } @@ -2541,24 +2522,24 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { attValue = val.image; break; default: - jj_la1[99] = jj_gen; + jj_la1[95] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_67: while (true) { + label_64: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[100] = jj_gen; - break label_67; + jj_la1[96] = jj_gen; + break label_64; } jj_consume_token(S); } break; default: - jj_la1[101] = jj_gen; + jj_la1[97] = jj_gen; ; } jj_consume_token(RBRACKET); @@ -2623,7 +2604,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { isPseudoElement = true; break; default: - jj_la1[102] = jj_gen; + jj_la1[98] = jj_gen; ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -2666,14 +2647,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { break; case FUNCTION: n = jj_consume_token(FUNCTION); - label_68: while (true) { + label_65: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[103] = jj_gen; - break label_68; + jj_la1[99] = jj_gen; + break label_65; } jj_consume_token(S); } @@ -2698,7 +2679,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } break; default: - jj_la1[104] = jj_gen; + jj_la1[100] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2737,14 +2718,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { try { name = variableName(); jj_consume_token(COLON); - label_69: while (true) { + label_66: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[105] = jj_gen; - break label_69; + jj_la1[101] = jj_gen; + break label_66; } jj_consume_token(S); } @@ -2754,19 +2735,19 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { guarded = guarded(); break; default: - jj_la1[106] = jj_gen; + jj_la1[102] = jj_gen; ; } - label_70: while (true) { + label_67: while (true) { jj_consume_token(SEMICOLON); - label_71: while (true) { + label_68: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[107] = jj_gen; - break label_71; + jj_la1[103] = jj_gen; + break label_68; } jj_consume_token(S); } @@ -2775,8 +2756,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[108] = jj_gen; - break label_70; + jj_la1[104] = jj_gen; + break label_67; } } documentHandler.variable(name, exp, guarded); @@ -2814,7 +2795,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { eachDirective(); break; default: - jj_la1[109] = jj_gen; + jj_la1[105] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2850,7 +2831,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { keyframes(); break; default: - jj_la1[110] = jj_gen; + jj_la1[106] = jj_gen; if (jj_2_3(2147483647)) { variable(); } else { @@ -2859,7 +2840,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { listModifyDirective(); break; default: - jj_la1[111] = jj_gen; + jj_la1[107] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2872,7 +2853,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { String s = null; String evaluator = ""; jj_consume_token(IF_SYM); - label_72: while (true) { + label_69: while (true) { s = booleanExpressionToken(); evaluator += s; switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -2897,25 +2878,25 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[112] = jj_gen; - break label_72; + jj_la1[108] = jj_gen; + break label_69; } } jj_consume_token(LBRACE); - label_73: while (true) { + label_70: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[113] = jj_gen; - break label_73; + jj_la1[109] = jj_gen; + break label_70; } jj_consume_token(S); } documentHandler.startIfElseDirective(); documentHandler.ifDirective(evaluator); - label_74: while (true) { + label_71: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: case PRECEDES: @@ -2938,31 +2919,31 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[114] = jj_gen; - break label_74; + jj_la1[110] = jj_gen; + break label_71; } ifContentStatement(); } jj_consume_token(RBRACE); - label_75: while (true) { + label_72: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[115] = jj_gen; - break label_75; + jj_la1[111] = jj_gen; + break label_72; } jj_consume_token(S); } - label_76: while (true) { + label_73: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case ELSE_SYM: ; break; default: - jj_la1[116] = jj_gen; - break label_76; + jj_la1[112] = jj_gen; + break label_73; } elseDirective(); } @@ -2974,21 +2955,21 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { Token n = null; String s = null; jj_consume_token(ELSE_SYM); - label_77: while (true) { + label_74: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[117] = jj_gen; - break label_77; + jj_la1[113] = jj_gen; + break label_74; } jj_consume_token(S); } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case IF: jj_consume_token(IF); - label_78: while (true) { + label_75: while (true) { s = booleanExpressionToken(); evaluator += s; switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -3013,24 +2994,24 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[118] = jj_gen; - break label_78; + jj_la1[114] = jj_gen; + break label_75; } } break; default: - jj_la1[119] = jj_gen; + jj_la1[115] = jj_gen; ; } jj_consume_token(LBRACE); - label_79: while (true) { + label_76: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[120] = jj_gen; - break label_79; + jj_la1[116] = jj_gen; + break label_76; } jj_consume_token(S); } @@ -3039,7 +3020,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } else { documentHandler.elseDirective(); } - label_80: while (true) { + label_77: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: case PRECEDES: @@ -3062,20 +3043,20 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[121] = jj_gen; - break label_80; + jj_la1[117] = jj_gen; + break label_77; } ifContentStatement(); } jj_consume_token(RBRACE); - label_81: while (true) { + label_78: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[122] = jj_gen; - break label_81; + jj_la1[118] = jj_gen; + break label_78; } jj_consume_token(S); } @@ -3140,7 +3121,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { n = jj_consume_token(NOT_EQ); break; default: - jj_la1[123] = jj_gen; + jj_la1[119] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3166,38 +3147,38 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ArrayList list = null; String listVariable = null; jj_consume_token(EACH_SYM); - label_82: while (true) { + label_79: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[124] = jj_gen; - break label_82; + jj_la1[120] = jj_gen; + break label_79; } jj_consume_token(S); } var = jj_consume_token(VARIABLE); - label_83: while (true) { + label_80: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[125] = jj_gen; - break label_83; - } + jj_la1[121] = jj_gen; + break label_80; + } jj_consume_token(S); } jj_consume_token(EACH_IN); - label_84: while (true) { + label_81: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[126] = jj_gen; - break label_84; + jj_la1[122] = jj_gen; + break label_81; } jj_consume_token(S); } @@ -3211,23 +3192,23 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { documentHandler.startEachDirective(var.image, listVariable); break; default: - jj_la1[127] = jj_gen; + jj_la1[123] = jj_gen; jj_consume_token(-1); throw new ParseException(); } jj_consume_token(LBRACE); - label_85: while (true) { + label_82: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[128] = jj_gen; - break label_85; + jj_la1[124] = jj_gen; + break label_82; } jj_consume_token(S); } - label_86: while (true) { + label_83: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: case PRECEDES: @@ -3250,20 +3231,20 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[129] = jj_gen; - break label_86; + jj_la1[125] = jj_gen; + break label_83; } ifContentStatement(); } jj_consume_token(RBRACE); - label_87: while (true) { + label_84: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[130] = jj_gen; - break label_87; + jj_la1[126] = jj_gen; + break label_84; } jj_consume_token(S); } @@ -3274,49 +3255,49 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ArrayList strings = new ArrayList(); Token input; input = jj_consume_token(IDENT); - label_88: while (true) { + label_85: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[131] = jj_gen; - break label_88; + jj_la1[127] = jj_gen; + break label_85; } jj_consume_token(S); } strings.add(input.image); - label_89: while (true) { + label_86: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: ; break; default: - jj_la1[132] = jj_gen; - break label_89; + jj_la1[128] = jj_gen; + break label_86; } jj_consume_token(COMMA); - label_90: while (true) { + label_87: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[133] = jj_gen; - break label_90; + jj_la1[129] = jj_gen; + break label_87; } jj_consume_token(S); } input = jj_consume_token(IDENT); strings.add(input.image); - label_91: while (true) { + label_88: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[134] = jj_gen; - break label_91; + jj_la1[130] = jj_gen; + break label_88; } jj_consume_token(S); } @@ -3334,14 +3315,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ArrayList args = null; String body; jj_consume_token(MIXIN_SYM); - label_92: while (true) { + label_89: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[135] = jj_gen; - break label_92; + jj_la1[131] = jj_gen; + break label_89; } jj_consume_token(S); } @@ -3354,37 +3335,37 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { name = functionName(); args = arglist(); jj_consume_token(RPARAN); - label_93: while (true) { + label_90: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[136] = jj_gen; - break label_93; + jj_la1[132] = jj_gen; + break label_90; } jj_consume_token(S); } break; default: - jj_la1[137] = jj_gen; + jj_la1[133] = jj_gen; jj_consume_token(-1); throw new ParseException(); } jj_consume_token(LBRACE); - label_94: while (true) { + label_91: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[138] = jj_gen; - break label_94; + jj_la1[134] = jj_gen; + break label_91; } jj_consume_token(S); } documentHandler.startMixinDirective(name, args); - label_95: while (true) { + label_92: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: case PRECEDES: @@ -3411,8 +3392,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[139] = jj_gen; - break label_95; + jj_la1[135] = jj_gen; + break label_92; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: @@ -3446,20 +3427,20 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { page(); break; default: - jj_la1[140] = jj_gen; + jj_la1[136] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } jj_consume_token(RBRACE); - label_96: while (true) { + label_93: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[141] = jj_gen; - break label_96; + jj_la1[137] = jj_gen; + break label_93; } jj_consume_token(S); } @@ -3471,24 +3452,24 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { VariableNode arg; boolean hasNonOptionalArgument = false; arg = mixinArg(); - label_97: while (true) { + label_94: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: ; break; default: - jj_la1[142] = jj_gen; - break label_97; + jj_la1[138] = jj_gen; + break label_94; } jj_consume_token(COMMA); - label_98: while (true) { + label_95: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[143] = jj_gen; - break label_98; + jj_la1[139] = jj_gen; + break label_95; } jj_consume_token(S); } @@ -3539,42 +3520,42 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COLON: jj_consume_token(COLON); - label_99: while (true) { + label_96: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[144] = jj_gen; - break label_99; + jj_la1[140] = jj_gen; + break label_96; } jj_consume_token(S); } first = nonVariableTerm(null); prev = first; - label_100: while (true) { + label_97: while (true) { if (jj_2_5(3)) { ; } else { - break label_100; + break label_97; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: jj_consume_token(COMMA); - label_101: while (true) { + label_98: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[145] = jj_gen; - break label_101; + jj_la1[141] = jj_gen; + break label_98; } jj_consume_token(S); } break; default: - jj_la1[146] = jj_gen; + jj_la1[142] = jj_gen; ; } prev = nonVariableTerm(prev); @@ -3586,13 +3567,13 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { token.beginColumn, prev, variable.image); break; default: - jj_la1[147] = jj_gen; + jj_la1[143] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[148] = jj_gen; + jj_la1[144] = jj_gen; ; } VariableNode arg = new VariableNode(name, first, false); @@ -3613,7 +3594,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { first = term(null); args.add(first); prev = first; - label_102: while (true) { + label_99: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: case MINUS: @@ -3652,57 +3633,57 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[149] = jj_gen; - break label_102; + jj_la1[145] = jj_gen; + break label_99; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COLON: jj_consume_token(COLON); - label_103: while (true) { + label_100: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[150] = jj_gen; - break label_103; + jj_la1[146] = jj_gen; + break label_100; } jj_consume_token(S); } break; default: - jj_la1[151] = jj_gen; + jj_la1[147] = jj_gen; ; } next = term(prev); prev.setNextLexicalUnit(next); prev = next; } - label_104: while (true) { + label_101: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: ; break; default: - jj_la1[152] = jj_gen; - break label_104; + jj_la1[148] = jj_gen; + break label_101; } jj_consume_token(COMMA); - label_105: while (true) { + label_102: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[153] = jj_gen; - break label_105; + jj_la1[149] = jj_gen; + break label_102; } jj_consume_token(S); } first = term(null); args.add(first); prev = first; - label_106: while (true) { + label_103: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: case MINUS: @@ -3741,26 +3722,26 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[154] = jj_gen; - break label_106; + jj_la1[150] = jj_gen; + break label_103; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COLON: jj_consume_token(COLON); - label_107: while (true) { + label_104: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[155] = jj_gen; - break label_107; + jj_la1[151] = jj_gen; + break label_104; } jj_consume_token(S); } break; default: - jj_la1[156] = jj_gen; + jj_la1[152] = jj_gen; ; } next = term(prev); @@ -3780,14 +3761,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { String name; ArrayList args = null; jj_consume_token(INCLUDE_SYM); - label_108: while (true) { + label_105: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[157] = jj_gen; - break label_108; + jj_la1[153] = jj_gen; + break label_105; } jj_consume_token(S); } @@ -3806,20 +3787,20 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { jj_consume_token(RPARAN); break; default: - jj_la1[158] = jj_gen; + jj_la1[154] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_109: while (true) { + label_106: while (true) { jj_consume_token(SEMICOLON); - label_110: while (true) { + label_107: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[159] = jj_gen; - break label_110; + jj_la1[155] = jj_gen; + break label_107; } jj_consume_token(S); } @@ -3828,8 +3809,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[160] = jj_gen; - break label_109; + jj_la1[156] = jj_gen; + break label_106; } } documentHandler.includeDirective(name, args); @@ -3856,26 +3837,26 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { // refactor, remove those 3 LOOKAHEAD(5). n = jj_consume_token(VARIABLE); variable = n.image; - label_111: while (true) { + label_108: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[161] = jj_gen; - break label_111; + jj_la1[157] = jj_gen; + break label_108; } jj_consume_token(S); } jj_consume_token(COLON); - label_112: while (true) { + label_109: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[162] = jj_gen; - break label_112; + jj_la1[158] = jj_gen; + break label_109; } jj_consume_token(S); } @@ -3890,18 +3871,18 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { type = jj_consume_token(CONTAINS); break; default: - jj_la1[163] = jj_gen; + jj_la1[159] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_113: while (true) { + label_110: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[164] = jj_gen; - break label_113; + jj_la1[160] = jj_gen; + break label_110; } jj_consume_token(S); } @@ -3911,18 +3892,18 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { jj_consume_token(RPARAN); break; default: - jj_la1[165] = jj_gen; + jj_la1[161] = jj_gen; ; } jj_consume_token(COMMA); - label_114: while (true) { + label_111: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[166] = jj_gen; - break label_114; + jj_la1[162] = jj_gen; + break label_111; } jj_consume_token(S); } @@ -3930,33 +3911,33 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: jj_consume_token(COMMA); - label_115: while (true) { + label_112: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[167] = jj_gen; - break label_115; + jj_la1[163] = jj_gen; + break label_112; } jj_consume_token(S); } n = jj_consume_token(IDENT); separator = n.image; - label_116: while (true) { + label_113: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[168] = jj_gen; - break label_116; + jj_la1[164] = jj_gen; + break label_113; } jj_consume_token(S); } break; default: - jj_la1[169] = jj_gen; + jj_la1[165] = jj_gen; ; } jj_consume_token(RPARAN); @@ -3977,26 +3958,26 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { default: break; } - label_117: while (true) { + label_114: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[170] = jj_gen; - break label_117; + jj_la1[166] = jj_gen; + break label_114; } jj_consume_token(S); } jj_consume_token(SEMICOLON); - label_118: while (true) { + label_115: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[171] = jj_gen; - break label_118; + jj_la1[167] = jj_gen; + break label_115; } jj_consume_token(S); } @@ -4014,38 +3995,38 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { Token n = null; n = jj_consume_token(VARIABLE); variable = n.image; - label_119: while (true) { + label_116: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[172] = jj_gen; - break label_119; + jj_la1[168] = jj_gen; + break label_116; } jj_consume_token(S); } jj_consume_token(COLON); - label_120: while (true) { + label_117: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[173] = jj_gen; - break label_120; + jj_la1[169] = jj_gen; + break label_117; } jj_consume_token(S); } jj_consume_token(APPEND); - label_121: while (true) { + label_118: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[174] = jj_gen; - break label_121; + jj_la1[170] = jj_gen; + break label_118; } jj_consume_token(S); } @@ -4055,18 +4036,18 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { jj_consume_token(RPARAN); break; default: - jj_la1[175] = jj_gen; + jj_la1[171] = jj_gen; ; } jj_consume_token(COMMA); - label_122: while (true) { + label_119: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[176] = jj_gen; - break label_122; + jj_la1[172] = jj_gen; + break label_119; } jj_consume_token(S); } @@ -4074,33 +4055,33 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: jj_consume_token(COMMA); - label_123: while (true) { + label_120: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[177] = jj_gen; - break label_123; + jj_la1[173] = jj_gen; + break label_120; } jj_consume_token(S); } n = jj_consume_token(IDENT); separator = n.image; - label_124: while (true) { + label_121: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[178] = jj_gen; - break label_124; + jj_la1[174] = jj_gen; + break label_121; } jj_consume_token(S); } break; default: - jj_la1[179] = jj_gen; + jj_la1[175] = jj_gen; ; } jj_consume_token(RPARAN); @@ -4119,38 +4100,38 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { Token n = null; n = jj_consume_token(VARIABLE); variable = n.image; - label_125: while (true) { + label_122: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[180] = jj_gen; - break label_125; + jj_la1[176] = jj_gen; + break label_122; } jj_consume_token(S); } jj_consume_token(COLON); - label_126: while (true) { + label_123: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[181] = jj_gen; - break label_126; + jj_la1[177] = jj_gen; + break label_123; } jj_consume_token(S); } jj_consume_token(REMOVE); - label_127: while (true) { + label_124: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[182] = jj_gen; - break label_127; + jj_la1[178] = jj_gen; + break label_124; } jj_consume_token(S); } @@ -4160,18 +4141,18 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { jj_consume_token(RPARAN); break; default: - jj_la1[183] = jj_gen; + jj_la1[179] = jj_gen; ; } jj_consume_token(COMMA); - label_128: while (true) { + label_125: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[184] = jj_gen; - break label_128; + jj_la1[180] = jj_gen; + break label_125; } jj_consume_token(S); } @@ -4179,33 +4160,33 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: jj_consume_token(COMMA); - label_129: while (true) { + label_126: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[185] = jj_gen; - break label_129; + jj_la1[181] = jj_gen; + break label_126; } jj_consume_token(S); } n = jj_consume_token(IDENT); separator = n.image; - label_130: while (true) { + label_127: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[186] = jj_gen; - break label_130; + jj_la1[182] = jj_gen; + break label_127; } jj_consume_token(S); } break; default: - jj_la1[187] = jj_gen; + jj_la1[183] = jj_gen; ; } jj_consume_token(RPARAN); @@ -4226,43 +4207,43 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case VARIABLE: n = jj_consume_token(VARIABLE); variable = n.image; - label_131: while (true) { + label_128: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[188] = jj_gen; - break label_131; + jj_la1[184] = jj_gen; + break label_128; } jj_consume_token(S); } jj_consume_token(COLON); - label_132: while (true) { + label_129: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[189] = jj_gen; - break label_132; + jj_la1[185] = jj_gen; + break label_129; } jj_consume_token(S); } break; default: - jj_la1[190] = jj_gen; + jj_la1[186] = jj_gen; ; } jj_consume_token(CONTAINS); - label_133: while (true) { + label_130: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[191] = jj_gen; - break label_133; + jj_la1[187] = jj_gen; + break label_130; } jj_consume_token(S); } @@ -4272,18 +4253,18 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { jj_consume_token(RPARAN); break; default: - jj_la1[192] = jj_gen; + jj_la1[188] = jj_gen; ; } jj_consume_token(COMMA); - label_134: while (true) { + label_131: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[193] = jj_gen; - break label_134; + jj_la1[189] = jj_gen; + break label_131; } jj_consume_token(S); } @@ -4291,33 +4272,33 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: jj_consume_token(COMMA); - label_135: while (true) { + label_132: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[194] = jj_gen; - break label_135; + jj_la1[190] = jj_gen; + break label_132; } jj_consume_token(S); } n = jj_consume_token(IDENT); separator = n.image; - label_136: while (true) { + label_133: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[195] = jj_gen; - break label_136; + jj_la1[191] = jj_gen; + break label_133; } jj_consume_token(S); } break; default: - jj_la1[196] = jj_gen; + jj_la1[192] = jj_gen; ; } jj_consume_token(RPARAN); @@ -4419,7 +4400,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { warnDirective(); break; default: - jj_la1[197] = jj_gen; + jj_la1[193] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4431,14 +4412,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { // TODO should evaluate the content expression, call // documentHandler.debugDirective() etc. System.out.println(content); - label_137: while (true) { + label_134: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[198] = jj_gen; - break label_137; + jj_la1[194] = jj_gen; + break label_134; } jj_consume_token(S); } @@ -4450,14 +4431,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { // TODO should evaluate the content expression, call // documentHandler.warnDirective() etc. System.err.println(content); - label_138: while (true) { + label_135: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[199] = jj_gen; - break label_138; + jj_la1[195] = jj_gen; + break label_135; } jj_consume_token(S); } @@ -4483,19 +4464,19 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { exclusive = false; break; default: - jj_la1[200] = jj_gen; + jj_la1[196] = jj_gen; jj_consume_token(-1); throw new ParseException(); } to = skipStatementUntilLeftBrace(); - label_139: while (true) { + label_136: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[201] = jj_gen; - break label_139; + jj_la1[197] = jj_gen; + break label_136; } jj_consume_token(S); } @@ -4525,28 +4506,28 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { final public void extendDirective() throws ParseException { ArrayList list; jj_consume_token(EXTEND_SYM); - label_140: while (true) { + label_137: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[202] = jj_gen; - break label_140; + jj_la1[198] = jj_gen; + break label_137; } jj_consume_token(S); } list = selectorList(); - label_141: while (true) { + label_138: while (true) { jj_consume_token(SEMICOLON); - label_142: while (true) { + label_139: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[203] = jj_gen; - break label_142; + jj_la1[199] = jj_gen; + break label_139; } jj_consume_token(S); } @@ -4555,8 +4536,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[204] = jj_gen; - break label_141; + jj_la1[200] = jj_gen; + break label_138; } } documentHandler.extendDirective(list); @@ -4583,26 +4564,26 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { LexicalUnit exp; name = property(); jj_consume_token(COLON); - label_143: while (true) { + label_140: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[205] = jj_gen; - break label_143; + jj_la1[201] = jj_gen; + break label_140; } jj_consume_token(S); } jj_consume_token(LBRACE); - label_144: while (true) { + label_141: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[206] = jj_gen; - break label_144; + jj_la1[202] = jj_gen; + break label_141; } jj_consume_token(S); } @@ -4613,27 +4594,27 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[207] = jj_gen; + jj_la1[203] = jj_gen; ; } - label_145: while (true) { + label_142: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[208] = jj_gen; - break label_145; + jj_la1[204] = jj_gen; + break label_142; } jj_consume_token(SEMICOLON); - label_146: while (true) { + label_143: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[209] = jj_gen; - break label_146; + jj_la1[205] = jj_gen; + break label_143; } jj_consume_token(S); } @@ -4643,20 +4624,20 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[210] = jj_gen; + jj_la1[206] = jj_gen; ; } } jj_consume_token(RBRACE); documentHandler.endNestedProperties(name); - label_147: while (true) { + label_144: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[211] = jj_gen; - break label_147; + jj_la1[207] = jj_gen; + break label_144; } jj_consume_token(S); } @@ -4675,7 +4656,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { debuggingDirective(); break; default: - jj_la1[212] = jj_gen; + jj_la1[208] = jj_gen; if (jj_2_6(2147483647)) { styleRule(); } else if (jj_2_7(3)) { @@ -4696,7 +4677,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { styleRule(); break; default: - jj_la1[213] = jj_gen; + jj_la1[209] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4741,14 +4722,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { name = property(); save = token; jj_consume_token(COLON); - label_148: while (true) { + label_145: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[214] = jj_gen; - break label_148; + jj_la1[210] = jj_gen; + break label_145; } jj_consume_token(S); } @@ -4792,7 +4773,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { important = prio(); break; default: - jj_la1[215] = jj_gen; + jj_la1[211] = jj_gen; ; } Token next = getToken(1); @@ -4811,14 +4792,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { break; case LBRACE: jj_consume_token(LBRACE); - label_149: while (true) { + label_146: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[216] = jj_gen; - break label_149; + jj_la1[212] = jj_gen; + break label_146; } jj_consume_token(S); } @@ -4829,27 +4810,27 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[217] = jj_gen; + jj_la1[213] = jj_gen; ; } - label_150: while (true) { + label_147: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[218] = jj_gen; - break label_150; + jj_la1[214] = jj_gen; + break label_147; } jj_consume_token(SEMICOLON); - label_151: while (true) { + label_148: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[219] = jj_gen; - break label_151; + jj_la1[215] = jj_gen; + break label_148; } jj_consume_token(S); } @@ -4859,26 +4840,26 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[220] = jj_gen; + jj_la1[216] = jj_gen; ; } } jj_consume_token(RBRACE); - label_152: while (true) { + label_149: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[221] = jj_gen; - break label_152; + jj_la1[217] = jj_gen; + break label_149; } jj_consume_token(S); } documentHandler.endNestedProperties(name); break; default: - jj_la1[222] = jj_gen; + jj_la1[218] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4926,14 +4907,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { name = property(); save = token; jj_consume_token(COLON); - label_153: while (true) { + label_150: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[223] = jj_gen; - break label_153; + jj_la1[219] = jj_gen; + break label_150; } jj_consume_token(S); } @@ -4943,7 +4924,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { important = prio(); break; default: - jj_la1[224] = jj_gen; + jj_la1[220] = jj_gen; ; } documentHandler.property(name, exp, important); @@ -4984,14 +4965,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { */ final public boolean prio() throws ParseException { jj_consume_token(IMPORTANT_SYM); - label_154: while (true) { + label_151: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[225] = jj_gen; - break label_154; + jj_la1[221] = jj_gen; + break label_151; } jj_consume_token(S); } @@ -5005,14 +4986,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { final public boolean guarded() throws ParseException { jj_consume_token(GUARDED_SYM); - label_155: while (true) { + label_152: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[226] = jj_gen; - break label_155; + jj_la1[222] = jj_gen; + break label_152; } jj_consume_token(S); } @@ -5034,14 +5015,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case DIV: n = jj_consume_token(DIV); - label_156: while (true) { + label_153: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[227] = jj_gen; - break label_156; + jj_la1[223] = jj_gen; + break label_153; } jj_consume_token(S); } @@ -5054,14 +5035,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { break; case COMMA: n = jj_consume_token(COMMA); - label_157: while (true) { + label_154: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[228] = jj_gen; - break label_157; + jj_la1[224] = jj_gen; + break label_154; } jj_consume_token(S); } @@ -5073,7 +5054,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } break; default: - jj_la1[229] = jj_gen; + jj_la1[225] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5089,11 +5070,11 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { char op; first = term(null); res = first; - label_158: while (true) { + label_155: while (true) { if (jj_2_8(2)) { ; } else { - break label_158; + break label_155; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: @@ -5101,7 +5082,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { res = operator(res); break; default: - jj_la1[230] = jj_gen; + jj_la1[226] = jj_gen; ; } res = term(res); @@ -5137,7 +5118,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } break; default: - jj_la1[231] = jj_gen; + jj_la1[227] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5192,7 +5173,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { result = variableTerm(prev); break; default: - jj_la1[232] = jj_gen; + jj_la1[228] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5256,7 +5237,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { op = unaryOperator(); break; default: - jj_la1[233] = jj_gen; + jj_la1[229] = jj_gen; ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -5371,7 +5352,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { result = function(op, prev); break; default: - jj_la1[234] = jj_gen; + jj_la1[230] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5403,7 +5384,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { s += "."; break; default: - jj_la1[235] = jj_gen; + jj_la1[231] = jj_gen; ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -5420,7 +5401,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { n = jj_consume_token(FROM); break; default: - jj_la1[236] = jj_gen; + jj_la1[232] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5458,24 +5439,24 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { result = unicode(prev); break; default: - jj_la1[237] = jj_gen; + jj_la1[233] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[238] = jj_gen; + jj_la1[234] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_159: while (true) { + label_156: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[239] = jj_gen; - break label_159; + jj_la1[235] = jj_gen; + break label_156; } jj_consume_token(S); } @@ -5498,14 +5479,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { Token n; LexicalUnit params = null; n = jj_consume_token(FUNCTION); - label_160: while (true) { + label_157: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[240] = jj_gen; - break label_160; + jj_la1[236] = jj_gen; + break label_157; } jj_consume_token(S); } @@ -5564,7 +5545,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { params = expr(); break; default: - jj_la1[241] = jj_gen; + jj_la1[237] = jj_gen; ; } jj_consume_token(RPARAN); @@ -6101,14 +6082,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { */ final public void _parseRule() throws ParseException { String ret = null; - label_161: while (true) { + label_158: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[242] = jj_gen; - break label_161; + jj_la1[238] = jj_gen; + break label_158; } jj_consume_token(S); } @@ -6143,7 +6124,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { fontFace(); break; default: - jj_la1[243] = jj_gen; + jj_la1[239] = jj_gen; ret = skipStatement(); if ((ret == null) || (ret.length() == 0)) { { @@ -6166,14 +6147,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } final public void _parseImportRule() throws ParseException { - label_162: while (true) { + label_159: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[244] = jj_gen; - break label_162; + jj_la1[240] = jj_gen; + break label_159; } jj_consume_token(S); } @@ -6181,14 +6162,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } final public void _parseMediaRule() throws ParseException { - label_163: while (true) { + label_160: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[245] = jj_gen; - break label_163; + jj_la1[241] = jj_gen; + break label_160; } jj_consume_token(S); } @@ -6196,14 +6177,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } final public void _parseDeclarationBlock() throws ParseException { - label_164: while (true) { + label_161: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[246] = jj_gen; - break label_164; + jj_la1[242] = jj_gen; + break label_161; } jj_consume_token(S); } @@ -6213,27 +6194,27 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[247] = jj_gen; + jj_la1[243] = jj_gen; ; } - label_165: while (true) { + label_162: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[248] = jj_gen; - break label_165; + jj_la1[244] = jj_gen; + break label_162; } jj_consume_token(SEMICOLON); - label_166: while (true) { + label_163: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[249] = jj_gen; - break label_166; + jj_la1[245] = jj_gen; + break label_163; } jj_consume_token(S); } @@ -6243,7 +6224,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[250] = jj_gen; + jj_la1[246] = jj_gen; ; } } @@ -6252,14 +6233,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { final public ArrayList _parseSelectors() throws ParseException { ArrayList p = null; try { - label_167: while (true) { + label_164: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[251] = jj_gen; - break label_167; + jj_la1[247] = jj_gen; + break label_164; } jj_consume_token(S); } @@ -6375,29 +6356,21 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } } - private boolean jj_3R_178() { - if (jj_scan_token(VARIABLE)) { + private boolean jj_3R_173() { + if (jj_3R_194()) { return true; } - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(1)) { - jj_scanpos = xsp; - break; - } - } return false; } - private boolean jj_3R_240() { - if (jj_3R_178()) { + private boolean jj_3R_251() { + if (jj_scan_token(PLUS)) { return true; } return false; } - private boolean jj_3R_237() { + private boolean jj_3R_241() { Token xsp; xsp = jj_scanpos; if (jj_3R_250()) { @@ -6410,121 +6383,33 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } private boolean jj_3R_250() { - if (jj_scan_token(IDENT)) { + if (jj_scan_token(MINUS)) { return true; } return false; } - private boolean jj_3R_248() { - if (jj_scan_token(URL)) { + private boolean jj_3R_246() { + if (jj_scan_token(UNICODERANGE)) { return true; } return false; } - private boolean jj_3R_194() { + private boolean jj_3_8() { Token xsp; - if (jj_3R_237()) { + xsp = jj_scanpos; + if (jj_3R_173()) { + jj_scanpos = xsp; + } + if (jj_3R_174()) { return true; } - while (true) { - xsp = jj_scanpos; - if (jj_3R_237()) { - jj_scanpos = xsp; - break; - } - } - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(1)) { - jj_scanpos = xsp; - break; - } - } - return false; - } - - private boolean jj_3R_180() { - if (jj_3R_200()) { - return true; - } - return false; - } - - private boolean jj_3R_198() { - if (jj_3R_173()) { - return true; - } - return false; - } - - private boolean jj_3R_177() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_198()) { - jj_scanpos = xsp; - if (jj_3R_199()) { - return true; - } - } return false; } private boolean jj_3R_176() { - if (jj_3R_197()) { - return true; - } - return false; - } - - private boolean jj_3R_254() { - if (jj_scan_token(PLUS)) { - return true; - } - return false; - } - - private boolean jj_3R_244() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_253()) { - jj_scanpos = xsp; - if (jj_3R_254()) { - return true; - } - } - return false; - } - - private boolean jj_3R_253() { - if (jj_scan_token(MINUS)) { - return true; - } - return false; - } - - private boolean jj_3R_249() { - if (jj_scan_token(UNICODERANGE)) { - return true; - } - return false; - } - - private boolean jj_3_8() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_176()) { - jj_scanpos = xsp; - } - if (jj_3R_177()) { - return true; - } - return false; - } - - private boolean jj_3R_179() { - if (jj_3R_177()) { + if (jj_3R_174()) { return true; } Token xsp; @@ -6538,14 +6423,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_202() { - if (jj_3R_201()) { + private boolean jj_3R_199() { + if (jj_3R_198()) { return true; } return false; } - private boolean jj_3R_201() { + private boolean jj_3R_198() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(20)) { @@ -6567,8 +6452,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_168() { - if (jj_3R_178()) { + private boolean jj_3R_165() { + if (jj_3R_175()) { return true; } if (jj_scan_token(COLON)) { @@ -6582,19 +6467,19 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { break; } } - if (jj_3R_179()) { + if (jj_3R_176()) { return true; } xsp = jj_scanpos; - if (jj_3R_180()) { + if (jj_3R_177()) { jj_scanpos = xsp; } - if (jj_3R_181()) { + if (jj_3R_178()) { return true; } while (true) { xsp = jj_scanpos; - if (jj_3R_181()) { + if (jj_3R_178()) { jj_scanpos = xsp; break; } @@ -6602,19 +6487,19 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_183() { + private boolean jj_3R_180() { if (jj_scan_token(S)) { return true; } Token xsp; xsp = jj_scanpos; - if (jj_3R_202()) { + if (jj_3R_199()) { jj_scanpos = xsp; } return false; } - private boolean jj_3R_239() { + private boolean jj_3R_236() { if (jj_scan_token(COMMA)) { return true; } @@ -6629,38 +6514,38 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_182() { - if (jj_3R_201()) { + private boolean jj_3R_179() { + if (jj_3R_198()) { return true; } return false; } - private boolean jj_3R_169() { + private boolean jj_3R_166() { Token xsp; xsp = jj_scanpos; - if (jj_3R_182()) { + if (jj_3R_179()) { jj_scanpos = xsp; - if (jj_3R_183()) { + if (jj_3R_180()) { return true; } } return false; } - private boolean jj_3R_197() { + private boolean jj_3R_194() { Token xsp; xsp = jj_scanpos; - if (jj_3R_238()) { + if (jj_3R_235()) { jj_scanpos = xsp; - if (jj_3R_239()) { + if (jj_3R_236()) { return true; } } return false; } - private boolean jj_3R_238() { + private boolean jj_3R_235() { if (jj_scan_token(DIV)) { return true; } @@ -6675,7 +6560,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_200() { + private boolean jj_3R_197() { if (jj_scan_token(GUARDED_SYM)) { return true; } @@ -6690,7 +6575,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_189() { + private boolean jj_3R_186() { if (jj_scan_token(VARIABLE)) { return true; } @@ -6715,10 +6600,10 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_171() { + private boolean jj_3R_168() { Token xsp; xsp = jj_scanpos; - if (jj_3R_189()) { + if (jj_3R_186()) { jj_scanpos = xsp; } if (jj_scan_token(CONTAINS)) { @@ -6739,21 +6624,21 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_204() { + private boolean jj_3R_201() { if (jj_scan_token(HASH)) { return true; } return false; } - private boolean jj_3R_276() { + private boolean jj_3R_273() { if (jj_scan_token(IDENT)) { return true; } return false; } - private boolean jj_3R_277() { + private boolean jj_3R_274() { if (jj_scan_token(FUNCTION)) { return true; } @@ -6773,26 +6658,26 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_275() { + private boolean jj_3R_272() { if (jj_scan_token(COLON)) { return true; } return false; } - private boolean jj_3R_206() { + private boolean jj_3R_203() { if (jj_scan_token(COLON)) { return true; } Token xsp; xsp = jj_scanpos; - if (jj_3R_275()) { + if (jj_3R_272()) { jj_scanpos = xsp; } xsp = jj_scanpos; - if (jj_3R_276()) { + if (jj_3R_273()) { jj_scanpos = xsp; - if (jj_3R_277()) { + if (jj_3R_274()) { return true; } } @@ -6800,96 +6685,96 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } private boolean jj_3_7() { - if (jj_3R_175()) { + if (jj_3R_172()) { return true; } return false; } - private boolean jj_3R_296() { + private boolean jj_3R_293() { if (jj_scan_token(STRING)) { return true; } return false; } - private boolean jj_3R_294() { + private boolean jj_3R_291() { if (jj_scan_token(STARMATCH)) { return true; } return false; } - private boolean jj_3R_295() { + private boolean jj_3R_292() { if (jj_scan_token(IDENT)) { return true; } return false; } - private boolean jj_3R_293() { + private boolean jj_3R_290() { if (jj_scan_token(DOLLARMATCH)) { return true; } return false; } - private boolean jj_3R_292() { + private boolean jj_3R_289() { if (jj_scan_token(CARETMATCH)) { return true; } return false; } - private boolean jj_3R_291() { + private boolean jj_3R_288() { if (jj_scan_token(DASHMATCH)) { return true; } return false; } - private boolean jj_3R_290() { + private boolean jj_3R_287() { if (jj_scan_token(INCLUDES)) { return true; } return false; } - private boolean jj_3R_257() { + private boolean jj_3R_254() { if (jj_scan_token(INTERPOLATION)) { return true; } return false; } - private boolean jj_3R_289() { + private boolean jj_3R_286() { if (jj_scan_token(EQ)) { return true; } return false; } - private boolean jj_3R_196() { + private boolean jj_3R_193() { if (jj_scan_token(LBRACE)) { return true; } return false; } - private boolean jj_3R_282() { + private boolean jj_3R_279() { Token xsp; xsp = jj_scanpos; - if (jj_3R_289()) { + if (jj_3R_286()) { jj_scanpos = xsp; - if (jj_3R_290()) { + if (jj_3R_287()) { jj_scanpos = xsp; - if (jj_3R_291()) { + if (jj_3R_288()) { jj_scanpos = xsp; - if (jj_3R_292()) { + if (jj_3R_289()) { jj_scanpos = xsp; - if (jj_3R_293()) { + if (jj_3R_290()) { jj_scanpos = xsp; - if (jj_3R_294()) { + if (jj_3R_291()) { return true; } } @@ -6905,9 +6790,9 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } } xsp = jj_scanpos; - if (jj_3R_295()) { + if (jj_3R_292()) { jj_scanpos = xsp; - if (jj_3R_296()) { + if (jj_3R_293()) { return true; } } @@ -6921,7 +6806,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_207() { + private boolean jj_3R_204() { if (jj_scan_token(LBRACKET)) { return true; } @@ -6944,7 +6829,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } } xsp = jj_scanpos; - if (jj_3R_282()) { + if (jj_3R_279()) { jj_scanpos = xsp; } if (jj_scan_token(RBRACKET)) { @@ -6953,28 +6838,28 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_288() { + private boolean jj_3R_285() { if (jj_scan_token(INTERPOLATION)) { return true; } return false; } - private boolean jj_3R_195() { - if (jj_3R_179()) { + private boolean jj_3R_192() { + if (jj_3R_176()) { return true; } return false; } - private boolean jj_3R_243() { + private boolean jj_3R_240() { if (jj_scan_token(PARENT)) { return true; } return false; } - private boolean jj_3R_242() { + private boolean jj_3R_239() { if (jj_scan_token(ANY)) { return true; } @@ -6982,7 +6867,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } private boolean jj_3_6() { - if (jj_3R_174()) { + if (jj_3R_171()) { return true; } if (jj_scan_token(LBRACE)) { @@ -6991,8 +6876,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_175() { - if (jj_3R_194()) { + private boolean jj_3R_172() { + if (jj_3R_191()) { return true; } if (jj_scan_token(COLON)) { @@ -7007,42 +6892,42 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } } xsp = jj_scanpos; - if (jj_3R_195()) { + if (jj_3R_192()) { jj_scanpos = xsp; - if (jj_3R_196()) { + if (jj_3R_193()) { return true; } } return false; } - private boolean jj_3R_252() { + private boolean jj_3R_249() { Token xsp; xsp = jj_scanpos; - if (jj_3R_256()) { + if (jj_3R_253()) { jj_scanpos = xsp; - if (jj_3R_257()) { + if (jj_3R_254()) { return true; } } return false; } - private boolean jj_3R_256() { + private boolean jj_3R_253() { if (jj_scan_token(IDENT)) { return true; } return false; } - private boolean jj_3R_203() { + private boolean jj_3R_200() { Token xsp; xsp = jj_scanpos; - if (jj_3R_241()) { + if (jj_3R_238()) { jj_scanpos = xsp; - if (jj_3R_242()) { + if (jj_3R_239()) { jj_scanpos = xsp; - if (jj_3R_243()) { + if (jj_3R_240()) { return true; } } @@ -7050,14 +6935,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_241() { + private boolean jj_3R_238() { Token xsp; - if (jj_3R_252()) { + if (jj_3R_249()) { return true; } while (true) { xsp = jj_scanpos; - if (jj_3R_252()) { + if (jj_3R_249()) { jj_scanpos = xsp; break; } @@ -7065,7 +6950,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_172() { + private boolean jj_3R_169() { if (jj_scan_token(COMMA)) { return true; } @@ -7080,27 +6965,27 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_270() { + private boolean jj_3R_267() { Token xsp; xsp = jj_scanpos; - if (jj_3R_287()) { + if (jj_3R_284()) { jj_scanpos = xsp; - if (jj_3R_288()) { + if (jj_3R_285()) { return true; } } return false; } - private boolean jj_3R_287() { + private boolean jj_3R_284() { if (jj_scan_token(IDENT)) { return true; } return false; } - private boolean jj_3R_286() { - if (jj_3R_206()) { + private boolean jj_3R_283() { + if (jj_3R_203()) { return true; } return false; @@ -7109,26 +6994,26 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { private boolean jj_3_5() { Token xsp; xsp = jj_scanpos; - if (jj_3R_172()) { + if (jj_3R_169()) { jj_scanpos = xsp; } - if (jj_3R_173()) { + if (jj_3R_170()) { return true; } return false; } - private boolean jj_3R_205() { + private boolean jj_3R_202() { if (jj_scan_token(DOT)) { return true; } Token xsp; - if (jj_3R_270()) { + if (jj_3R_267()) { return true; } while (true) { xsp = jj_scanpos; - if (jj_3R_270()) { + if (jj_3R_267()) { jj_scanpos = xsp; break; } @@ -7136,72 +7021,72 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_284() { - if (jj_3R_205()) { + private boolean jj_3R_281() { + if (jj_3R_202()) { return true; } return false; } - private boolean jj_3R_279() { - if (jj_3R_205()) { + private boolean jj_3R_276() { + if (jj_3R_202()) { return true; } return false; } - private boolean jj_3R_281() { - if (jj_3R_206()) { + private boolean jj_3R_278() { + if (jj_3R_203()) { return true; } return false; } - private boolean jj_3R_269() { - if (jj_3R_206()) { + private boolean jj_3R_266() { + if (jj_3R_203()) { return true; } return false; } - private boolean jj_3R_272() { - if (jj_3R_205()) { + private boolean jj_3R_269() { + if (jj_3R_202()) { return true; } return false; } - private boolean jj_3R_274() { - if (jj_3R_206()) { + private boolean jj_3R_271() { + if (jj_3R_203()) { return true; } return false; } - private boolean jj_3R_255() { - if (jj_3R_179()) { + private boolean jj_3R_252() { + if (jj_3R_176()) { return true; } return false; } - private boolean jj_3R_285() { - if (jj_3R_207()) { + private boolean jj_3R_282() { + if (jj_3R_204()) { return true; } return false; } - private boolean jj_3R_262() { + private boolean jj_3R_259() { Token xsp; xsp = jj_scanpos; - if (jj_3R_283()) { + if (jj_3R_280()) { jj_scanpos = xsp; - if (jj_3R_284()) { + if (jj_3R_281()) { jj_scanpos = xsp; - if (jj_3R_285()) { + if (jj_3R_282()) { jj_scanpos = xsp; - if (jj_3R_286()) { + if (jj_3R_283()) { return true; } } @@ -7210,23 +7095,23 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_283() { - if (jj_3R_204()) { + private boolean jj_3R_280() { + if (jj_3R_201()) { return true; } return false; } - private boolean jj_3R_261() { + private boolean jj_3R_258() { Token xsp; xsp = jj_scanpos; - if (jj_3R_278()) { + if (jj_3R_275()) { jj_scanpos = xsp; - if (jj_3R_279()) { + if (jj_3R_276()) { jj_scanpos = xsp; - if (jj_3R_280()) { + if (jj_3R_277()) { jj_scanpos = xsp; - if (jj_3R_281()) { + if (jj_3R_278()) { return true; } } @@ -7235,30 +7120,30 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_278() { - if (jj_3R_204()) { + private boolean jj_3R_275() { + if (jj_3R_201()) { return true; } return false; } - private boolean jj_3R_266() { - if (jj_3R_206()) { + private boolean jj_3R_263() { + if (jj_3R_203()) { return true; } return false; } - private boolean jj_3R_260() { + private boolean jj_3R_257() { Token xsp; xsp = jj_scanpos; - if (jj_3R_271()) { + if (jj_3R_268()) { jj_scanpos = xsp; - if (jj_3R_272()) { + if (jj_3R_269()) { jj_scanpos = xsp; - if (jj_3R_273()) { + if (jj_3R_270()) { jj_scanpos = xsp; - if (jj_3R_274()) { + if (jj_3R_271()) { return true; } } @@ -7267,42 +7152,42 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_271() { - if (jj_3R_204()) { + private boolean jj_3R_268() { + if (jj_3R_201()) { return true; } return false; } - private boolean jj_3R_280() { - if (jj_3R_207()) { + private boolean jj_3R_277() { + if (jj_3R_204()) { return true; } return false; } - private boolean jj_3R_268() { - if (jj_3R_207()) { + private boolean jj_3R_265() { + if (jj_3R_204()) { return true; } return false; } - private boolean jj_3R_273() { - if (jj_3R_207()) { + private boolean jj_3R_270() { + if (jj_3R_204()) { return true; } return false; } - private boolean jj_3R_259() { + private boolean jj_3R_256() { Token xsp; xsp = jj_scanpos; - if (jj_3R_267()) { + if (jj_3R_264()) { jj_scanpos = xsp; - if (jj_3R_268()) { + if (jj_3R_265()) { jj_scanpos = xsp; - if (jj_3R_269()) { + if (jj_3R_266()) { return true; } } @@ -7310,21 +7195,21 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_264() { - if (jj_3R_205()) { + private boolean jj_3R_261() { + if (jj_3R_202()) { return true; } return false; } - private boolean jj_3R_267() { - if (jj_3R_205()) { + private boolean jj_3R_264() { + if (jj_3R_202()) { return true; } return false; } - private boolean jj_3R_245() { + private boolean jj_3R_242() { if (jj_scan_token(FUNCTION)) { return true; } @@ -7337,7 +7222,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } } xsp = jj_scanpos; - if (jj_3R_255()) { + if (jj_3R_252()) { jj_scanpos = xsp; } if (jj_scan_token(RPARAN)) { @@ -7346,28 +7231,28 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_234() { - if (jj_3R_249()) { + private boolean jj_3R_231() { + if (jj_3R_246()) { return true; } return false; } - private boolean jj_3R_233() { - if (jj_3R_248()) { + private boolean jj_3R_230() { + if (jj_3R_245()) { return true; } return false; } - private boolean jj_3R_188() { - if (jj_3R_207()) { + private boolean jj_3R_185() { + if (jj_3R_204()) { return true; } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_262()) { + if (jj_3R_259()) { jj_scanpos = xsp; break; } @@ -7375,21 +7260,21 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_232() { - if (jj_3R_247()) { + private boolean jj_3R_229() { + if (jj_3R_244()) { return true; } return false; } - private boolean jj_3R_187() { - if (jj_3R_206()) { + private boolean jj_3R_184() { + if (jj_3R_203()) { return true; } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_261()) { + if (jj_3R_258()) { jj_scanpos = xsp; break; } @@ -7397,21 +7282,21 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_265() { - if (jj_3R_207()) { + private boolean jj_3R_262() { + if (jj_3R_204()) { return true; } return false; } - private boolean jj_3R_186() { - if (jj_3R_205()) { + private boolean jj_3R_183() { + if (jj_3R_202()) { return true; } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_260()) { + if (jj_3R_257()) { jj_scanpos = xsp; break; } @@ -7419,14 +7304,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_185() { - if (jj_3R_204()) { + private boolean jj_3R_182() { + if (jj_3R_201()) { return true; } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_259()) { + if (jj_3R_256()) { jj_scanpos = xsp; break; } @@ -7434,16 +7319,16 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_258() { + private boolean jj_3R_255() { Token xsp; xsp = jj_scanpos; - if (jj_3R_263()) { + if (jj_3R_260()) { jj_scanpos = xsp; - if (jj_3R_264()) { + if (jj_3R_261()) { jj_scanpos = xsp; - if (jj_3R_265()) { + if (jj_3R_262()) { jj_scanpos = xsp; - if (jj_3R_266()) { + if (jj_3R_263()) { return true; } } @@ -7452,21 +7337,21 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_263() { - if (jj_3R_204()) { + private boolean jj_3R_260() { + if (jj_3R_201()) { return true; } return false; } - private boolean jj_3R_184() { - if (jj_3R_203()) { + private boolean jj_3R_181() { + if (jj_3R_200()) { return true; } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_258()) { + if (jj_3R_255()) { jj_scanpos = xsp; break; } @@ -7474,18 +7359,18 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_170() { + private boolean jj_3R_167() { Token xsp; xsp = jj_scanpos; - if (jj_3R_184()) { + if (jj_3R_181()) { jj_scanpos = xsp; - if (jj_3R_185()) { + if (jj_3R_182()) { jj_scanpos = xsp; - if (jj_3R_186()) { + if (jj_3R_183()) { jj_scanpos = xsp; - if (jj_3R_187()) { + if (jj_3R_184()) { jj_scanpos = xsp; - if (jj_3R_188()) { + if (jj_3R_185()) { return true; } } @@ -7495,27 +7380,27 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_236() { - if (jj_3R_201()) { + private boolean jj_3R_233() { + if (jj_3R_198()) { return true; } - if (jj_3R_170()) { + if (jj_3R_167()) { return true; } return false; } - private boolean jj_3R_246() { + private boolean jj_3R_243() { if (jj_scan_token(DOT)) { return true; } return false; } - private boolean jj_3R_231() { + private boolean jj_3R_228() { Token xsp; xsp = jj_scanpos; - if (jj_3R_246()) { + if (jj_3R_243()) { jj_scanpos = xsp; } xsp = jj_scanpos; @@ -7534,32 +7419,32 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_230() { + private boolean jj_3R_227() { if (jj_scan_token(STRING)) { return true; } return false; } - private boolean jj_3R_229() { - if (jj_3R_245()) { + private boolean jj_3R_226() { + if (jj_3R_242()) { return true; } return false; } - private boolean jj_3R_191() { + private boolean jj_3R_188() { Token xsp; xsp = jj_scanpos; - if (jj_3R_230()) { + if (jj_3R_227()) { jj_scanpos = xsp; - if (jj_3R_231()) { + if (jj_3R_228()) { jj_scanpos = xsp; - if (jj_3R_232()) { + if (jj_3R_229()) { jj_scanpos = xsp; - if (jj_3R_233()) { + if (jj_3R_230()) { jj_scanpos = xsp; - if (jj_3R_234()) { + if (jj_3R_231()) { return true; } } @@ -7570,23 +7455,16 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } private boolean jj_3_2() { - if (jj_3R_169()) { + if (jj_3R_166()) { return true; } - if (jj_3R_170()) { - return true; - } - return false; - } - - private boolean jj_3_1() { - if (jj_3R_168()) { + if (jj_3R_167()) { return true; } return false; } - private boolean jj_3R_193() { + private boolean jj_3R_190() { if (jj_scan_token(COMMA)) { return true; } @@ -7598,39 +7476,39 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { break; } } - if (jj_3R_192()) { + if (jj_3R_189()) { return true; } return false; } - private boolean jj_3R_235() { - if (jj_3R_170()) { + private boolean jj_3R_232() { + if (jj_3R_167()) { return true; } return false; } - private boolean jj_3R_228() { + private boolean jj_3R_225() { if (jj_scan_token(DIMEN)) { return true; } return false; } - private boolean jj_3R_227() { + private boolean jj_3R_224() { if (jj_scan_token(KHZ)) { return true; } return false; } - private boolean jj_3R_192() { + private boolean jj_3R_189() { Token xsp; xsp = jj_scanpos; - if (jj_3R_235()) { + if (jj_3R_232()) { jj_scanpos = xsp; - if (jj_3R_236()) { + if (jj_3R_233()) { return true; } } @@ -7651,49 +7529,56 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_226() { + private boolean jj_3R_223() { if (jj_scan_token(HZ)) { return true; } return false; } - private boolean jj_3R_225() { + private boolean jj_3R_222() { if (jj_scan_token(MS)) { return true; } return false; } - private boolean jj_3R_224() { + private boolean jj_3R_221() { if (jj_scan_token(SECOND)) { return true; } return false; } - private boolean jj_3R_223() { + private boolean jj_3R_220() { if (jj_scan_token(GRAD)) { return true; } return false; } - private boolean jj_3R_222() { + private boolean jj_3_1() { + if (jj_3R_165()) { + return true; + } + return false; + } + + private boolean jj_3R_219() { if (jj_scan_token(RAD)) { return true; } return false; } - private boolean jj_3R_174() { - if (jj_3R_192()) { + private boolean jj_3R_171() { + if (jj_3R_189()) { return true; } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_193()) { + if (jj_3R_190()) { jj_scanpos = xsp; break; } @@ -7701,21 +7586,21 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_221() { + private boolean jj_3R_218() { if (jj_scan_token(DEG)) { return true; } return false; } - private boolean jj_3R_220() { + private boolean jj_3R_217() { if (jj_scan_token(EXS)) { return true; } return false; } - private boolean jj_3R_219() { + private boolean jj_3R_216() { if (jj_scan_token(REM)) { return true; } @@ -7723,158 +7608,158 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } private boolean jj_3_4() { - if (jj_3R_171()) { + if (jj_3R_168()) { return true; } return false; } - private boolean jj_3R_218() { + private boolean jj_3R_215() { if (jj_scan_token(LEM)) { return true; } return false; } - private boolean jj_3R_217() { + private boolean jj_3R_214() { if (jj_scan_token(EMS)) { return true; } return false; } - private boolean jj_3R_216() { + private boolean jj_3R_213() { if (jj_scan_token(PX)) { return true; } return false; } - private boolean jj_3R_215() { + private boolean jj_3R_212() { if (jj_scan_token(IN)) { return true; } return false; } - private boolean jj_3R_214() { + private boolean jj_3R_211() { if (jj_scan_token(PC)) { return true; } return false; } - private boolean jj_3R_213() { + private boolean jj_3R_210() { if (jj_scan_token(MM)) { return true; } return false; } - private boolean jj_3R_212() { + private boolean jj_3R_209() { if (jj_scan_token(CM)) { return true; } return false; } - private boolean jj_3R_251() { + private boolean jj_3R_248() { if (jj_scan_token(INTERPOLATION)) { return true; } return false; } - private boolean jj_3R_211() { + private boolean jj_3R_208() { if (jj_scan_token(PT)) { return true; } return false; } - private boolean jj_3R_210() { + private boolean jj_3R_207() { if (jj_scan_token(PERCENTAGE)) { return true; } return false; } - private boolean jj_3R_199() { - if (jj_3R_240()) { + private boolean jj_3R_196() { + if (jj_3R_237()) { return true; } return false; } private boolean jj_3_3() { - if (jj_3R_168()) { + if (jj_3R_165()) { return true; } return false; } - private boolean jj_3R_209() { + private boolean jj_3R_206() { if (jj_scan_token(NUMBER)) { return true; } return false; } - private boolean jj_3R_208() { - if (jj_3R_244()) { + private boolean jj_3R_205() { + if (jj_3R_241()) { return true; } return false; } - private boolean jj_3R_190() { + private boolean jj_3R_187() { Token xsp; xsp = jj_scanpos; - if (jj_3R_208()) { + if (jj_3R_205()) { jj_scanpos = xsp; } xsp = jj_scanpos; - if (jj_3R_209()) { + if (jj_3R_206()) { jj_scanpos = xsp; - if (jj_3R_210()) { + if (jj_3R_207()) { jj_scanpos = xsp; - if (jj_3R_211()) { + if (jj_3R_208()) { jj_scanpos = xsp; - if (jj_3R_212()) { + if (jj_3R_209()) { jj_scanpos = xsp; - if (jj_3R_213()) { + if (jj_3R_210()) { jj_scanpos = xsp; - if (jj_3R_214()) { + if (jj_3R_211()) { jj_scanpos = xsp; - if (jj_3R_215()) { + if (jj_3R_212()) { jj_scanpos = xsp; - if (jj_3R_216()) { + if (jj_3R_213()) { jj_scanpos = xsp; - if (jj_3R_217()) { + if (jj_3R_214()) { jj_scanpos = xsp; - if (jj_3R_218()) { + if (jj_3R_215()) { jj_scanpos = xsp; - if (jj_3R_219()) { + if (jj_3R_216()) { jj_scanpos = xsp; - if (jj_3R_220()) { + if (jj_3R_217()) { jj_scanpos = xsp; - if (jj_3R_221()) { + if (jj_3R_218()) { jj_scanpos = xsp; - if (jj_3R_222()) { + if (jj_3R_219()) { jj_scanpos = xsp; - if (jj_3R_223()) { + if (jj_3R_220()) { jj_scanpos = xsp; - if (jj_3R_224()) { + if (jj_3R_221()) { jj_scanpos = xsp; - if (jj_3R_225()) { + if (jj_3R_222()) { jj_scanpos = xsp; - if (jj_3R_226()) { + if (jj_3R_223()) { jj_scanpos = xsp; - if (jj_3R_227()) { + if (jj_3R_224()) { jj_scanpos = xsp; - if (jj_3R_228()) { + if (jj_3R_225()) { jj_scanpos = xsp; - if (jj_3R_229()) { + if (jj_3R_226()) { return true; } } @@ -7900,12 +7785,12 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_173() { + private boolean jj_3R_170() { Token xsp; xsp = jj_scanpos; - if (jj_3R_190()) { + if (jj_3R_187()) { jj_scanpos = xsp; - if (jj_3R_191()) { + if (jj_3R_188()) { return true; } } @@ -7919,7 +7804,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_181() { + private boolean jj_3R_178() { if (jj_scan_token(SEMICOLON)) { return true; } @@ -7934,13 +7819,109 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_247() { + private boolean jj_3R_244() { if (jj_scan_token(HASH)) { return true; } return false; } + private boolean jj_3R_175() { + if (jj_scan_token(VARIABLE)) { + return true; + } + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(1)) { + jj_scanpos = xsp; + break; + } + } + return false; + } + + private boolean jj_3R_237() { + if (jj_3R_175()) { + return true; + } + return false; + } + + private boolean jj_3R_234() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_247()) { + jj_scanpos = xsp; + if (jj_3R_248()) { + return true; + } + } + return false; + } + + private boolean jj_3R_247() { + if (jj_scan_token(IDENT)) { + return true; + } + return false; + } + + private boolean jj_3R_245() { + if (jj_scan_token(URL)) { + return true; + } + return false; + } + + private boolean jj_3R_191() { + Token xsp; + if (jj_3R_234()) { + return true; + } + while (true) { + xsp = jj_scanpos; + if (jj_3R_234()) { + jj_scanpos = xsp; + break; + } + } + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(1)) { + jj_scanpos = xsp; + break; + } + } + return false; + } + + private boolean jj_3R_177() { + if (jj_3R_197()) { + return true; + } + return false; + } + + private boolean jj_3R_195() { + if (jj_3R_170()) { + return true; + } + return false; + } + + private boolean jj_3R_174() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_195()) { + jj_scanpos = xsp; + if (jj_3R_196()) { + return true; + } + } + return false; + } + /** Generated Token Manager. */ public ParserTokenManager token_source; /** Current token. */ @@ -7951,7 +7932,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { private Token jj_scanpos, jj_lastpos; private int jj_la; private int jj_gen; - final private int[] jj_la1 = new int[252]; + final private int[] jj_la1 = new int[248]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -7965,115 +7946,114 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { private static void jj_la1_init_0() { jj_la1_0 = new int[] { 0x0, 0xc02, 0xc02, 0x0, 0xc00, 0x2, 0x2, 0x2, - 0xd3100000, 0x0, 0xc00, 0x2, 0xc00, 0x2, 0x0, 0x2, 0x0, 0x2, - 0x2, 0x0, 0x0, 0x2, 0x2, 0x0, 0x2, 0x0, 0x2, 0x2, 0xd3100000, - 0xd3100000, 0x2, 0x2, 0x2, 0xd3f45400, 0xd3f45400, 0x2, - 0x400000, 0x2, 0x2, 0x2, 0x2, 0x0, 0x0, 0x2, 0x0, 0x800000, - 0x2, 0x0, 0x2, 0x2, 0x2, 0x2, 0x0, 0x800000, 0x2, 0x0, 0x2, - 0xe45400, 0x3100000, 0x3100002, 0x3100000, 0x2, 0x2, 0x480002, - 0x480002, 0x2, 0x0, 0x0, 0x2, 0x2, 0x2, 0x2, 0xd3100000, - 0xd3100000, 0x2, 0x400000, 0x2, 0xd3100000, 0x2, 0x10000000, + 0xd3100000, 0x0, 0xc00, 0x2, 0xc00, 0x2, 0x0, 0x2, 0x2, 0x2, + 0x0, 0x0, 0x2, 0x2, 0x0, 0x2, 0x0, 0x2, 0x2, 0xd3100000, + 0xd3100000, 0x2, 0x2, 0x2, 0xd3f45400, 0xd3f45400, 0x2, 0x2, + 0x2, 0x0, 0x0, 0x2, 0x0, 0x800000, 0x2, 0x0, 0x2, 0x2, 0x2, + 0x2, 0x0, 0x800000, 0x2, 0x0, 0x2, 0xe45400, 0x3100000, + 0x3100002, 0x3100000, 0x2, 0x2, 0x480002, 0x480002, 0x2, 0x0, + 0x0, 0x2, 0x2, 0x2, 0x2, 0xd3100000, 0xd3100000, 0x2, 0x400000, + 0x2, 0xd3100000, 0x2, 0x10000000, 0x10000000, 0x10000000, 0x10000000, 0x10000000, 0x10000000, 0x10000000, 0x10000000, - 0x10000000, 0x10000000, 0x10000000, 0x10000000, 0xd0000000, - 0x0, 0x0, 0x0, 0x0, 0xc0000000, 0x2, 0x2, 0xfc000, 0x2, 0x0, - 0x2, 0xfc000, 0x0, 0x2, 0x0, 0x2, 0x0, 0x2, 0x800000, 0x0, - 0xd3100000, 0x0, 0x4d380002, 0x2, 0xd3100000, 0x2, 0x0, 0x2, - 0x4d380002, 0x0, 0x2, 0xd3100000, 0x2, 0x4d380002, 0x2, 0x2, - 0x2, 0x0, 0x2, 0xd3100000, 0x2, 0x2, 0x400000, 0x2, 0x2, 0x2, - 0x2, 0x0, 0x2, 0xd3100000, 0xd3100000, 0x2, 0x400000, 0x2, 0x2, - 0x2, 0x400000, 0x0, 0x0, 0x300000, 0x2, 0x0, 0x400000, 0x2, - 0x300000, 0x2, 0x0, 0x2, 0x0, 0x2, 0x800000, 0x2, 0x2, 0x0, - 0x2, 0x0, 0x2, 0x2, 0x2, 0x400000, 0x2, 0x2, 0x2, 0x2, 0x2, - 0x0, 0x2, 0x2, 0x2, 0x400000, 0x2, 0x2, 0x2, 0x0, 0x2, 0x2, - 0x2, 0x400000, 0x2, 0x2, 0x0, 0x2, 0x0, 0x2, 0x2, 0x2, - 0x400000, 0x0, 0x2, 0x2, 0x0, 0x2, 0x2, 0x2, 0x800000, 0x2, - 0x2, 0x0, 0x800000, 0x2, 0x0, 0x2, 0x0, 0xd3100000, 0x2, 0x0, - 0x2, 0x0, 0x800000, 0x2, 0x0, 0x2, 0x301000, 0x2, 0x0, 0x2, - 0x2, 0x2, 0x2, 0x8400000, 0x8400000, 0x300000, 0x300000, - 0x300000, 0x0, 0x0, 0x0, 0x0, 0x300000, 0x2, 0x2, 0x300000, - 0x2, 0xd3100000, 0x2, 0x2, 0x2, 0x0, 0x800000, 0x2, 0x0, 0x2, }; + 0x10000000, 0x10000000, 0xd0000000, 0x0, 0x0, 0x0, 0x0, + 0xc0000000, 0x2, 0x2, 0xfc000, 0x2, 0x0, 0x2, 0xfc000, 0x0, + 0x2, 0x0, 0x2, 0x0, 0x2, 0x800000, 0x0, 0xd3100000, 0x0, + 0x4d380002, 0x2, 0xd3100000, 0x2, 0x0, 0x2, 0x4d380002, 0x0, + 0x2, 0xd3100000, 0x2, 0x4d380002, 0x2, 0x2, 0x2, 0x0, 0x2, + 0xd3100000, 0x2, 0x2, 0x400000, 0x2, 0x2, 0x2, 0x2, 0x0, 0x2, + 0xd3100000, 0xd3100000, 0x2, 0x400000, 0x2, 0x2, 0x2, 0x400000, + 0x0, 0x0, 0x300000, 0x2, 0x0, 0x400000, 0x2, 0x300000, 0x2, + 0x0, 0x2, 0x0, 0x2, 0x800000, 0x2, 0x2, 0x0, 0x2, 0x0, 0x2, + 0x2, 0x2, 0x400000, 0x2, 0x2, 0x2, 0x2, 0x2, 0x0, 0x2, 0x2, + 0x2, 0x400000, 0x2, 0x2, 0x2, 0x0, 0x2, 0x2, 0x2, 0x400000, + 0x2, 0x2, 0x0, 0x2, 0x0, 0x2, 0x2, 0x2, 0x400000, 0x0, 0x2, + 0x2, 0x0, 0x2, 0x2, 0x2, 0x800000, 0x2, 0x2, 0x0, 0x800000, + 0x2, 0x0, 0x2, 0x0, 0xd3100000, 0x2, 0x0, 0x2, 0x0, 0x800000, + 0x2, 0x0, 0x2, 0x301000, 0x2, 0x0, 0x2, 0x2, 0x2, 0x2, + 0x8400000, 0x8400000, 0x300000, 0x300000, 0x300000, 0x0, 0x0, + 0x0, 0x0, 0x300000, 0x2, 0x2, 0x300000, 0x2, 0xd3100000, 0x2, + 0x2, 0x2, 0x0, 0x800000, 0x2, 0x0, 0x2, }; } private static void jj_la1_init_1() { jj_la1_1 = new int[] { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0xacc00181, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x100, 0x100, 0x0, 0x0, 0x240000, 0x0, 0x240000, 0x0, 0x0, - 0xac800181, 0xac800181, 0x0, 0x0, 0x0, 0xc000381, 0xc000381, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x80, 0x0, 0x100, 0x0, 0x0, - 0x100, 0x0, 0x0, 0x0, 0x0, 0x100, 0x0, 0x0, 0x100, 0x0, 0x200, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x185, 0x185, 0x0, 0x100, 0x100, 0x0, - 0x0, 0x0, 0x0, 0xac800181, 0xac800181, 0x0, 0x0, 0x0, 0x181, - 0x0, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, - 0x81, 0x181, 0x100, 0x100, 0x100, 0x100, 0x100, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0xa0000000, 0xc800181, 0x0, 0x7e, 0x0, 0xc800181, 0x0, 0x0, - 0x0, 0x7e, 0x0, 0x0, 0xc800181, 0x0, 0x7e, 0x0, 0x0, 0x0, 0x0, - 0x0, 0xc800181, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x100, 0x0, - 0xac800181, 0xac800181, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x80, - 0x80, 0x2c0081, 0x0, 0x80, 0x0, 0x0, 0x2c0081, 0x0, 0x80, 0x0, - 0x100, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0x0, - 0x0, 0x0, 0x0, 0xc000000, 0x0, 0x0, 0xc0000, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x100, 0x0, 0x0, 0x100, 0x0, 0xc000000, 0x181, - 0x0, 0x0, 0x0, 0x100, 0x0, 0x0, 0x100, 0x0, 0x2c0001, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2c0001, 0x0, 0x0, 0x1, - 0x2c0000, 0x2c0001, 0x2c0001, 0x0, 0x0, 0x2c0001, 0x0, - 0xc000181, 0x0, 0x0, 0x0, 0x100, 0x0, 0x0, 0x100, 0x0, }; + 0xacc00181, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x100, + 0x100, 0x0, 0x0, 0x240000, 0x0, 0x240000, 0x0, 0x0, 0xac800181, + 0xac800181, 0x0, 0x0, 0x0, 0xc000381, 0xc000381, 0x0, 0x0, 0x0, + 0x0, 0x80, 0x0, 0x100, 0x0, 0x0, 0x100, 0x0, 0x0, 0x0, 0x0, + 0x100, 0x0, 0x0, 0x100, 0x0, 0x200, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x185, 0x185, 0x0, 0x100, 0x100, 0x0, 0x0, 0x0, 0x0, + 0xac800181, 0xac800181, 0x0, 0x0, 0x0, 0x181, 0x0, 0x81, 0x81, + 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x181, 0x100, + 0x100, 0x100, 0x100, 0x100, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xa0000000, 0xc800181, 0x0, + 0x7e, 0x0, 0xc800181, 0x0, 0x0, 0x0, 0x7e, 0x0, 0x0, 0xc800181, + 0x0, 0x7e, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc800181, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x100, 0x0, 0xac800181, 0xac800181, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x80, 0x80, 0x2c0081, 0x0, 0x80, 0x0, + 0x0, 0x2c0081, 0x0, 0x80, 0x0, 0x100, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0, 0xc000000, 0x0, + 0x0, 0xc0000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x100, 0x0, 0x0, + 0x100, 0x0, 0xc000000, 0x181, 0x0, 0x0, 0x0, 0x100, 0x0, 0x0, + 0x100, 0x0, 0x2c0001, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x2c0001, 0x0, 0x0, 0x1, 0x2c0000, 0x2c0001, 0x2c0001, + 0x0, 0x0, 0x2c0001, 0x0, 0xc000181, 0x0, 0x0, 0x0, 0x100, 0x0, + 0x0, 0x100, 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, 0x100, 0x0, 0x0, 0x100, - 0x100, 0x0, 0x0, 0x2000, 0x0, 0x2000, 0x0, 0x0, 0x1112, 0x1112, - 0x0, 0x0, 0x0, 0x2b80, 0x2b80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x100, 0x0, 0x0, 0x100, 0x0, 0x0, 0x100, 0x0, 0x0, 0x0, 0x0, - 0x100, 0x0, 0x0, 0x100, 0x0, 0x2a80, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x380, 0x380, 0x0, 0x100, 0x100, 0x0, 0x0, 0x0, 0x0, 0x1112, - 0x1112, 0x0, 0x0, 0x0, 0x100, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x100, 0x100, 0x100, 0x100, 0x100, - 0x100, 0x0, 0x0, 0x0, 0x0, 0x180, 0x0, 0x0, 0x0, 0x0, 0x100, - 0x0, 0x40, 0x0, 0x0, 0x0, 0x102, 0x1000, 0x1300, 0x0, 0x1102, - 0x0, 0x1, 0x0, 0x1300, 0x20, 0x0, 0x1102, 0x0, 0x1300, 0x0, - 0x0, 0x0, 0x1100, 0x0, 0x1102, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x100, 0x0, 0x1102, 0x1102, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x1000, 0x1000, 0xfffffb80, 0x0, 0x0, 0x0, 0x0, 0xfffffb80, - 0x0, 0x0, 0x0, 0x1100, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x1000, 0x0, 0x0, 0x0, 0x0, 0x880, 0x0, 0x0, 0x0, 0x100, 0x100, + 0x0, 0x0, 0x2000, 0x0, 0x2000, 0x0, 0x0, 0x1112, 0x1112, 0x0, + 0x0, 0x0, 0x2b80, 0x2b80, 0x0, 0x0, 0x0, 0x100, 0x0, 0x0, + 0x100, 0x0, 0x0, 0x100, 0x0, 0x0, 0x0, 0x0, 0x100, 0x0, 0x0, + 0x100, 0x0, 0x2a80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x380, 0x380, 0x0, + 0x100, 0x100, 0x0, 0x0, 0x0, 0x0, 0x1112, 0x1112, 0x0, 0x0, + 0x0, 0x100, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x100, 0x100, 0x100, 0x100, 0x100, 0x100, 0x0, 0x0, 0x0, + 0x0, 0x180, 0x0, 0x0, 0x0, 0x0, 0x100, 0x0, 0x40, 0x0, 0x0, + 0x0, 0x102, 0x1000, 0x1300, 0x0, 0x1102, 0x0, 0x1, 0x0, 0x1300, + 0x20, 0x0, 0x1102, 0x0, 0x1300, 0x0, 0x0, 0x0, 0x1100, 0x0, + 0x1102, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x100, 0x0, 0x1102, + 0x1102, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1000, 0x1000, + 0xfffffb80, 0x0, 0x0, 0x0, 0x0, 0xfffffb80, 0x0, 0x0, 0x0, + 0x1100, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 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, 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, 0xfffffb80, 0x0, - 0xffffe200, 0x0, 0x100, 0x980, 0xffffeb80, 0x0, 0x0, - 0xfffffb80, 0x0, 0x100, 0x0, 0x0, 0x0, 0x100, 0x0, 0x0, 0x100, - 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, 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, 0x45, 0x45, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x45, 0x45, 0x0, 0x0, 0x0, 0xc401bf, 0xc401bf, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0xc401be, 0x0, 0x0, 0x0, 0x0, 0x0, 0x400000, 0x400000, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x45, 0x45, 0x0, 0x0, 0x0, 0x1, + 0x0, 0x1, 0x1, 0x0, 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x400000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x45, 0x0, + 0x200000, 0x0, 0x45, 0x0, 0x0, 0x0, 0x200000, 0x0, 0x0, 0x45, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x45, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x400000, 0x0, 0x75, 0x75, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x440001, 0x0, 0x0, 0x0, 0x0, 0x440001, + 0x0, 0x0, 0x0, 0x400000, 0x0, 0x0, 0x0, 0x0, 0x380000, 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, 0x45, 0x45, 0x0, - 0x0, 0x0, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x1, 0x1, 0x1, 0x1, - 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x400000, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x45, 0x0, 0x200000, 0x0, 0x45, 0x0, 0x0, 0x0, 0x200000, 0x0, - 0x0, 0x45, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x45, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x400000, 0x0, 0x75, 0x75, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x440001, 0x0, 0x0, 0x0, 0x0, - 0x440001, 0x0, 0x0, 0x0, 0x400000, 0x0, 0x0, 0x0, 0x0, - 0x380000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 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, - 0x440001, 0x0, 0x400000, 0x0, 0x0, 0x40001, 0x440001, 0x0, 0x0, - 0x440001, 0x0, 0x37, 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, 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[8]; @@ -8086,7 +8066,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 252; i++) { + for (int i = 0; i < 248; i++) { jj_la1[i] = -1; } for (int i = 0; i < jj_2_rtns.length; i++) { @@ -8100,7 +8080,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 252; i++) { + for (int i = 0; i < 248; i++) { jj_la1[i] = -1; } for (int i = 0; i < jj_2_rtns.length; i++) { @@ -8114,7 +8094,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 252; i++) { + for (int i = 0; i < 248; i++) { jj_la1[i] = -1; } for (int i = 0; i < jj_2_rtns.length; i++) { @@ -8128,7 +8108,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 252; i++) { + for (int i = 0; i < 248; i++) { jj_la1[i] = -1; } for (int i = 0; i < jj_2_rtns.length; i++) { @@ -8279,7 +8259,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 252; i++) { + for (int i = 0; i < 248; 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 d34c855362..840a88e66e 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj @@ -823,7 +823,7 @@ void importDeclaration() : } } ) - ( )* ( mediaStatement(ml) )? ";" + ( )* mediaStatement(ml) ";" ( )* { if (ml.getLength() == 0) { @@ -903,6 +903,7 @@ void keyframeSelector(): /** * @exception ParseException exception during the parse */ +/* see http://www.w3.org/TR/css3-mediaqueries/ */ void media() : { boolean start = false; @@ -927,12 +928,33 @@ void media() : } void mediaStatement(MediaListImpl ml) : -{ - String m; +{ + Token t; } { - m=medium() ( ( )* { ml.addItem(m); } m=medium() )* - { ml.addItem(m); } + { + t = getToken(1); + // loop over comma separated parts, add each to ml + while ((t.kind != LBRACE) && (t.kind != EOF) && (t.kind != SEMICOLON)) { + StringBuffer s = new StringBuffer(); + s.append(getToken(0).image); + while ((t.kind != COMMA) && (t.kind != LBRACE) && (t.kind != EOF) && (t.kind != SEMICOLON)) { + s.append(t.image); + getNextToken(); + t = getToken(1); + } + if (t.kind == COMMA) { + // skip the comma and the token before it that is still the active token + getNextToken(); + getNextToken(); + t = getToken(1); + } + String str = s.toString().trim(); + if (str.length() > 0) { + ml.addItem(str); + } + } + } } /** @@ -941,7 +963,7 @@ void mediaStatement(MediaListImpl ml) : String medium() : /* tv, projection, screen, ... */ {Token n;} { - n= ( )* { return convertIdent(n.image); } + n= { return convertIdent(n.image); } } /** diff --git a/theme-compiler/src/com/vaadin/sass/internal/tree/MediaNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/MediaNode.java index 238d5008bd..34d8ccbf7d 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/tree/MediaNode.java +++ b/theme-compiler/src/com/vaadin/sass/internal/tree/MediaNode.java @@ -41,6 +41,9 @@ public class MediaNode extends Node { StringBuilder builder = new StringBuilder("@media "); if (media != null) { for (int i = 0; i < media.getLength(); i++) { + if (i > 0) { + builder.append(", "); + } builder.append(media.item(i)); } } diff --git a/theme-compiler/tests/resources/automatic/css/media-import.css b/theme-compiler/tests/resources/automatic/css/media-import.css new file mode 100644 index 0000000000..80519945f8 --- /dev/null +++ b/theme-compiler/tests/resources/automatic/css/media-import.css @@ -0,0 +1 @@ +@import url(color.css) screen and (color); \ No newline at end of file diff --git a/theme-compiler/tests/resources/automatic/css/media-multiple.css b/theme-compiler/tests/resources/automatic/css/media-multiple.css new file mode 100644 index 0000000000..2550d018b3 --- /dev/null +++ b/theme-compiler/tests/resources/automatic/css/media-multiple.css @@ -0,0 +1,10 @@ +@media print, screen { + a { + b: c; + } +} +@media all and (max-width: 699px) and (min-width: 520px), (min-width: 1151px) { + body { + background: #ccc; + } +} \ No newline at end of file diff --git a/theme-compiler/tests/resources/automatic/css/media.css b/theme-compiler/tests/resources/automatic/css/media.css new file mode 100644 index 0000000000..f4183d9a07 --- /dev/null +++ b/theme-compiler/tests/resources/automatic/css/media.css @@ -0,0 +1,5 @@ +@media screen and (max-width: 480px) { + .abc { + background: red; + } +} diff --git a/theme-compiler/tests/resources/automatic/scss/media-import.scss b/theme-compiler/tests/resources/automatic/scss/media-import.scss new file mode 100644 index 0000000000..80519945f8 --- /dev/null +++ b/theme-compiler/tests/resources/automatic/scss/media-import.scss @@ -0,0 +1 @@ +@import url(color.css) screen and (color); \ No newline at end of file diff --git a/theme-compiler/tests/resources/automatic/scss/media-multiple.scss b/theme-compiler/tests/resources/automatic/scss/media-multiple.scss new file mode 100644 index 0000000000..2550d018b3 --- /dev/null +++ b/theme-compiler/tests/resources/automatic/scss/media-multiple.scss @@ -0,0 +1,10 @@ +@media print, screen { + a { + b: c; + } +} +@media all and (max-width: 699px) and (min-width: 520px), (min-width: 1151px) { + body { + background: #ccc; + } +} \ No newline at end of file diff --git a/theme-compiler/tests/resources/automatic/scss/media.scss b/theme-compiler/tests/resources/automatic/scss/media.scss new file mode 100644 index 0000000000..7db52de9ed --- /dev/null +++ b/theme-compiler/tests/resources/automatic/scss/media.scss @@ -0,0 +1,5 @@ +@media screen and (max-width: 480px) { + .abc { + background: red; + } +} -- 2.39.5