diff options
author | Artur Signell <artur@vaadin.com> | 2013-11-11 16:32:36 +0200 |
---|---|---|
committer | Artur Signell <artur@vaadin.com> | 2013-11-11 16:32:36 +0200 |
commit | f51b8911ad7d9ee8f651cf037e30a09e09a5e530 (patch) | |
tree | 5bed9252028bbe49ff5ccc1388cf89880c15244c /theme-compiler/src/com | |
parent | dc5183c62552135a1f2aa5a94ef6796ffebfcf15 (diff) | |
parent | a3aa6cc93e22fd6ff37ea6f3aa91810cab2aa624 (diff) | |
download | vaadin-framework-f51b8911ad7d9ee8f651cf037e30a09e09a5e530.tar.gz vaadin-framework-f51b8911ad7d9ee8f651cf037e30a09e09a5e530.zip |
Merge commit 'a3aa6cc93e22fd6ff37ea6f3aa91810cab2aa624'
Conflicts:
theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj
Change-Id: I3421c2d5c114765e924d7847cee46ebd370dfca6
Diffstat (limited to 'theme-compiler/src/com')
8 files changed, 1017 insertions, 904 deletions
diff --git a/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandler.java b/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandler.java index b9672b6c78..e6916e5070 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandler.java +++ b/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandler.java @@ -18,6 +18,7 @@ package com.vaadin.sass.internal.handler; import java.util.ArrayList; import java.util.Collection; +import java.util.List; import org.w3c.css.sac.CSSException; import org.w3c.css.sac.DocumentHandler; @@ -50,7 +51,7 @@ public interface SCSSDocumentHandler extends DocumentHandler { void endNestedProperties(String name); - void includeDirective(String name, Collection<LexicalUnitImpl> args); + void includeDirective(String name, List<LexicalUnitImpl> args); void importStyle(String uri, SACMediaList media, boolean isURL); @@ -98,7 +99,7 @@ public interface SCSSDocumentHandler extends DocumentHandler { void contentDirective(); - void startIncludeContentBlock(String name); + void startIncludeContentBlock(String name, List<LexicalUnitImpl> args); void endIncludeContentBlock(); diff --git a/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java b/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java index d77a404ae8..99f00e3889 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java +++ b/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java @@ -18,6 +18,7 @@ package com.vaadin.sass.internal.handler; import java.util.ArrayList; import java.util.Collection; +import java.util.List; import java.util.Stack; import org.w3c.css.sac.CSSException; @@ -244,7 +245,7 @@ public class SCSSDocumentHandlerImpl implements SCSSDocumentHandler { } @Override - public void includeDirective(String name, Collection<LexicalUnitImpl> args) { + public void includeDirective(String name, List<LexicalUnitImpl> args) { MixinNode node = new MixinNode(name, args); nodeStack.peek().appendChild(node); } @@ -374,8 +375,8 @@ public class SCSSDocumentHandlerImpl implements SCSSDocumentHandler { } @Override - public void startIncludeContentBlock(String name) { - MixinNode node = new MixinNode(name); + public void startIncludeContentBlock(String name, List<LexicalUnitImpl> args) { + MixinNode node = new MixinNode(name, args); nodeStack.peek().appendChild(node); nodeStack.push(node); diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/LexicalUnitImpl.java b/theme-compiler/src/com/vaadin/sass/internal/parser/LexicalUnitImpl.java index af94de0f46..cfd428e094 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/LexicalUnitImpl.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/LexicalUnitImpl.java @@ -377,6 +377,19 @@ public class LexicalUnitImpl implements LexicalUnit, SCSSLexicalUnit, } } + // A helper method for sass interpolation + public String unquotedString() { + String result = toString(); + if (result.length() >= 2 + && ((result.charAt(0) == '"' && result + .charAt(result.length() - 1) == '"') || (result + .charAt(0) == '\'' && result + .charAt(result.length() - 1) == '\''))) { + result = result.substring(1, result.length() - 1); + } + return result; + } + @Override public LexicalUnitImpl divide(LexicalUnitImpl denominator) { if (denominator.getLexicalUnitType() != SAC_INTEGER 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 d8669a82f1..53d1ee78ca 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java @@ -159,7 +159,6 @@ 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 @@ -874,6 +873,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case TO: case FROM: + case CONTENT_SYM: case PERCENTAGE: ; break; @@ -881,7 +881,20 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { jj_la1[22] = jj_gen; break label_17; } - keyframeSelector(); + switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { + case TO: + case FROM: + case PERCENTAGE: + keyframeSelector(); + break; + case CONTENT_SYM: + contentDirective(); + break; + default: + jj_la1[23] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } } jj_consume_token(RBRACE); label_18: while (true) { @@ -890,7 +903,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[23] = jj_gen; + jj_la1[24] = jj_gen; break label_18; } jj_consume_token(S); @@ -907,6 +920,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { final public void keyframeSelector() throws ParseException { Token n; + String selector = ""; boolean start = false; try { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -920,36 +934,86 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { n = jj_consume_token(PERCENTAGE); break; default: - jj_la1[24] = jj_gen; + jj_la1[25] = jj_gen; jj_consume_token(-1); throw new ParseException(); } + selector += n.image; label_19: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[25] = jj_gen; + jj_la1[26] = jj_gen; break label_19; } jj_consume_token(S); } - jj_consume_token(LBRACE); label_20: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { - case S: + case COMMA: ; break; default: - jj_la1[26] = jj_gen; + jj_la1[27] = jj_gen; break label_20; } + jj_consume_token(COMMA); + label_21: while (true) { + switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { + case S: + ; + break; + default: + jj_la1[28] = jj_gen; + break label_21; + } + jj_consume_token(S); + } + switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { + case FROM: + n = jj_consume_token(FROM); + break; + case TO: + n = jj_consume_token(TO); + break; + case PERCENTAGE: + n = jj_consume_token(PERCENTAGE); + break; + default: + jj_la1[29] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + selector += (", " + n.image); + label_22: while (true) { + switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { + case S: + ; + break; + default: + jj_la1[30] = jj_gen; + break label_22; + } + jj_consume_token(S); + } + } + jj_consume_token(LBRACE); + label_23: while (true) { + switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { + case S: + ; + break; + default: + jj_la1[31] = jj_gen; + break label_23; + } jj_consume_token(S); } start = true; - documentHandler.startKeyframeSelector(n.image); - label_21: while (true) { + documentHandler.startKeyframeSelector(selector); + label_24: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: case PRECEDES: @@ -977,8 +1041,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[27] = jj_gen; - break label_21; + jj_la1[32] = jj_gen; + break label_24; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: @@ -1009,20 +1073,20 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { microsoftExtension(); break; default: - jj_la1[28] = jj_gen; + jj_la1[33] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } jj_consume_token(RBRACE); - label_22: while (true) { + label_25: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[29] = jj_gen; - break label_22; + jj_la1[34] = jj_gen; + break label_25; } jj_consume_token(S); } @@ -1058,14 +1122,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { MediaListImpl ml = new MediaListImpl(); try { jj_consume_token(MEDIA_SYM); - label_23: while (true) { + label_26: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[30] = jj_gen; - break label_23; + jj_la1[35] = jj_gen; + break label_26; } jj_consume_token(S); } @@ -1073,18 +1137,18 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { start = true; documentHandler.startMedia(ml); jj_consume_token(LBRACE); - label_24: while (true) { + label_27: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[31] = jj_gen; - break label_24; + jj_la1[36] = jj_gen; + break label_27; } jj_consume_token(S); } - label_25: while (true) { + label_28: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case CDO: case LBRACE: @@ -1124,8 +1188,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[32] = jj_gen; - break label_25; + jj_la1[37] = jj_gen; + break label_28; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case DEBUG_SYM: @@ -1170,20 +1234,20 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { skipUnknownRule(); break; default: - jj_la1[33] = jj_gen; + jj_la1[38] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } jj_consume_token(RBRACE); - label_26: while (true) { + label_29: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[34] = jj_gen; - break label_26; + jj_la1[39] = jj_gen; + break label_29; } jj_consume_token(S); } @@ -1252,34 +1316,34 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { String pseudo = null; try { jj_consume_token(PAGE_SYM); - label_27: while (true) { + label_30: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[35] = jj_gen; - break label_27; + jj_la1[40] = jj_gen; + break label_30; } jj_consume_token(S); } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case IDENT: n = jj_consume_token(IDENT); - label_28: while (true) { + label_31: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[36] = jj_gen; - break label_28; + jj_la1[41] = jj_gen; + break label_31; } jj_consume_token(S); } break; default: - jj_la1[37] = jj_gen; + jj_la1[42] = jj_gen; ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -1287,21 +1351,21 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { pseudo = pseudo_page(); break; default: - jj_la1[38] = jj_gen; + jj_la1[43] = jj_gen; ; } if (n != null) { page = convertIdent(n.image); } jj_consume_token(LBRACE); - label_29: while (true) { + label_32: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[39] = jj_gen; - break label_29; + jj_la1[44] = jj_gen; + break label_32; } jj_consume_token(S); } @@ -1313,27 +1377,27 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[40] = jj_gen; + jj_la1[45] = jj_gen; ; } - label_30: while (true) { + label_33: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[41] = jj_gen; - break label_30; + jj_la1[46] = jj_gen; + break label_33; } jj_consume_token(SEMICOLON); - label_31: while (true) { + label_34: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[42] = jj_gen; - break label_31; + jj_la1[47] = jj_gen; + break label_34; } jj_consume_token(S); } @@ -1343,19 +1407,19 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[43] = jj_gen; + jj_la1[48] = jj_gen; ; } } jj_consume_token(RBRACE); - label_32: while (true) { + label_35: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[44] = jj_gen; - break label_32; + jj_la1[49] = jj_gen; + break label_35; } jj_consume_token(S); } @@ -1381,14 +1445,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { Token n; jj_consume_token(COLON); n = jj_consume_token(IDENT); - label_33: while (true) { + label_36: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[45] = jj_gen; - break label_33; + jj_la1[50] = jj_gen; + break label_36; } jj_consume_token(S); } @@ -1404,26 +1468,26 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { boolean start = false; try { jj_consume_token(FONT_FACE_SYM); - label_34: while (true) { + label_37: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[46] = jj_gen; - break label_34; + jj_la1[51] = jj_gen; + break label_37; } jj_consume_token(S); } jj_consume_token(LBRACE); - label_35: while (true) { + label_38: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[47] = jj_gen; - break label_35; + jj_la1[52] = jj_gen; + break label_38; } jj_consume_token(S); } @@ -1435,27 +1499,27 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[48] = jj_gen; + jj_la1[53] = jj_gen; ; } - label_36: while (true) { + label_39: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[49] = jj_gen; - break label_36; + jj_la1[54] = jj_gen; + break label_39; } jj_consume_token(SEMICOLON); - label_37: while (true) { + label_40: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[50] = jj_gen; - break label_37; + jj_la1[55] = jj_gen; + break label_40; } jj_consume_token(S); } @@ -1465,19 +1529,19 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[51] = jj_gen; + jj_la1[56] = jj_gen; ; } } jj_consume_token(RBRACE); - label_38: while (true) { + label_41: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[52] = jj_gen; - break label_38; + jj_la1[57] = jj_gen; + break label_41; } jj_consume_token(S); } @@ -1579,7 +1643,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { n = jj_consume_token(UNKNOWN); break; default: - jj_la1[53] = jj_gen; + jj_la1[58] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1614,12 +1678,12 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { connector = combinatorChar(); break; default: - jj_la1[54] = jj_gen; + jj_la1[59] = jj_gen; ; } break; default: - jj_la1[55] = jj_gen; + jj_la1[60] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1645,18 +1709,18 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { t = jj_consume_token(SIBLING); break; default: - jj_la1[56] = jj_gen; + jj_la1[61] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_39: while (true) { + label_42: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[57] = jj_gen; - break label_39; + jj_la1[62] = jj_gen; + break label_42; } jj_consume_token(S); } @@ -1674,20 +1738,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_40: while (true) { + label_43: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[58] = jj_gen; - break label_40; + jj_la1[63] = jj_gen; + break label_43; } jj_consume_token(S); } name = n.image; jj_consume_token(COLON); - label_41: while (true) { + label_44: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case IDENT: n = jj_consume_token(IDENT); @@ -1736,7 +1800,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } break; default: - jj_la1[59] = jj_gen; + jj_la1[64] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1755,19 +1819,19 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[60] = jj_gen; - break label_41; + jj_la1[65] = jj_gen; + break label_44; } } jj_consume_token(SEMICOLON); - label_42: while (true) { + label_45: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[61] = jj_gen; - break label_42; + jj_la1[66] = jj_gen; + break label_45; } jj_consume_token(S); } @@ -1781,7 +1845,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { final public String property() throws ParseException { Token t; String s = ""; - label_43: while (true) { + label_46: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case IDENT: t = jj_consume_token(IDENT); @@ -1792,7 +1856,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { s += t.image; break; default: - jj_la1[62] = jj_gen; + jj_la1[67] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1802,18 +1866,18 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[63] = jj_gen; - break label_43; + jj_la1[68] = jj_gen; + break label_46; } } - label_44: while (true) { + label_47: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[64] = jj_gen; - break label_44; + jj_la1[69] = jj_gen; + break label_47; } jj_consume_token(S); } @@ -1828,14 +1892,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_45: while (true) { + label_48: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[65] = jj_gen; - break label_45; + jj_la1[70] = jj_gen; + break label_48; } jj_consume_token(S); } @@ -1850,14 +1914,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_46: while (true) { + label_49: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[66] = jj_gen; - break label_46; + jj_la1[71] = jj_gen; + break label_49; } jj_consume_token(S); } @@ -1882,20 +1946,20 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { l = selectorList(); save = token; jj_consume_token(LBRACE); - label_47: while (true) { + label_50: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[67] = jj_gen; - break label_47; + jj_la1[72] = jj_gen; + break label_50; } jj_consume_token(S); } start = true; documentHandler.startSelector(l); - label_48: while (true) { + label_51: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: case PRECEDES: @@ -1924,8 +1988,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[68] = jj_gen; - break label_48; + jj_la1[73] = jj_gen; + break label_51; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: @@ -1959,20 +2023,20 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { importDeclaration(); break; default: - jj_la1[69] = jj_gen; + jj_la1[74] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } jj_consume_token(RBRACE); - label_49: while (true) { + label_52: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[70] = jj_gen; - break label_49; + jj_la1[75] = jj_gen; + break label_52; } jj_consume_token(S); } @@ -2001,24 +2065,24 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ArrayList<String> selectors = new ArrayList<String>(); String selector; selector = selector(); - label_50: while (true) { + label_53: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: ; break; default: - jj_la1[71] = jj_gen; - break label_50; + jj_la1[76] = jj_gen; + break label_53; } jj_consume_token(COMMA); - label_51: while (true) { + label_54: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[72] = jj_gen; - break label_51; + jj_la1[77] = jj_gen; + break label_54; } jj_consume_token(S); } @@ -2060,27 +2124,27 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { selector = simple_selector(selector, comb); break; default: - jj_la1[73] = jj_gen; + jj_la1[78] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_52: while (true) { + label_55: while (true) { if (jj_2_2(2)) { ; } else { - break label_52; + break label_55; } comb = combinator(); selector = simple_selector(selector, comb); } - label_53: while (true) { + label_56: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[74] = jj_gen; - break label_53; + jj_la1[79] = jj_gen; + break label_56; } jj_consume_token(S); } @@ -2129,7 +2193,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case INTERPOLATION: case IDENT: simple_current = element_name(); - label_54: while (true) { + label_57: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case LBRACKET: case DOT: @@ -2138,8 +2202,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[75] = jj_gen; - break label_54; + jj_la1[80] = jj_gen; + break label_57; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case HASH: @@ -2155,7 +2219,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { cond = pseudo(cond); break; default: - jj_la1[76] = jj_gen; + jj_la1[81] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2165,7 +2229,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case DOT: case COLON: case HASH: - label_55: while (true) { + label_58: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case HASH: cond = hash(cond); @@ -2180,7 +2244,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { cond = pseudo(cond); break; default: - jj_la1[77] = jj_gen; + jj_la1[82] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2192,13 +2256,13 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[78] = jj_gen; - break label_55; + jj_la1[83] = jj_gen; + break label_58; } } break; default: - jj_la1[79] = jj_gen; + jj_la1[84] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2251,7 +2315,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { Token t; String s = "."; jj_consume_token(DOT); - label_56: while (true) { + label_59: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case IDENT: t = jj_consume_token(IDENT); @@ -2262,7 +2326,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { s += t.image; break; default: - jj_la1[80] = jj_gen; + jj_la1[85] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2272,8 +2336,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[81] = jj_gen; - break label_56; + jj_la1[86] = jj_gen; + break label_59; } } if (pred == null) { @@ -2302,7 +2366,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case INTERPOLATION: case IDENT: - label_57: while (true) { + label_60: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case IDENT: t = jj_consume_token(IDENT); @@ -2313,7 +2377,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { s += t.image; break; default: - jj_la1[82] = jj_gen; + jj_la1[87] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2323,8 +2387,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[83] = jj_gen; - break label_57; + jj_la1[88] = jj_gen; + break label_60; } } { @@ -2350,7 +2414,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } break; default: - jj_la1[84] = jj_gen; + jj_la1[89] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2367,26 +2431,26 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { Token val = null; String attValue = null; jj_consume_token(LBRACKET); - label_58: while (true) { + label_61: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[85] = jj_gen; - break label_58; + jj_la1[90] = jj_gen; + break label_61; } jj_consume_token(S); } att = jj_consume_token(IDENT); - label_59: while (true) { + label_62: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[86] = jj_gen; - break label_59; + jj_la1[91] = jj_gen; + break label_62; } jj_consume_token(S); } @@ -2423,18 +2487,18 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { cases = 6; break; default: - jj_la1[87] = jj_gen; + jj_la1[92] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_60: while (true) { + label_63: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[88] = jj_gen; - break label_60; + jj_la1[93] = jj_gen; + break label_63; } jj_consume_token(S); } @@ -2448,24 +2512,24 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { attValue = val.image; break; default: - jj_la1[89] = jj_gen; + jj_la1[94] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_61: while (true) { + label_64: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[90] = jj_gen; - break label_61; + jj_la1[95] = jj_gen; + break label_64; } jj_consume_token(S); } break; default: - jj_la1[91] = jj_gen; + jj_la1[96] = jj_gen; ; } jj_consume_token(RBRACKET); @@ -2530,7 +2594,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { isPseudoElement = true; break; default: - jj_la1[92] = jj_gen; + jj_la1[97] = jj_gen; ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -2573,14 +2637,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { break; case FUNCTION: n = jj_consume_token(FUNCTION); - label_62: while (true) { + label_65: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[93] = jj_gen; - break label_62; + jj_la1[98] = jj_gen; + break label_65; } jj_consume_token(S); } @@ -2605,7 +2669,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } break; default: - jj_la1[94] = jj_gen; + jj_la1[99] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2644,14 +2708,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { try { name = variableName(); jj_consume_token(COLON); - label_63: while (true) { + label_66: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[95] = jj_gen; - break label_63; + jj_la1[100] = jj_gen; + break label_66; } jj_consume_token(S); } @@ -2661,19 +2725,19 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { guarded = guarded(); break; default: - jj_la1[96] = jj_gen; + jj_la1[101] = jj_gen; ; } - label_64: while (true) { + label_67: while (true) { jj_consume_token(SEMICOLON); - label_65: while (true) { + label_68: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[97] = jj_gen; - break label_65; + jj_la1[102] = jj_gen; + break label_68; } jj_consume_token(S); } @@ -2682,8 +2746,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[98] = jj_gen; - break label_64; + jj_la1[103] = jj_gen; + break label_67; } } documentHandler.variable(name, exp, guarded); @@ -2721,7 +2785,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { eachDirective(); break; default: - jj_la1[99] = jj_gen; + jj_la1[104] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2760,7 +2824,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { keyframes(); break; default: - jj_la1[100] = jj_gen; + jj_la1[105] = jj_gen; if (jj_2_3(2147483647)) { variable(); } else { @@ -2776,7 +2840,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { atRuleDeclaration(); break; default: - jj_la1[101] = jj_gen; + jj_la1[106] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2789,7 +2853,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { String s = null; String evaluator = ""; jj_consume_token(IF_SYM); - label_66: while (true) { + label_69: while (true) { s = booleanExpressionToken(); evaluator += s; switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -2814,25 +2878,25 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[102] = jj_gen; - break label_66; + jj_la1[107] = jj_gen; + break label_69; } } jj_consume_token(LBRACE); - label_67: while (true) { + label_70: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[103] = jj_gen; - break label_67; + jj_la1[108] = jj_gen; + break label_70; } jj_consume_token(S); } documentHandler.startIfElseDirective(); documentHandler.ifDirective(evaluator); - label_68: while (true) { + label_71: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: case PRECEDES: @@ -2860,8 +2924,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[104] = jj_gen; - break label_68; + jj_la1[109] = jj_gen; + break label_71; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: @@ -2892,31 +2956,31 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { fontFace(); break; default: - jj_la1[105] = jj_gen; + jj_la1[110] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } jj_consume_token(RBRACE); - label_69: while (true) { + label_72: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[106] = jj_gen; - break label_69; + jj_la1[111] = jj_gen; + break label_72; } jj_consume_token(S); } - label_70: while (true) { + label_73: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case ELSE_SYM: ; break; default: - jj_la1[107] = jj_gen; - break label_70; + jj_la1[112] = jj_gen; + break label_73; } elseDirective(); } @@ -2928,21 +2992,21 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { Token n = null; String s = null; jj_consume_token(ELSE_SYM); - label_71: while (true) { + label_74: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[108] = jj_gen; - break label_71; + 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_72: while (true) { + label_75: while (true) { s = booleanExpressionToken(); evaluator += s; switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -2967,24 +3031,24 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[109] = jj_gen; - break label_72; + jj_la1[114] = jj_gen; + break label_75; } } break; default: - jj_la1[110] = jj_gen; + jj_la1[115] = jj_gen; ; } jj_consume_token(LBRACE); - label_73: while (true) { + label_76: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[111] = jj_gen; - break label_73; + jj_la1[116] = jj_gen; + break label_76; } jj_consume_token(S); } @@ -2993,7 +3057,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } else { documentHandler.elseDirective(); } - label_74: while (true) { + label_77: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: case PRECEDES: @@ -3021,8 +3085,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[112] = jj_gen; - break label_74; + jj_la1[117] = jj_gen; + break label_77; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: @@ -3053,20 +3117,20 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { fontFace(); break; default: - jj_la1[113] = jj_gen; + jj_la1[118] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } jj_consume_token(RBRACE); - label_75: while (true) { + label_78: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[114] = jj_gen; - break label_75; + jj_la1[119] = jj_gen; + break label_78; } jj_consume_token(S); } @@ -3131,7 +3195,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { n = jj_consume_token(NOT_EQ); break; default: - jj_la1[115] = jj_gen; + jj_la1[120] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3157,38 +3221,38 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ArrayList<String> list = null; String listVariable = null; jj_consume_token(EACH_SYM); - label_76: while (true) { + label_79: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[116] = jj_gen; - break label_76; + jj_la1[121] = jj_gen; + break label_79; } jj_consume_token(S); } var = jj_consume_token(VARIABLE); - label_77: while (true) { + label_80: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[117] = jj_gen; - break label_77; + jj_la1[122] = jj_gen; + break label_80; } jj_consume_token(S); } jj_consume_token(EACH_IN); - label_78: while (true) { + label_81: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[118] = jj_gen; - break label_78; + jj_la1[123] = jj_gen; + break label_81; } jj_consume_token(S); } @@ -3202,23 +3266,23 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { documentHandler.startEachDirective(var.image, listVariable); break; default: - jj_la1[119] = jj_gen; + jj_la1[124] = jj_gen; jj_consume_token(-1); throw new ParseException(); } jj_consume_token(LBRACE); - label_79: while (true) { + label_82: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[120] = jj_gen; - break label_79; + jj_la1[125] = jj_gen; + break label_82; } jj_consume_token(S); } - label_80: while (true) { + label_83: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: case PRECEDES: @@ -3245,20 +3309,20 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[121] = jj_gen; - break label_80; + jj_la1[126] = jj_gen; + break label_83; } ifContentStatement(); } jj_consume_token(RBRACE); - label_81: while (true) { + label_84: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[122] = jj_gen; - break label_81; + jj_la1[127] = jj_gen; + break label_84; } jj_consume_token(S); } @@ -3269,49 +3333,49 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ArrayList<String> strings = new ArrayList<String>(); Token input; input = jj_consume_token(IDENT); - label_82: while (true) { + label_85: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[123] = jj_gen; - break label_82; + jj_la1[128] = jj_gen; + break label_85; } jj_consume_token(S); } strings.add(input.image); - label_83: while (true) { + label_86: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: ; break; default: - jj_la1[124] = jj_gen; - break label_83; + jj_la1[129] = jj_gen; + break label_86; } jj_consume_token(COMMA); - label_84: while (true) { + label_87: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[125] = jj_gen; - break label_84; + jj_la1[130] = jj_gen; + break label_87; } jj_consume_token(S); } input = jj_consume_token(IDENT); strings.add(input.image); - label_85: while (true) { + label_88: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[126] = jj_gen; - break label_85; + jj_la1[131] = jj_gen; + break label_88; } jj_consume_token(S); } @@ -3329,14 +3393,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ArrayList<VariableNode> args = null; String body; jj_consume_token(MIXIN_SYM); - label_86: while (true) { + label_89: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[127] = jj_gen; - break label_86; + jj_la1[132] = jj_gen; + break label_89; } jj_consume_token(S); } @@ -3349,37 +3413,37 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { name = functionName(); args = arglist(); jj_consume_token(RPARAN); - label_87: while (true) { + label_90: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[128] = jj_gen; - break label_87; + jj_la1[133] = jj_gen; + break label_90; } jj_consume_token(S); } break; default: - jj_la1[129] = jj_gen; + jj_la1[134] = jj_gen; jj_consume_token(-1); throw new ParseException(); } jj_consume_token(LBRACE); - label_88: while (true) { + label_91: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[130] = jj_gen; - break label_88; + jj_la1[135] = jj_gen; + break label_91; } jj_consume_token(S); } documentHandler.startMixinDirective(name, args); - label_89: while (true) { + label_92: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: case PRECEDES: @@ -3408,8 +3472,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[131] = jj_gen; - break label_89; + jj_la1[136] = jj_gen; + break label_92; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: @@ -3443,20 +3507,20 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { page(); break; default: - jj_la1[132] = jj_gen; + jj_la1[137] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } jj_consume_token(RBRACE); - label_90: while (true) { + label_93: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[133] = jj_gen; - break label_90; + jj_la1[138] = jj_gen; + break label_93; } jj_consume_token(S); } @@ -3468,24 +3532,24 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { VariableNode arg; boolean hasNonOptionalArgument = false; arg = mixinArg(); - label_91: while (true) { + label_94: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: ; break; default: - jj_la1[134] = jj_gen; - break label_91; + jj_la1[139] = jj_gen; + break label_94; } jj_consume_token(COMMA); - label_92: while (true) { + label_95: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[135] = jj_gen; - break label_92; + jj_la1[140] = jj_gen; + break label_95; } jj_consume_token(S); } @@ -3536,42 +3600,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_93: while (true) { + label_96: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[136] = jj_gen; - break label_93; + jj_la1[141] = jj_gen; + break label_96; } jj_consume_token(S); } first = nonVariableTerm(null); prev = first; - label_94: while (true) { + label_97: while (true) { if (jj_2_5(3)) { ; } else { - break label_94; + break label_97; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: jj_consume_token(COMMA); - label_95: while (true) { + label_98: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[137] = jj_gen; - break label_95; + jj_la1[142] = jj_gen; + break label_98; } jj_consume_token(S); } break; default: - jj_la1[138] = jj_gen; + jj_la1[143] = jj_gen; ; } prev = nonVariableTerm(prev); @@ -3583,13 +3647,13 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { token.beginColumn, prev, variable.image); break; default: - jj_la1[139] = jj_gen; + jj_la1[144] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[140] = jj_gen; + jj_la1[145] = jj_gen; ; } VariableNode arg = new VariableNode(name, first, false); @@ -3610,7 +3674,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { first = term(null); args.add(first); prev = first; - label_96: while (true) { + label_99: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: case MINUS: @@ -3649,57 +3713,57 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[141] = jj_gen; - break label_96; + jj_la1[146] = jj_gen; + break label_99; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COLON: jj_consume_token(COLON); - label_97: while (true) { + label_100: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[142] = jj_gen; - break label_97; + jj_la1[147] = jj_gen; + break label_100; } jj_consume_token(S); } break; default: - jj_la1[143] = jj_gen; + jj_la1[148] = jj_gen; ; } next = term(prev); prev.setNextLexicalUnit(next); prev = next; } - label_98: while (true) { + label_101: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COMMA: ; break; default: - jj_la1[144] = jj_gen; - break label_98; + jj_la1[149] = jj_gen; + break label_101; } jj_consume_token(COMMA); - label_99: while (true) { + label_102: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[145] = jj_gen; - break label_99; + jj_la1[150] = jj_gen; + break label_102; } jj_consume_token(S); } first = term(null); args.add(first); prev = first; - label_100: while (true) { + label_103: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: case MINUS: @@ -3738,26 +3802,26 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[146] = jj_gen; - break label_100; + jj_la1[151] = jj_gen; + break label_103; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case COLON: jj_consume_token(COLON); - label_101: while (true) { + label_104: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[147] = jj_gen; - break label_101; + jj_la1[152] = jj_gen; + break label_104; } jj_consume_token(S); } break; default: - jj_la1[148] = jj_gen; + jj_la1[153] = jj_gen; ; } next = term(prev); @@ -3777,14 +3841,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { String name; ArrayList<LexicalUnitImpl> args = null; jj_consume_token(INCLUDE_SYM); - label_102: while (true) { + label_105: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[149] = jj_gen; - break label_102; + jj_la1[154] = jj_gen; + break label_105; } jj_consume_token(S); } @@ -3801,35 +3865,35 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { name = functionName(); args = argValuelist(); jj_consume_token(RPARAN); - label_103: while (true) { + label_106: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[150] = jj_gen; - break label_103; + jj_la1[155] = jj_gen; + break label_106; } jj_consume_token(S); } break; default: - jj_la1[151] = jj_gen; + jj_la1[156] = jj_gen; jj_consume_token(-1); throw new ParseException(); } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case SEMICOLON: - label_104: while (true) { + label_107: while (true) { jj_consume_token(SEMICOLON); - label_105: while (true) { + label_108: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[152] = jj_gen; - break label_105; + jj_la1[157] = jj_gen; + break label_108; } jj_consume_token(S); } @@ -3838,27 +3902,27 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[153] = jj_gen; - break label_104; + jj_la1[158] = jj_gen; + break label_107; } } documentHandler.includeDirective(name, args); break; case LBRACE: jj_consume_token(LBRACE); - label_106: while (true) { + label_109: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[154] = jj_gen; - break label_106; + jj_la1[159] = jj_gen; + break label_109; } jj_consume_token(S); } - documentHandler.startIncludeContentBlock(name); - label_107: while (true) { + documentHandler.startIncludeContentBlock(name, args); + label_110: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case PLUS: case PRECEDES: @@ -3869,34 +3933,62 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case DOT: case COLON: case INTERPOLATION: + case TO: + case FROM: case DEBUG_SYM: case WARN_SYM: case IDENT: + case PERCENTAGE: case HASH: ; break; default: - jj_la1[155] = jj_gen; - break label_107; + jj_la1[160] = jj_gen; + break label_110; + } + switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { + case PLUS: + case PRECEDES: + case SIBLING: + case LBRACKET: + case ANY: + case PARENT: + case DOT: + case COLON: + case INTERPOLATION: + case DEBUG_SYM: + case WARN_SYM: + case IDENT: + case HASH: + styleRuleOrDeclarationOrNestedProperties(); + break; + case TO: + case FROM: + case PERCENTAGE: + keyframeSelector(); + break; + default: + jj_la1[161] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); } - styleRuleOrDeclarationOrNestedProperties(); } jj_consume_token(RBRACE); - label_108: while (true) { + label_111: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[156] = jj_gen; - break label_108; + jj_la1[162] = jj_gen; + break label_111; } jj_consume_token(S); } documentHandler.endIncludeContentBlock(); break; default: - jj_la1[157] = jj_gen; + jj_la1[163] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3923,26 +4015,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_109: while (true) { + label_112: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[158] = jj_gen; - break label_109; + jj_la1[164] = jj_gen; + break label_112; } jj_consume_token(S); } jj_consume_token(COLON); - label_110: while (true) { + label_113: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[159] = jj_gen; - break label_110; + jj_la1[165] = jj_gen; + break label_113; } jj_consume_token(S); } @@ -3957,18 +4049,18 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { type = jj_consume_token(CONTAINS); break; default: - jj_la1[160] = jj_gen; + jj_la1[166] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_111: while (true) { + label_114: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[161] = jj_gen; - break label_111; + jj_la1[167] = jj_gen; + break label_114; } jj_consume_token(S); } @@ -3978,18 +4070,18 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { jj_consume_token(RPARAN); break; default: - jj_la1[162] = jj_gen; + jj_la1[168] = jj_gen; ; } jj_consume_token(COMMA); - label_112: while (true) { + label_115: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[163] = jj_gen; - break label_112; + jj_la1[169] = jj_gen; + break label_115; } jj_consume_token(S); } @@ -3997,33 +4089,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_113: while (true) { + label_116: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[164] = jj_gen; - break label_113; + jj_la1[170] = jj_gen; + break label_116; } jj_consume_token(S); } n = jj_consume_token(IDENT); separator = n.image; - label_114: while (true) { + label_117: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[165] = jj_gen; - break label_114; + jj_la1[171] = jj_gen; + break label_117; } jj_consume_token(S); } break; default: - jj_la1[166] = jj_gen; + jj_la1[172] = jj_gen; ; } jj_consume_token(RPARAN); @@ -4044,26 +4136,26 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { default: break; } - label_115: while (true) { + label_118: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[167] = jj_gen; - break label_115; + jj_la1[173] = jj_gen; + break label_118; } jj_consume_token(S); } jj_consume_token(SEMICOLON); - label_116: while (true) { + label_119: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[168] = jj_gen; - break label_116; + jj_la1[174] = jj_gen; + break label_119; } jj_consume_token(S); } @@ -4081,38 +4173,38 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { Token n = null; n = jj_consume_token(VARIABLE); variable = n.image; - label_117: while (true) { + label_120: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[169] = jj_gen; - break label_117; + jj_la1[175] = jj_gen; + break label_120; } jj_consume_token(S); } jj_consume_token(COLON); - label_118: while (true) { + label_121: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[170] = jj_gen; - break label_118; + jj_la1[176] = jj_gen; + break label_121; } jj_consume_token(S); } jj_consume_token(APPEND); - label_119: while (true) { + label_122: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[171] = jj_gen; - break label_119; + jj_la1[177] = jj_gen; + break label_122; } jj_consume_token(S); } @@ -4122,18 +4214,18 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { jj_consume_token(RPARAN); break; default: - jj_la1[172] = jj_gen; + jj_la1[178] = jj_gen; ; } jj_consume_token(COMMA); - label_120: while (true) { + label_123: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[173] = jj_gen; - break label_120; + jj_la1[179] = jj_gen; + break label_123; } jj_consume_token(S); } @@ -4141,33 +4233,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_121: while (true) { + label_124: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[174] = jj_gen; - break label_121; + jj_la1[180] = jj_gen; + break label_124; } jj_consume_token(S); } n = jj_consume_token(IDENT); separator = n.image; - label_122: while (true) { + label_125: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[175] = jj_gen; - break label_122; + jj_la1[181] = jj_gen; + break label_125; } jj_consume_token(S); } break; default: - jj_la1[176] = jj_gen; + jj_la1[182] = jj_gen; ; } jj_consume_token(RPARAN); @@ -4186,38 +4278,38 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { Token n = null; n = jj_consume_token(VARIABLE); variable = n.image; - label_123: while (true) { + label_126: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[177] = jj_gen; - break label_123; + jj_la1[183] = jj_gen; + break label_126; } jj_consume_token(S); } jj_consume_token(COLON); - label_124: while (true) { + label_127: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[178] = jj_gen; - break label_124; + jj_la1[184] = jj_gen; + break label_127; } jj_consume_token(S); } jj_consume_token(REMOVE); - label_125: while (true) { + label_128: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[179] = jj_gen; - break label_125; + jj_la1[185] = jj_gen; + break label_128; } jj_consume_token(S); } @@ -4227,18 +4319,18 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { jj_consume_token(RPARAN); break; default: - jj_la1[180] = jj_gen; + jj_la1[186] = jj_gen; ; } jj_consume_token(COMMA); - label_126: while (true) { + label_129: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[181] = jj_gen; - break label_126; + jj_la1[187] = jj_gen; + break label_129; } jj_consume_token(S); } @@ -4246,33 +4338,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_127: while (true) { + label_130: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[182] = jj_gen; - break label_127; + jj_la1[188] = jj_gen; + break label_130; } jj_consume_token(S); } n = jj_consume_token(IDENT); separator = n.image; - label_128: while (true) { + label_131: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[183] = jj_gen; - break label_128; + jj_la1[189] = jj_gen; + break label_131; } jj_consume_token(S); } break; default: - jj_la1[184] = jj_gen; + jj_la1[190] = jj_gen; ; } jj_consume_token(RPARAN); @@ -4293,43 +4385,43 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case VARIABLE: n = jj_consume_token(VARIABLE); variable = n.image; - label_129: while (true) { + label_132: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[185] = jj_gen; - break label_129; + jj_la1[191] = jj_gen; + break label_132; } jj_consume_token(S); } jj_consume_token(COLON); - label_130: while (true) { + label_133: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[186] = jj_gen; - break label_130; + jj_la1[192] = jj_gen; + break label_133; } jj_consume_token(S); } break; default: - jj_la1[187] = jj_gen; + jj_la1[193] = jj_gen; ; } jj_consume_token(CONTAINS); - label_131: while (true) { + label_134: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[188] = jj_gen; - break label_131; + jj_la1[194] = jj_gen; + break label_134; } jj_consume_token(S); } @@ -4339,18 +4431,18 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { jj_consume_token(RPARAN); break; default: - jj_la1[189] = jj_gen; + jj_la1[195] = jj_gen; ; } jj_consume_token(COMMA); - label_132: while (true) { + label_135: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[190] = jj_gen; - break label_132; + jj_la1[196] = jj_gen; + break label_135; } jj_consume_token(S); } @@ -4358,33 +4450,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_133: while (true) { + label_136: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[191] = jj_gen; - break label_133; + jj_la1[197] = jj_gen; + break label_136; } jj_consume_token(S); } n = jj_consume_token(IDENT); separator = n.image; - label_134: while (true) { + label_137: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[192] = jj_gen; - break label_134; + jj_la1[198] = jj_gen; + break label_137; } jj_consume_token(S); } break; default: - jj_la1[193] = jj_gen; + jj_la1[199] = jj_gen; ; } jj_consume_token(RPARAN); @@ -4486,7 +4578,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { warnDirective(); break; default: - jj_la1[194] = jj_gen; + jj_la1[200] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4498,14 +4590,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_135: while (true) { + label_138: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[195] = jj_gen; - break label_135; + jj_la1[201] = jj_gen; + break label_138; } jj_consume_token(S); } @@ -4517,14 +4609,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_136: while (true) { + label_139: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[196] = jj_gen; - break label_136; + jj_la1[202] = jj_gen; + break label_139; } jj_consume_token(S); } @@ -4550,19 +4642,19 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { exclusive = false; break; default: - jj_la1[197] = jj_gen; + jj_la1[203] = jj_gen; jj_consume_token(-1); throw new ParseException(); } to = skipStatementUntilLeftBrace(); - label_137: while (true) { + label_140: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[198] = jj_gen; - break label_137; + jj_la1[204] = jj_gen; + break label_140; } jj_consume_token(S); } @@ -4592,28 +4684,28 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { final public void extendDirective() throws ParseException { ArrayList<String> list; jj_consume_token(EXTEND_SYM); - label_138: while (true) { + label_141: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[199] = jj_gen; - break label_138; + jj_la1[205] = jj_gen; + break label_141; } jj_consume_token(S); } list = selectorList(); - label_139: while (true) { + label_142: while (true) { jj_consume_token(SEMICOLON); - label_140: while (true) { + label_143: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[200] = jj_gen; - break label_140; + jj_la1[206] = jj_gen; + break label_143; } jj_consume_token(S); } @@ -4622,8 +4714,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[201] = jj_gen; - break label_139; + jj_la1[207] = jj_gen; + break label_142; } } documentHandler.extendDirective(list); @@ -4631,27 +4723,27 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { final public void contentDirective() throws ParseException { jj_consume_token(CONTENT_SYM); - label_141: while (true) { + label_144: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[202] = jj_gen; - break label_141; + jj_la1[208] = jj_gen; + break label_144; } jj_consume_token(S); } - label_142: while (true) { + label_145: while (true) { jj_consume_token(SEMICOLON); - label_143: while (true) { + label_146: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[203] = jj_gen; - break label_143; + jj_la1[209] = jj_gen; + break label_146; } jj_consume_token(S); } @@ -4660,8 +4752,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[204] = jj_gen; - break label_142; + jj_la1[210] = jj_gen; + break label_145; } } documentHandler.contentDirective(); @@ -4688,26 +4780,26 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { LexicalUnit exp; name = property(); jj_consume_token(COLON); - label_144: while (true) { + label_147: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[205] = jj_gen; - break label_144; + jj_la1[211] = jj_gen; + break label_147; } jj_consume_token(S); } jj_consume_token(LBRACE); - label_145: while (true) { + label_148: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[206] = jj_gen; - break label_145; + jj_la1[212] = jj_gen; + break label_148; } jj_consume_token(S); } @@ -4718,27 +4810,27 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[207] = jj_gen; + jj_la1[213] = jj_gen; ; } - label_146: while (true) { + label_149: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[208] = jj_gen; - break label_146; + jj_la1[214] = jj_gen; + break label_149; } jj_consume_token(SEMICOLON); - label_147: while (true) { + label_150: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[209] = jj_gen; - break label_147; + jj_la1[215] = jj_gen; + break label_150; } jj_consume_token(S); } @@ -4748,20 +4840,20 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[210] = jj_gen; + jj_la1[216] = jj_gen; ; } } jj_consume_token(RBRACE); documentHandler.endNestedProperties(name); - label_148: while (true) { + label_151: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[211] = jj_gen; - break label_148; + jj_la1[217] = jj_gen; + break label_151; } jj_consume_token(S); } @@ -4780,7 +4872,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { debuggingDirective(); break; default: - jj_la1[212] = jj_gen; + jj_la1[218] = jj_gen; if (jj_2_6(2147483647)) { styleRule(); } else if (jj_2_7(3)) { @@ -4801,7 +4893,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { styleRule(); break; default: - jj_la1[213] = jj_gen; + jj_la1[219] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4846,14 +4938,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { name = property(); save = token; jj_consume_token(COLON); - label_149: while (true) { + label_152: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[214] = jj_gen; - break label_149; + jj_la1[220] = jj_gen; + break label_152; } jj_consume_token(S); } @@ -4897,7 +4989,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { important = prio(); break; default: - jj_la1[215] = jj_gen; + jj_la1[221] = jj_gen; ; } Token next = getToken(1); @@ -4919,14 +5011,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { break; case LBRACE: jj_consume_token(LBRACE); - label_150: while (true) { + label_153: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[216] = jj_gen; - break label_150; + jj_la1[222] = jj_gen; + break label_153; } jj_consume_token(S); } @@ -4937,27 +5029,27 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[217] = jj_gen; + jj_la1[223] = jj_gen; ; } - label_151: while (true) { + label_154: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[218] = jj_gen; - break label_151; + jj_la1[224] = jj_gen; + break label_154; } jj_consume_token(SEMICOLON); - label_152: while (true) { + label_155: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[219] = jj_gen; - break label_152; + jj_la1[225] = jj_gen; + break label_155; } jj_consume_token(S); } @@ -4967,26 +5059,26 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[220] = jj_gen; + jj_la1[226] = jj_gen; ; } } jj_consume_token(RBRACE); - label_153: while (true) { + label_156: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[221] = jj_gen; - break label_153; + jj_la1[227] = jj_gen; + break label_156; } jj_consume_token(S); } documentHandler.endNestedProperties(name); break; default: - jj_la1[222] = jj_gen; + jj_la1[228] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5034,14 +5126,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { name = property(); save = token; jj_consume_token(COLON); - label_154: while (true) { + label_157: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[223] = jj_gen; - break label_154; + jj_la1[229] = jj_gen; + break label_157; } jj_consume_token(S); } @@ -5051,7 +5143,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { important = prio(); break; default: - jj_la1[224] = jj_gen; + jj_la1[230] = jj_gen; ; } documentHandler.property(name, exp, important); @@ -5092,14 +5184,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { */ final public boolean prio() throws ParseException { jj_consume_token(IMPORTANT_SYM); - label_155: while (true) { + label_158: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[225] = jj_gen; - break label_155; + jj_la1[231] = jj_gen; + break label_158; } jj_consume_token(S); } @@ -5113,14 +5205,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { final public boolean guarded() throws ParseException { jj_consume_token(GUARDED_SYM); - label_156: while (true) { + label_159: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[226] = jj_gen; - break label_156; + jj_la1[232] = jj_gen; + break label_159; } jj_consume_token(S); } @@ -5152,14 +5244,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { * parenthesis is not supported now. */ n = jj_consume_token(COMMA); - label_157: while (true) { + label_160: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[227] = jj_gen; - break label_157; + jj_la1[233] = jj_gen; + break label_160; } jj_consume_token(S); } @@ -5172,14 +5264,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { break; case DIV: n = jj_consume_token(DIV); - label_158: while (true) { + label_161: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[228] = jj_gen; - break label_158; + jj_la1[234] = jj_gen; + break label_161; } jj_consume_token(S); } @@ -5192,14 +5284,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { break; case ANY: n = jj_consume_token(ANY); - label_159: while (true) { + label_162: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[229] = jj_gen; - break label_159; + jj_la1[235] = jj_gen; + break label_162; } jj_consume_token(S); } @@ -5212,14 +5304,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { break; case MOD: n = jj_consume_token(MOD); - label_160: while (true) { + label_163: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[230] = jj_gen; - break label_160; + jj_la1[236] = jj_gen; + break label_163; } jj_consume_token(S); } @@ -5232,15 +5324,15 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { break; case PLUS: n = jj_consume_token(PLUS); - label_161: while (true) { + label_164: while (true) { jj_consume_token(S); switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[231] = jj_gen; - break label_161; + jj_la1[237] = jj_gen; + break label_164; } } { @@ -5252,15 +5344,15 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { break; case MINUS: n = jj_consume_token(MINUS); - label_162: while (true) { + label_165: while (true) { jj_consume_token(S); switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[232] = jj_gen; - break label_162; + jj_la1[238] = jj_gen; + break label_165; } } { @@ -5271,7 +5363,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } break; default: - jj_la1[233] = jj_gen; + jj_la1[239] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5287,11 +5379,11 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { char op; first = term(null); res = first; - label_163: while (true) { + label_166: while (true) { if (jj_2_8(2)) { ; } else { - break label_163; + break label_166; } if (jj_2_9(2)) { res = operator(res); @@ -5331,7 +5423,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } break; default: - jj_la1[234] = jj_gen; + jj_la1[240] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5386,7 +5478,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { result = variableTerm(prev); break; default: - jj_la1[235] = jj_gen; + jj_la1[241] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5450,7 +5542,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { op = unaryOperator(); break; default: - jj_la1[236] = jj_gen; + jj_la1[242] = jj_gen; ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -5566,7 +5658,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { result = function(op, prev); break; default: - jj_la1[237] = jj_gen; + jj_la1[243] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5598,7 +5690,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { s += "."; break; default: - jj_la1[238] = jj_gen; + jj_la1[244] = jj_gen; ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -5615,7 +5707,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { n = jj_consume_token(FROM); break; default: - jj_la1[239] = jj_gen; + jj_la1[245] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5653,24 +5745,24 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { result = unicode(prev); break; default: - jj_la1[240] = jj_gen; + jj_la1[246] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[241] = jj_gen; + jj_la1[247] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_164: while (true) { + label_167: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[242] = jj_gen; - break label_164; + jj_la1[248] = jj_gen; + break label_167; } jj_consume_token(S); } @@ -5693,14 +5785,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { Token n; LexicalUnit params = null; n = jj_consume_token(FUNCTION); - label_165: while (true) { + label_168: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[243] = jj_gen; - break label_165; + jj_la1[249] = jj_gen; + break label_168; } jj_consume_token(S); } @@ -5759,7 +5851,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { params = expr(); break; default: - jj_la1[244] = jj_gen; + jj_la1[250] = jj_gen; ; } jj_consume_token(RPARAN); @@ -6328,14 +6420,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { // TODO required by original parser but not used by Vaadin? final public void _parseRule() throws ParseException { String ret = null; - label_166: while (true) { + label_169: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[245] = jj_gen; - break label_166; + jj_la1[251] = jj_gen; + break label_169; } jj_consume_token(S); } @@ -6370,7 +6462,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { fontFace(); break; default: - jj_la1[246] = jj_gen; + jj_la1[252] = jj_gen; ret = skipStatement(); if ((ret == null) || (ret.length() == 0)) { { @@ -6393,14 +6485,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } final public void _parseImportRule() throws ParseException { - label_167: while (true) { + label_170: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[247] = jj_gen; - break label_167; + jj_la1[253] = jj_gen; + break label_170; } jj_consume_token(S); } @@ -6408,14 +6500,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } final public void _parseMediaRule() throws ParseException { - label_168: while (true) { + label_171: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[248] = jj_gen; - break label_168; + jj_la1[254] = jj_gen; + break label_171; } jj_consume_token(S); } @@ -6423,14 +6515,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } final public void _parseDeclarationBlock() throws ParseException { - label_169: while (true) { + label_172: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[249] = jj_gen; - break label_169; + jj_la1[255] = jj_gen; + break label_172; } jj_consume_token(S); } @@ -6440,27 +6532,27 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[250] = jj_gen; + jj_la1[256] = jj_gen; ; } - label_170: while (true) { + label_173: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[251] = jj_gen; - break label_170; + jj_la1[257] = jj_gen; + break label_173; } jj_consume_token(SEMICOLON); - label_171: while (true) { + label_174: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[252] = jj_gen; - break label_171; + jj_la1[258] = jj_gen; + break label_174; } jj_consume_token(S); } @@ -6470,7 +6562,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[253] = jj_gen; + jj_la1[259] = jj_gen; ; } } @@ -6479,14 +6571,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { final public ArrayList<String> _parseSelectors() throws ParseException { ArrayList<String> p = null; try { - label_172: while (true) { + label_175: while (true) { switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { case S: ; break; default: - jj_la1[254] = jj_gen; - break label_172; + jj_la1[260] = jj_gen; + break label_175; } jj_consume_token(S); } @@ -6614,7 +6706,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } } - private boolean jj_3R_206() { + private boolean jj_3R_209() { if (jj_scan_token(MINUS)) { return true; } @@ -6632,14 +6724,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_185() { - if (jj_3R_207()) { + private boolean jj_3R_188() { + if (jj_3R_210()) { return true; } return false; } - private boolean jj_3R_205() { + private boolean jj_3R_208() { if (jj_scan_token(PLUS)) { return true; } @@ -6657,7 +6749,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_204() { + private boolean jj_3R_207() { if (jj_scan_token(MOD)) { return true; } @@ -6672,7 +6764,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_203() { + private boolean jj_3R_206() { if (jj_scan_token(ANY)) { return true; } @@ -6687,7 +6779,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_202() { + private boolean jj_3R_205() { if (jj_scan_token(DIV)) { return true; } @@ -6702,7 +6794,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_201() { + private boolean jj_3R_204() { if (jj_scan_token(COMMA)) { return true; } @@ -6717,20 +6809,20 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_182() { + private boolean jj_3R_185() { Token xsp; xsp = jj_scanpos; - if (jj_3R_201()) { + if (jj_3R_204()) { jj_scanpos = xsp; - if (jj_3R_202()) { + if (jj_3R_205()) { jj_scanpos = xsp; - if (jj_3R_203()) { + if (jj_3R_206()) { jj_scanpos = xsp; - if (jj_3R_204()) { + if (jj_3R_207()) { jj_scanpos = xsp; - if (jj_3R_205()) { + if (jj_3R_208()) { jj_scanpos = xsp; - if (jj_3R_206()) { + if (jj_3R_209()) { return true; } } @@ -6741,14 +6833,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_209() { - if (jj_3R_208()) { + private boolean jj_3R_212() { + if (jj_3R_211()) { return true; } return false; } - private boolean jj_3R_208() { + private boolean jj_3R_211() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(18)) { @@ -6770,19 +6862,19 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_188() { + private boolean jj_3R_191() { if (jj_scan_token(S)) { return true; } Token xsp; xsp = jj_scanpos; - if (jj_3R_209()) { + if (jj_3R_212()) { jj_scanpos = xsp; } return false; } - private boolean jj_3R_207() { + private boolean jj_3R_210() { if (jj_scan_token(GUARDED_SYM)) { return true; } @@ -6797,8 +6889,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_173() { - if (jj_3R_183()) { + private boolean jj_3R_176() { + if (jj_3R_186()) { return true; } if (jj_scan_token(COLON)) { @@ -6812,19 +6904,19 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { break; } } - if (jj_3R_184()) { + if (jj_3R_187()) { return true; } xsp = jj_scanpos; - if (jj_3R_185()) { + if (jj_3R_188()) { jj_scanpos = xsp; } - if (jj_3R_186()) { + if (jj_3R_189()) { return true; } while (true) { xsp = jj_scanpos; - if (jj_3R_186()) { + if (jj_3R_189()) { jj_scanpos = xsp; break; } @@ -6832,26 +6924,26 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_187() { - if (jj_3R_208()) { + private boolean jj_3R_190() { + if (jj_3R_211()) { return true; } return false; } - private boolean jj_3R_174() { + private boolean jj_3R_177() { Token xsp; xsp = jj_scanpos; - if (jj_3R_187()) { + if (jj_3R_190()) { jj_scanpos = xsp; - if (jj_3R_188()) { + if (jj_3R_191()) { return true; } } return false; } - private boolean jj_3R_191() { + private boolean jj_3R_194() { if (jj_scan_token(VARIABLE)) { return true; } @@ -6876,10 +6968,10 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_176() { + private boolean jj_3R_179() { Token xsp; xsp = jj_scanpos; - if (jj_3R_191()) { + if (jj_3R_194()) { jj_scanpos = xsp; } if (jj_scan_token(CONTAINS)) { @@ -6900,21 +6992,21 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_259() { + private boolean jj_3R_262() { if (jj_scan_token(HASH)) { return true; } return false; } - private boolean jj_3R_276() { + private boolean jj_3R_279() { if (jj_scan_token(IDENT)) { return true; } return false; } - private boolean jj_3R_277() { + private boolean jj_3R_280() { if (jj_scan_token(FUNCTION)) { return true; } @@ -6934,26 +7026,26 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_275() { + private boolean jj_3R_278() { if (jj_scan_token(COLON)) { return true; } return false; } - private boolean jj_3R_262() { + private boolean jj_3R_265() { if (jj_scan_token(COLON)) { return true; } Token xsp; xsp = jj_scanpos; - if (jj_3R_275()) { + if (jj_3R_278()) { jj_scanpos = xsp; } xsp = jj_scanpos; - if (jj_3R_276()) { + if (jj_3R_279()) { jj_scanpos = xsp; - if (jj_3R_277()) { + if (jj_3R_280()) { return true; } } @@ -6961,103 +7053,103 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } private boolean jj_3_7() { - if (jj_3R_180()) { + if (jj_3R_183()) { return true; } return false; } - private boolean jj_3R_198() { + private boolean jj_3R_201() { if (jj_scan_token(LBRACE)) { return true; } return false; } - private boolean jj_3R_287() { + private boolean jj_3R_290() { if (jj_scan_token(STRING)) { return true; } return false; } - private boolean jj_3R_285() { + private boolean jj_3R_288() { if (jj_scan_token(STARMATCH)) { return true; } return false; } - private boolean jj_3R_284() { + private boolean jj_3R_287() { if (jj_scan_token(DOLLARMATCH)) { return true; } return false; } - private boolean jj_3R_286() { + private boolean jj_3R_289() { if (jj_scan_token(IDENT)) { return true; } return false; } - private boolean jj_3R_283() { + private boolean jj_3R_286() { if (jj_scan_token(CARETMATCH)) { return true; } return false; } - private boolean jj_3R_282() { + private boolean jj_3R_285() { if (jj_scan_token(DASHMATCH)) { return true; } return false; } - private boolean jj_3R_281() { + private boolean jj_3R_284() { if (jj_scan_token(INCLUDES)) { return true; } return false; } - private boolean jj_3R_267() { + private boolean jj_3R_270() { if (jj_scan_token(INTERPOLATION)) { return true; } return false; } - private boolean jj_3R_280() { + private boolean jj_3R_283() { if (jj_scan_token(EQ)) { return true; } return false; } - private boolean jj_3R_197() { - if (jj_3R_184()) { + private boolean jj_3R_200() { + if (jj_3R_187()) { return true; } return false; } - private boolean jj_3R_274() { + private boolean jj_3R_277() { Token xsp; xsp = jj_scanpos; - if (jj_3R_280()) { + if (jj_3R_283()) { jj_scanpos = xsp; - if (jj_3R_281()) { + if (jj_3R_284()) { jj_scanpos = xsp; - if (jj_3R_282()) { + if (jj_3R_285()) { jj_scanpos = xsp; - if (jj_3R_283()) { + if (jj_3R_286()) { jj_scanpos = xsp; - if (jj_3R_284()) { + if (jj_3R_287()) { jj_scanpos = xsp; - if (jj_3R_285()) { + if (jj_3R_288()) { return true; } } @@ -7073,9 +7165,9 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } } xsp = jj_scanpos; - if (jj_3R_286()) { + if (jj_3R_289()) { jj_scanpos = xsp; - if (jj_3R_287()) { + if (jj_3R_290()) { return true; } } @@ -7090,7 +7182,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } private boolean jj_3_6() { - if (jj_3R_179()) { + if (jj_3R_182()) { return true; } if (jj_scan_token(LBRACE)) { @@ -7099,7 +7191,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_261() { + private boolean jj_3R_264() { if (jj_scan_token(LBRACKET)) { return true; } @@ -7122,7 +7214,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } } xsp = jj_scanpos; - if (jj_3R_274()) { + if (jj_3R_277()) { jj_scanpos = xsp; } if (jj_scan_token(RBRACKET)) { @@ -7131,8 +7223,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_180() { - if (jj_3R_196()) { + private boolean jj_3R_183() { + if (jj_3R_199()) { return true; } if (jj_scan_token(COLON)) { @@ -7147,70 +7239,70 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } } xsp = jj_scanpos; - if (jj_3R_197()) { + if (jj_3R_200()) { jj_scanpos = xsp; - if (jj_3R_198()) { + if (jj_3R_201()) { return true; } } return false; } - private boolean jj_3R_279() { + private boolean jj_3R_282() { if (jj_scan_token(INTERPOLATION)) { return true; } return false; } - private boolean jj_3R_265() { - if (jj_3R_184()) { + private boolean jj_3R_268() { + if (jj_3R_187()) { return true; } return false; } - private boolean jj_3R_245() { + private boolean jj_3R_248() { if (jj_scan_token(PARENT)) { return true; } return false; } - private boolean jj_3R_244() { + private boolean jj_3R_247() { if (jj_scan_token(ANY)) { return true; } return false; } - private boolean jj_3R_258() { + private boolean jj_3R_261() { Token xsp; xsp = jj_scanpos; - if (jj_3R_266()) { + if (jj_3R_269()) { jj_scanpos = xsp; - if (jj_3R_267()) { + if (jj_3R_270()) { return true; } } return false; } - private boolean jj_3R_266() { + private boolean jj_3R_269() { if (jj_scan_token(IDENT)) { return true; } return false; } - private boolean jj_3R_210() { + private boolean jj_3R_213() { Token xsp; xsp = jj_scanpos; - if (jj_3R_243()) { + if (jj_3R_246()) { jj_scanpos = xsp; - if (jj_3R_244()) { + if (jj_3R_247()) { jj_scanpos = xsp; - if (jj_3R_245()) { + if (jj_3R_248()) { return true; } } @@ -7218,14 +7310,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_243() { + private boolean jj_3R_246() { Token xsp; - if (jj_3R_258()) { + if (jj_3R_261()) { return true; } while (true) { xsp = jj_scanpos; - if (jj_3R_258()) { + if (jj_3R_261()) { jj_scanpos = xsp; break; } @@ -7233,7 +7325,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_251() { + private boolean jj_3R_254() { if (jj_scan_token(FUNCTION)) { return true; } @@ -7246,7 +7338,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } } xsp = jj_scanpos; - if (jj_3R_265()) { + if (jj_3R_268()) { jj_scanpos = xsp; } if (jj_scan_token(RPARAN)) { @@ -7255,7 +7347,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_177() { + private boolean jj_3R_180() { if (jj_scan_token(COMMA)) { return true; } @@ -7270,41 +7362,41 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_238() { - if (jj_3R_255()) { + private boolean jj_3R_241() { + if (jj_3R_258()) { return true; } return false; } - private boolean jj_3R_273() { + private boolean jj_3R_276() { Token xsp; xsp = jj_scanpos; - if (jj_3R_278()) { + if (jj_3R_281()) { jj_scanpos = xsp; - if (jj_3R_279()) { + if (jj_3R_282()) { return true; } } return false; } - private boolean jj_3R_278() { + private boolean jj_3R_281() { if (jj_scan_token(IDENT)) { return true; } return false; } - private boolean jj_3R_237() { - if (jj_3R_254()) { + private boolean jj_3R_240() { + if (jj_3R_257()) { return true; } return false; } - private boolean jj_3R_236() { - if (jj_3R_253()) { + private boolean jj_3R_239() { + if (jj_3R_256()) { return true; } return false; @@ -7313,26 +7405,26 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { private boolean jj_3_5() { Token xsp; xsp = jj_scanpos; - if (jj_3R_177()) { + if (jj_3R_180()) { jj_scanpos = xsp; } - if (jj_3R_178()) { + if (jj_3R_181()) { return true; } return false; } - private boolean jj_3R_260() { + private boolean jj_3R_263() { if (jj_scan_token(DOT)) { return true; } Token xsp; - if (jj_3R_273()) { + if (jj_3R_276()) { return true; } while (true) { xsp = jj_scanpos; - if (jj_3R_273()) { + if (jj_3R_276()) { jj_scanpos = xsp; break; } @@ -7340,65 +7432,65 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_249() { - if (jj_3R_262()) { + private boolean jj_3R_252() { + if (jj_3R_265()) { return true; } return false; } - private boolean jj_3R_272() { - if (jj_3R_262()) { + private boolean jj_3R_275() { + if (jj_3R_265()) { return true; } return false; } - private boolean jj_3R_270() { - if (jj_3R_260()) { + private boolean jj_3R_273() { + if (jj_3R_263()) { return true; } return false; } - private boolean jj_3R_247() { - if (jj_3R_260()) { + private boolean jj_3R_250() { + if (jj_3R_263()) { return true; } return false; } - private boolean jj_3R_248() { - if (jj_3R_261()) { + private boolean jj_3R_251() { + if (jj_3R_264()) { return true; } return false; } - private boolean jj_3R_271() { - if (jj_3R_261()) { + private boolean jj_3R_274() { + if (jj_3R_264()) { return true; } return false; } - private boolean jj_3R_252() { + private boolean jj_3R_255() { if (jj_scan_token(DOT)) { return true; } return false; } - private boolean jj_3R_268() { + private boolean jj_3R_271() { Token xsp; xsp = jj_scanpos; - if (jj_3R_269()) { + if (jj_3R_272()) { jj_scanpos = xsp; - if (jj_3R_270()) { + if (jj_3R_273()) { jj_scanpos = xsp; - if (jj_3R_271()) { + if (jj_3R_274()) { jj_scanpos = xsp; - if (jj_3R_272()) { + if (jj_3R_275()) { return true; } } @@ -7407,17 +7499,17 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_269() { - if (jj_3R_259()) { + private boolean jj_3R_272() { + if (jj_3R_262()) { return true; } return false; } - private boolean jj_3R_235() { + private boolean jj_3R_238() { Token xsp; xsp = jj_scanpos; - if (jj_3R_252()) { + if (jj_3R_255()) { jj_scanpos = xsp; } xsp = jj_scanpos; @@ -7436,23 +7528,23 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_234() { + private boolean jj_3R_237() { if (jj_scan_token(STRING)) { return true; } return false; } - private boolean jj_3R_211() { + private boolean jj_3R_214() { Token xsp; xsp = jj_scanpos; - if (jj_3R_246()) { + if (jj_3R_249()) { jj_scanpos = xsp; - if (jj_3R_247()) { + if (jj_3R_250()) { jj_scanpos = xsp; - if (jj_3R_248()) { + if (jj_3R_251()) { jj_scanpos = xsp; - if (jj_3R_249()) { + if (jj_3R_252()) { return true; } } @@ -7461,32 +7553,32 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_246() { - if (jj_3R_259()) { + private boolean jj_3R_249() { + if (jj_3R_262()) { return true; } return false; } - private boolean jj_3R_233() { - if (jj_3R_251()) { + private boolean jj_3R_236() { + if (jj_3R_254()) { return true; } return false; } - private boolean jj_3R_193() { + private boolean jj_3R_196() { Token xsp; xsp = jj_scanpos; - if (jj_3R_234()) { + if (jj_3R_237()) { jj_scanpos = xsp; - if (jj_3R_235()) { + if (jj_3R_238()) { jj_scanpos = xsp; - if (jj_3R_236()) { + if (jj_3R_239()) { jj_scanpos = xsp; - if (jj_3R_237()) { + if (jj_3R_240()) { jj_scanpos = xsp; - if (jj_3R_238()) { + if (jj_3R_241()) { return true; } } @@ -7496,14 +7588,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_190() { + private boolean jj_3R_193() { Token xsp; - if (jj_3R_211()) { + if (jj_3R_214()) { return true; } while (true) { xsp = jj_scanpos; - if (jj_3R_211()) { + if (jj_3R_214()) { jj_scanpos = xsp; break; } @@ -7511,14 +7603,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_189() { - if (jj_3R_210()) { + private boolean jj_3R_192() { + if (jj_3R_213()) { return true; } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_268()) { + if (jj_3R_271()) { jj_scanpos = xsp; break; } @@ -7526,92 +7618,92 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_175() { + private boolean jj_3R_178() { Token xsp; xsp = jj_scanpos; - if (jj_3R_189()) { + if (jj_3R_192()) { jj_scanpos = xsp; - if (jj_3R_190()) { + if (jj_3R_193()) { return true; } } return false; } - private boolean jj_3R_240() { - if (jj_3R_208()) { + private boolean jj_3R_243() { + if (jj_3R_211()) { return true; } - if (jj_3R_175()) { + if (jj_3R_178()) { return true; } return false; } - private boolean jj_3R_232() { + private boolean jj_3R_235() { if (jj_scan_token(DIMEN)) { return true; } return false; } - private boolean jj_3R_231() { + private boolean jj_3R_234() { if (jj_scan_token(KHZ)) { return true; } return false; } - private boolean jj_3R_230() { + private boolean jj_3R_233() { if (jj_scan_token(HZ)) { return true; } return false; } - private boolean jj_3R_229() { + private boolean jj_3R_232() { if (jj_scan_token(MS)) { return true; } return false; } - private boolean jj_3R_228() { + private boolean jj_3R_231() { if (jj_scan_token(SECOND)) { return true; } return false; } - private boolean jj_3R_227() { + private boolean jj_3R_230() { if (jj_scan_token(GRAD)) { return true; } return false; } - private boolean jj_3R_226() { + private boolean jj_3R_229() { if (jj_scan_token(RAD)) { return true; } return false; } - private boolean jj_3R_225() { + private boolean jj_3R_228() { if (jj_scan_token(DEG)) { return true; } return false; } - private boolean jj_3R_224() { + private boolean jj_3R_227() { if (jj_scan_token(EXS)) { return true; } return false; } - private boolean jj_3R_223() { + private boolean jj_3R_226() { if (jj_scan_token(REM)) { return true; } @@ -7619,30 +7711,30 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } private boolean jj_3_2() { - if (jj_3R_174()) { + if (jj_3R_177()) { return true; } - if (jj_3R_175()) { + if (jj_3R_178()) { return true; } return false; } - private boolean jj_3R_222() { + private boolean jj_3R_225() { if (jj_scan_token(LEM)) { return true; } return false; } - private boolean jj_3R_221() { + private boolean jj_3R_224() { if (jj_scan_token(EMS)) { return true; } return false; } - private boolean jj_3R_195() { + private boolean jj_3R_198() { if (jj_scan_token(COMMA)) { return true; } @@ -7654,39 +7746,39 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { break; } } - if (jj_3R_194()) { + if (jj_3R_197()) { return true; } return false; } - private boolean jj_3R_239() { - if (jj_3R_175()) { + private boolean jj_3R_242() { + if (jj_3R_178()) { return true; } return false; } - private boolean jj_3R_220() { + private boolean jj_3R_223() { if (jj_scan_token(PX)) { return true; } return false; } - private boolean jj_3R_219() { + private boolean jj_3R_222() { if (jj_scan_token(IN)) { return true; } return false; } - private boolean jj_3R_194() { + private boolean jj_3R_197() { Token xsp; xsp = jj_scanpos; - if (jj_3R_239()) { + if (jj_3R_242()) { jj_scanpos = xsp; - if (jj_3R_240()) { + if (jj_3R_243()) { return true; } } @@ -7707,63 +7799,63 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_218() { + private boolean jj_3R_221() { if (jj_scan_token(PC)) { return true; } return false; } - private boolean jj_3R_217() { + private boolean jj_3R_220() { if (jj_scan_token(MM)) { return true; } return false; } - private boolean jj_3R_216() { + private boolean jj_3R_219() { if (jj_scan_token(CM)) { return true; } return false; } - private boolean jj_3R_215() { + private boolean jj_3R_218() { if (jj_scan_token(PT)) { return true; } return false; } - private boolean jj_3R_214() { + private boolean jj_3R_217() { if (jj_scan_token(PERCENTAGE)) { return true; } return false; } - private boolean jj_3_1() { - if (jj_3R_173()) { + private boolean jj_3R_203() { + if (jj_3R_245()) { return true; } return false; } - private boolean jj_3R_200() { - if (jj_3R_242()) { + private boolean jj_3_1() { + if (jj_3R_176()) { return true; } return false; } - private boolean jj_3R_179() { - if (jj_3R_194()) { + private boolean jj_3R_182() { + if (jj_3R_197()) { return true; } Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_195()) { + if (jj_3R_198()) { jj_scanpos = xsp; break; } @@ -7771,68 +7863,68 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_213() { + private boolean jj_3R_216() { if (jj_scan_token(NUMBER)) { return true; } return false; } - private boolean jj_3R_212() { - if (jj_3R_250()) { + private boolean jj_3R_215() { + if (jj_3R_253()) { return true; } return false; } - private boolean jj_3R_192() { + private boolean jj_3R_195() { Token xsp; xsp = jj_scanpos; - if (jj_3R_212()) { + if (jj_3R_215()) { jj_scanpos = xsp; } xsp = jj_scanpos; - if (jj_3R_213()) { + if (jj_3R_216()) { jj_scanpos = xsp; - if (jj_3R_214()) { + if (jj_3R_217()) { jj_scanpos = xsp; - if (jj_3R_215()) { + if (jj_3R_218()) { jj_scanpos = xsp; - if (jj_3R_216()) { + if (jj_3R_219()) { jj_scanpos = xsp; - if (jj_3R_217()) { + if (jj_3R_220()) { jj_scanpos = xsp; - if (jj_3R_218()) { + if (jj_3R_221()) { jj_scanpos = xsp; - if (jj_3R_219()) { + if (jj_3R_222()) { jj_scanpos = xsp; - if (jj_3R_220()) { + if (jj_3R_223()) { jj_scanpos = xsp; - if (jj_3R_221()) { + if (jj_3R_224()) { jj_scanpos = xsp; - if (jj_3R_222()) { + if (jj_3R_225()) { jj_scanpos = xsp; - if (jj_3R_223()) { + if (jj_3R_226()) { jj_scanpos = xsp; - if (jj_3R_224()) { + if (jj_3R_227()) { jj_scanpos = xsp; - if (jj_3R_225()) { + if (jj_3R_228()) { jj_scanpos = xsp; - if (jj_3R_226()) { + if (jj_3R_229()) { jj_scanpos = xsp; - if (jj_3R_227()) { + if (jj_3R_230()) { jj_scanpos = xsp; - if (jj_3R_228()) { + if (jj_3R_231()) { jj_scanpos = xsp; - if (jj_3R_229()) { + if (jj_3R_232()) { jj_scanpos = xsp; - if (jj_3R_230()) { + if (jj_3R_233()) { jj_scanpos = xsp; - if (jj_3R_231()) { + if (jj_3R_234()) { jj_scanpos = xsp; - if (jj_3R_232()) { + if (jj_3R_235()) { jj_scanpos = xsp; - if (jj_3R_233()) { + if (jj_3R_236()) { return true; } } @@ -7858,12 +7950,12 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_178() { + private boolean jj_3R_181() { Token xsp; xsp = jj_scanpos; - if (jj_3R_192()) { + if (jj_3R_195()) { jj_scanpos = xsp; - if (jj_3R_193()) { + if (jj_3R_196()) { return true; } } @@ -7877,7 +7969,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_253() { + private boolean jj_3R_256() { if (jj_scan_token(HASH)) { return true; } @@ -7885,46 +7977,46 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } private boolean jj_3_4() { - if (jj_3R_176()) { + if (jj_3R_179()) { return true; } return false; } - private boolean jj_3R_242() { - if (jj_3R_183()) { + private boolean jj_3R_245() { + if (jj_3R_186()) { return true; } return false; } - private boolean jj_3R_254() { + private boolean jj_3R_257() { if (jj_scan_token(URL)) { return true; } return false; } - private boolean jj_3R_199() { - if (jj_3R_178()) { + private boolean jj_3R_202() { + if (jj_3R_181()) { return true; } return false; } - private boolean jj_3R_257() { + private boolean jj_3R_260() { if (jj_scan_token(INTERPOLATION)) { return true; } return false; } - private boolean jj_3R_181() { + private boolean jj_3R_184() { Token xsp; xsp = jj_scanpos; - if (jj_3R_199()) { + if (jj_3R_202()) { jj_scanpos = xsp; - if (jj_3R_200()) { + if (jj_3R_203()) { return true; } } @@ -7932,46 +8024,46 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } private boolean jj_3_9() { - if (jj_3R_182()) { + if (jj_3R_185()) { return true; } return false; } private boolean jj_3_3() { - if (jj_3R_173()) { + if (jj_3R_176()) { return true; } return false; } - private boolean jj_3R_264() { + private boolean jj_3R_267() { if (jj_scan_token(PLUS)) { return true; } return false; } - private boolean jj_3R_250() { + private boolean jj_3R_253() { Token xsp; xsp = jj_scanpos; - if (jj_3R_263()) { + if (jj_3R_266()) { jj_scanpos = xsp; - if (jj_3R_264()) { + if (jj_3R_267()) { return true; } } return false; } - private boolean jj_3R_263() { + private boolean jj_3R_266() { if (jj_scan_token(MINUS)) { return true; } return false; } - private boolean jj_3R_255() { + private boolean jj_3R_258() { if (jj_scan_token(UNICODERANGE)) { return true; } @@ -7984,13 +8076,13 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { if (jj_3_9()) { jj_scanpos = xsp; } - if (jj_3R_181()) { + if (jj_3R_184()) { return true; } return false; } - private boolean jj_3R_183() { + private boolean jj_3R_186() { if (jj_scan_token(VARIABLE)) { return true; } @@ -8005,7 +8097,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_186() { + private boolean jj_3R_189() { if (jj_scan_token(SEMICOLON)) { return true; } @@ -8020,8 +8112,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_184() { - if (jj_3R_181()) { + private boolean jj_3R_187() { + if (jj_3R_184()) { return true; } Token xsp; @@ -8035,33 +8127,33 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { return false; } - private boolean jj_3R_241() { + private boolean jj_3R_244() { Token xsp; xsp = jj_scanpos; - if (jj_3R_256()) { + if (jj_3R_259()) { jj_scanpos = xsp; - if (jj_3R_257()) { + if (jj_3R_260()) { return true; } } return false; } - private boolean jj_3R_256() { + private boolean jj_3R_259() { if (jj_scan_token(IDENT)) { return true; } return false; } - private boolean jj_3R_196() { + private boolean jj_3R_199() { Token xsp; - if (jj_3R_241()) { + if (jj_3R_244()) { return true; } while (true) { xsp = jj_scanpos; - if (jj_3R_241()) { + if (jj_3R_244()) { jj_scanpos = xsp; break; } @@ -8086,7 +8178,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[255]; + final private int[] jj_la1 = new int[261]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -8101,117 +8193,117 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { private static void jj_la1_init_0() { jj_la1_0 = new int[] { 0x0, 0x302, 0x302, 0x0, 0x300, 0x2, 0x2, 0x2, 0xd4c40000, 0x0, 0x300, 0x2, 0x300, 0x2, 0x0, 0x2, 0x2, 0x2, - 0x0, 0x0, 0x2, 0x2, 0x0, 0x2, 0x0, 0x2, 0x2, 0xd4c40000, - 0xd4c40000, 0x2, 0x2, 0x2, 0xd4fd1500, 0xd4fd1500, 0x2, 0x2, - 0x2, 0x0, 0x0, 0x2, 0x0, 0x200000, 0x2, 0x0, 0x2, 0x2, 0x2, - 0x2, 0x0, 0x200000, 0x2, 0x0, 0x2, 0x391500, 0xc40000, - 0xc40002, 0xc40000, 0x2, 0x2, 0x80120002, 0x80120002, 0x2, 0x0, - 0x0, 0x2, 0x2, 0x2, 0x2, 0xd4c40000, 0xd4c40000, 0x2, 0x100000, - 0x2, 0xd4c40000, 0x2, 0x84000000, 0x84000000, 0x84000000, - 0x84000000, 0xd4000000, 0x0, 0x0, 0x0, 0x0, 0x50000000, 0x2, - 0x2, 0x3f000, 0x2, 0x0, 0x2, 0x3f000, 0x0, 0x2, 0x0, 0x2, 0x0, - 0x2, 0x200000, 0x0, 0xd4c40000, 0x0, 0x134e0002, 0x2, - 0xd4c40000, 0xd4c40000, 0x2, 0x0, 0x2, 0x134e0002, 0x0, 0x2, - 0xd4c40000, 0xd4c40000, 0x2, 0x134e0002, 0x2, 0x2, 0x2, 0x0, - 0x2, 0xd4c40000, 0x2, 0x2, 0x100000, 0x2, 0x2, 0x2, 0x2, 0x0, - 0x2, 0xd4c40000, 0xd4c40000, 0x2, 0x100000, 0x2, 0x2, 0x2, - 0x100000, 0x0, 0x0, 0x800c0000, 0x2, 0x0, 0x100000, 0x2, - 0x800c0000, 0x2, 0x0, 0x2, 0x2, 0x0, 0x2, 0x200000, 0x2, - 0xd4c40000, 0x2, 0x200400, 0x2, 0x2, 0x0, 0x2, 0x0, 0x2, 0x2, - 0x2, 0x100000, 0x2, 0x2, 0x2, 0x2, 0x2, 0x0, 0x2, 0x2, 0x2, - 0x100000, 0x2, 0x2, 0x2, 0x0, 0x2, 0x2, 0x2, 0x100000, 0x2, - 0x2, 0x0, 0x2, 0x0, 0x2, 0x2, 0x2, 0x100000, 0x0, 0x2, 0x2, - 0x0, 0x2, 0x2, 0x2, 0x200000, 0x2, 0x2, 0x200000, 0x2, 0x2, - 0x0, 0x200000, 0x2, 0x0, 0x2, 0x0, 0xd4c40000, 0x2, 0x0, 0x2, - 0x0, 0x200000, 0x2, 0x0, 0x2, 0x800c0400, 0x2, 0x0, 0x2, 0x2, - 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x321c0000, 0xc0000, 0x800c0000, - 0xc0000, 0x0, 0x80000000, 0x0, 0x80000000, 0x800c0000, 0x2, - 0x2, 0x800c0000, 0x2, 0xd4c40000, 0x2, 0x2, 0x2, 0x0, 0x200000, - 0x2, 0x0, 0x2, }; + 0x0, 0x0, 0x2, 0x2, 0x0, 0x0, 0x2, 0x0, 0x2, 0x100000, 0x2, + 0x0, 0x2, 0x2, 0xd4c40000, 0xd4c40000, 0x2, 0x2, 0x2, + 0xd4fd1500, 0xd4fd1500, 0x2, 0x2, 0x2, 0x0, 0x0, 0x2, 0x0, + 0x200000, 0x2, 0x0, 0x2, 0x2, 0x2, 0x2, 0x0, 0x200000, 0x2, + 0x0, 0x2, 0x391500, 0xc40000, 0xc40002, 0xc40000, 0x2, 0x2, + 0x80120002, 0x80120002, 0x2, 0x0, 0x0, 0x2, 0x2, 0x2, 0x2, + 0xd4c40000, 0xd4c40000, 0x2, 0x100000, 0x2, 0xd4c40000, 0x2, + 0x84000000, 0x84000000, 0x84000000, 0x84000000, 0xd4000000, + 0x0, 0x0, 0x0, 0x0, 0x50000000, 0x2, 0x2, 0x3f000, 0x2, 0x0, + 0x2, 0x3f000, 0x0, 0x2, 0x0, 0x2, 0x0, 0x2, 0x200000, 0x0, + 0xd4c40000, 0x0, 0x134e0002, 0x2, 0xd4c40000, 0xd4c40000, 0x2, + 0x0, 0x2, 0x134e0002, 0x0, 0x2, 0xd4c40000, 0xd4c40000, 0x2, + 0x134e0002, 0x2, 0x2, 0x2, 0x0, 0x2, 0xd4c40000, 0x2, 0x2, + 0x100000, 0x2, 0x2, 0x2, 0x2, 0x0, 0x2, 0xd4c40000, 0xd4c40000, + 0x2, 0x100000, 0x2, 0x2, 0x2, 0x100000, 0x0, 0x0, 0x800c0000, + 0x2, 0x0, 0x100000, 0x2, 0x800c0000, 0x2, 0x0, 0x2, 0x2, 0x0, + 0x2, 0x200000, 0x2, 0xd4c40000, 0xd4c40000, 0x2, 0x200400, 0x2, + 0x2, 0x0, 0x2, 0x0, 0x2, 0x2, 0x2, 0x100000, 0x2, 0x2, 0x2, + 0x2, 0x2, 0x0, 0x2, 0x2, 0x2, 0x100000, 0x2, 0x2, 0x2, 0x0, + 0x2, 0x2, 0x2, 0x100000, 0x2, 0x2, 0x0, 0x2, 0x0, 0x2, 0x2, + 0x2, 0x100000, 0x0, 0x2, 0x2, 0x0, 0x2, 0x2, 0x2, 0x200000, + 0x2, 0x2, 0x200000, 0x2, 0x2, 0x0, 0x200000, 0x2, 0x0, 0x2, + 0x0, 0xd4c40000, 0x2, 0x0, 0x2, 0x0, 0x200000, 0x2, 0x0, 0x2, + 0x800c0400, 0x2, 0x0, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, + 0x321c0000, 0xc0000, 0x800c0000, 0xc0000, 0x0, 0x80000000, 0x0, + 0x80000000, 0x800c0000, 0x2, 0x2, 0x800c0000, 0x2, 0xd4c40000, + 0x2, 0x2, 0x2, 0x0, 0x200000, 0x2, 0x0, 0x2, }; } private static void jj_la1_init_1() { jj_la1_1 = new int[] { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x566000c0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x80, - 0x80, 0x0, 0x0, 0x120000, 0x0, 0x120000, 0x0, 0x0, 0x564000c0, - 0x564000c0, 0x0, 0x0, 0x0, 0x60001c0, 0x60001c0, 0x0, 0x0, 0x0, - 0x0, 0x40, 0x0, 0x80, 0x0, 0x0, 0x80, 0x0, 0x0, 0x0, 0x0, 0x80, - 0x0, 0x0, 0x80, 0x0, 0x100, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc2, - 0xc2, 0x0, 0x80, 0x80, 0x0, 0x0, 0x0, 0x0, 0x564000c0, - 0x564000c0, 0x0, 0x0, 0x0, 0xc0, 0x0, 0x40, 0x40, 0x40, 0x40, - 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x50000000, - 0x64000c0, 0x50000000, 0x3f, 0x0, 0x564000c0, 0x564000c0, 0x0, - 0x80000000, 0x0, 0x3f, 0x0, 0x0, 0x564000c0, 0x564000c0, 0x0, - 0x3f, 0x0, 0x0, 0x0, 0x0, 0x0, 0x564000c0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x80, 0x0, 0x564000c0, 0x564000c0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x40, 0x40, 0x160040, 0x0, 0x40, 0x0, 0x0, - 0x160040, 0x0, 0x40, 0x0, 0x0, 0x80, 0x0, 0x0, 0x0, 0x60000c0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, - 0x0, 0x0, 0x6000000, 0x0, 0x0, 0x60000, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x80, 0x0, 0x0, 0x80, 0x0, 0x6000000, - 0xc0, 0x0, 0x0, 0x0, 0x80, 0x0, 0x0, 0x80, 0x0, 0x160000, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x160000, 0x0, 0x0, 0x0, 0x160000, 0x160000, 0x160000, 0x0, - 0x0, 0x160000, 0x0, 0x60000c0, 0x0, 0x0, 0x0, 0x80, 0x0, 0x0, - 0x80, 0x0, }; + 0x80, 0x0, 0x0, 0x120000, 0x120000, 0x0, 0x120000, 0x0, 0x0, + 0x0, 0x120000, 0x0, 0x0, 0x564000c0, 0x564000c0, 0x0, 0x0, 0x0, + 0x60001c0, 0x60001c0, 0x0, 0x0, 0x0, 0x0, 0x40, 0x0, 0x80, 0x0, + 0x0, 0x80, 0x0, 0x0, 0x0, 0x0, 0x80, 0x0, 0x0, 0x80, 0x0, + 0x100, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc2, 0xc2, 0x0, 0x80, 0x80, + 0x0, 0x0, 0x0, 0x0, 0x564000c0, 0x564000c0, 0x0, 0x0, 0x0, + 0xc0, 0x0, 0x40, 0x40, 0x40, 0x40, 0xc0, 0x80, 0x80, 0x80, + 0x80, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x40, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x50000000, 0x64000c0, 0x50000000, 0x3f, + 0x0, 0x564000c0, 0x564000c0, 0x0, 0x80000000, 0x0, 0x3f, 0x0, + 0x0, 0x564000c0, 0x564000c0, 0x0, 0x3f, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x564000c0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x80, 0x0, + 0x564000c0, 0x564000c0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x40, + 0x40, 0x160040, 0x0, 0x40, 0x0, 0x0, 0x160040, 0x0, 0x40, 0x0, + 0x0, 0x80, 0x0, 0x0, 0x0, 0x61200c0, 0x61200c0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, + 0x6000000, 0x0, 0x0, 0x60000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x80, 0x0, 0x0, 0x80, 0x0, 0x6000000, 0xc0, 0x0, + 0x0, 0x0, 0x80, 0x0, 0x0, 0x80, 0x0, 0x160000, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x160000, 0x0, + 0x0, 0x0, 0x160000, 0x160000, 0x160000, 0x0, 0x0, 0x160000, + 0x0, 0x60000c0, 0x0, 0x0, 0x0, 0x80, 0x0, 0x0, 0x80, 0x0, }; } private static void jj_la1_init_2() { jj_la1_2 = new int[] { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x100, 0x1000, 0x0, 0x0, 0x0, 0x0, 0x880, 0x0, 0x0, 0x0, 0x100, 0x100, - 0x0, 0x0, 0x2000, 0x0, 0x2000, 0x0, 0x0, 0x1119, 0x1119, 0x0, - 0x0, 0x0, 0x2b80, 0x2b80, 0x0, 0x0, 0x0, 0x100, 0x0, 0x0, - 0x100, 0x0, 0x0, 0x100, 0x0, 0x0, 0x0, 0x0, 0x100, 0x0, 0x0, - 0x100, 0x0, 0x2a80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x380, 0x380, 0x0, - 0x100, 0x100, 0x0, 0x0, 0x0, 0x0, 0x1119, 0x1119, 0x0, 0x0, - 0x0, 0x100, 0x0, 0x0, 0x0, 0x0, 0x0, 0x100, 0x100, 0x100, - 0x100, 0x100, 0x100, 0x0, 0x0, 0x0, 0x0, 0x180, 0x0, 0x0, 0x0, - 0x0, 0x100, 0x0, 0x40, 0x0, 0x0, 0x0, 0x109, 0x1000, 0x1300, - 0x0, 0x1109, 0x1109, 0x0, 0x0, 0x0, 0x1300, 0x20, 0x0, 0x1109, - 0x1109, 0x0, 0x1300, 0x0, 0x0, 0x0, 0x1100, 0x0, 0x1109, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x100, 0x0, 0x1109, 0x1109, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x1000, 0x1000, 0xfffffb80, 0x0, 0x0, - 0x0, 0x0, 0xfffffb80, 0x0, 0x0, 0x0, 0x0, 0x1100, 0x0, 0x0, - 0x0, 0x100, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x2008, 0x2008, 0x0, 0x2000, 0x0, 0x0, 0x0, 0x2000, + 0x0, 0x0, 0x1119, 0x1119, 0x0, 0x0, 0x0, 0x2b80, 0x2b80, 0x0, + 0x0, 0x0, 0x100, 0x0, 0x0, 0x100, 0x0, 0x0, 0x100, 0x0, 0x0, + 0x0, 0x0, 0x100, 0x0, 0x0, 0x100, 0x0, 0x2a80, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x380, 0x380, 0x0, 0x100, 0x100, 0x0, 0x0, 0x0, 0x0, + 0x1119, 0x1119, 0x0, 0x0, 0x0, 0x100, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x100, 0x100, 0x100, 0x100, 0x100, 0x100, 0x0, 0x0, 0x0, 0x0, + 0x180, 0x0, 0x0, 0x0, 0x0, 0x100, 0x0, 0x40, 0x0, 0x0, 0x0, + 0x109, 0x1000, 0x1300, 0x0, 0x1109, 0x1109, 0x0, 0x0, 0x0, + 0x1300, 0x20, 0x0, 0x1109, 0x1109, 0x0, 0x1300, 0x0, 0x0, 0x0, + 0x1100, 0x0, 0x1109, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x100, + 0x0, 0x1109, 0x1109, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1000, + 0x1000, 0xfffffb80, 0x0, 0x0, 0x0, 0x0, 0xfffffb80, 0x0, 0x0, + 0x0, 0x0, 0x1100, 0x0, 0x0, 0x0, 0x2100, 0x2100, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 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, 0x1000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0xfffffb80, 0x0, 0xffffe200, 0x0, 0x100, 0x980, 0xffffeb80, - 0x0, 0x0, 0xfffffb80, 0x0, 0x100, 0x0, 0x0, 0x0, 0x100, 0x0, - 0x0, 0x100, 0x0, }; + 0x100, 0x0, 0x0, 0x100, 0x0, 0x0, 0x100, 0x0, 0x0, 0x0, 0x100, + 0x0, 0x0, 0x100, 0x0, 0xfffffb80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfffffb80, 0x0, 0xffffe200, 0x0, + 0x100, 0x980, 0xffffeb80, 0x0, 0x0, 0xfffffb80, 0x0, 0x100, + 0x0, 0x0, 0x0, 0x100, 0x0, 0x0, 0x100, 0x0, }; } private static void jj_la1_init_3() { jj_la1_3 = new int[] { 0x8, 0x80, 0x80, 0x2, 0x80, 0x0, 0x0, 0x0, 0x75, 0x0, 0x80, 0x0, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc5, 0xc5, 0x0, 0x0, 0x0, - 0xc401bf, 0xc401bf, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0xc401be, 0x0, 0x0, 0x0, 0x0, 0x0, 0x400000, 0x400000, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc7, 0xc7, 0x0, 0x0, 0x0, 0x1, - 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x400000, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x45, 0x80, 0x200000, 0x0, 0xe5, 0xe5, 0x0, 0x0, - 0x0, 0x200000, 0x0, 0x0, 0xe5, 0xe5, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0xc5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x400000, - 0x0, 0xf5, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x440001, 0x0, 0x0, 0x0, 0x0, 0x440001, 0x0, 0x0, 0x0, 0x0, - 0x400000, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x380000, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc5, + 0xc5, 0x0, 0x0, 0x0, 0xc401bf, 0xc401bf, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0xc401be, 0x0, 0x0, 0x0, 0x0, 0x0, 0x400000, + 0x400000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc7, 0xc7, 0x0, + 0x0, 0x0, 0x1, 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x400000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x45, 0x80, 0x200000, 0x0, + 0xe5, 0xe5, 0x0, 0x0, 0x0, 0x200000, 0x0, 0x0, 0xe5, 0xe5, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc5, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x400000, 0x0, 0xf5, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x440001, 0x0, 0x0, 0x0, 0x0, 0x440001, 0x0, + 0x0, 0x0, 0x0, 0x400000, 0x0, 0x0, 0x0, 0x1, 0x1, 0x0, 0x0, + 0x0, 0x0, 0x380000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x100, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x440001, 0x0, 0x100, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x440001, 0x0, 0x400000, 0x0, 0x0, 0x40001, - 0x440001, 0x0, 0x0, 0x440001, 0x0, 0x37, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, }; + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x100, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x440001, 0x0, 0x100, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x440001, 0x0, 0x400000, + 0x0, 0x0, 0x40001, 0x440001, 0x0, 0x0, 0x440001, 0x0, 0x37, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, }; } final private JJCalls[] jj_2_rtns = new JJCalls[9]; @@ -8224,7 +8316,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 < 255; i++) { + for (int i = 0; i < 261; i++) { jj_la1[i] = -1; } for (int i = 0; i < jj_2_rtns.length; i++) { @@ -8238,7 +8330,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 < 255; i++) { + for (int i = 0; i < 261; i++) { jj_la1[i] = -1; } for (int i = 0; i < jj_2_rtns.length; i++) { @@ -8252,7 +8344,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 < 255; i++) { + for (int i = 0; i < 261; i++) { jj_la1[i] = -1; } for (int i = 0; i < jj_2_rtns.length; i++) { @@ -8266,7 +8358,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 < 255; i++) { + for (int i = 0; i < 261; i++) { jj_la1[i] = -1; } for (int i = 0; i < jj_2_rtns.length; i++) { @@ -8417,7 +8509,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 255; i++) { + for (int i = 0; i < 261; 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 cb4f57cf01..5fb7f2315f 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj @@ -848,7 +848,7 @@ void keyframes() : n=<KEY_FRAME_SYM> ( <S> )* {keyframeName = n.image;} (n = <IDENT>{animationname += n.image; }|n = < INTERPOLATION >{ animationname += n.image; })+(<S>)* {start = true; documentHandler.startKeyFrames(keyframeName, animationname); } - <LBRACE> ( <S> )* ( keyframeSelector() )* <RBRACE> ( <S> )* + <LBRACE> ( <S> )* ( keyframeSelector() | contentDirective() )* <RBRACE> ( <S> )* } catch (ParseException e) { reportError(getLocator(), e); skipStatement(); @@ -862,14 +862,17 @@ void keyframes() : void keyframeSelector(): { Token n; + String selector = ""; boolean start = false; } { try{ - (n = <FROM> | n = <TO> | n = <PERCENTAGE>) (<S>)* <LBRACE> (<S>)* + (n = <FROM> | n = <TO> | n = <PERCENTAGE>){selector += n.image;} (<S>)* + (<COMMA> (<S>)* (n = <FROM> | n = <TO> | n = <PERCENTAGE>) {selector += (", " + n.image);} (<S>)* )* + <LBRACE> (<S>)* { start = true; - documentHandler.startKeyframeSelector(n.image); + documentHandler.startKeyframeSelector(selector); } (ifContentStatement() | microsoftExtension() )* <RBRACE> (<S>)* @@ -1720,11 +1723,11 @@ void includeDirective() : (<S>)* (name = property()|name = variableName(){ name = "$"+name;} |(name = functionName() - args = argValuelist()) <RPARAN> (<S>)*) + args = argValuelist()) <RPARAN>(<S>)*) ((";"(<S>)*)+ {documentHandler.includeDirective(name, args);} - | <LBRACE> (<S>)* {documentHandler.startIncludeContentBlock(name);} - (styleRuleOrDeclarationOrNestedProperties())* + | <LBRACE> (<S>)* {documentHandler.startIncludeContentBlock(name, args);} + (styleRuleOrDeclarationOrNestedProperties() | keyframeSelector())* <RBRACE> (<S>)* {documentHandler.endIncludeContentBlock();} ) } diff --git a/theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java index 4b364168cf..6ce67a3abd 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java +++ b/theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java @@ -80,7 +80,8 @@ public class BlockNode extends Node implements IVariableNode { String interpolation = "#{$" + var.getName() + "}"; if (selector.contains(interpolation)) { String replace = selector.replace(interpolation, var - .getExpr().toString()); + .getExpr().unquotedString()); + selectorList.add(selectorList.indexOf(selector), replace); selectorList.remove(selector); } diff --git a/theme-compiler/src/com/vaadin/sass/internal/tree/KeyframesNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/KeyframesNode.java index af4fec1ec3..b5e7491639 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/tree/KeyframesNode.java +++ b/theme-compiler/src/com/vaadin/sass/internal/tree/KeyframesNode.java @@ -54,7 +54,8 @@ public class KeyframesNode extends Node implements IVariableNode { if (animationName != null && animationName.contains(interpolation)) { if (animationName.contains(interpolation)) { animationName = animationName.replaceAll(Pattern - .quote(interpolation), node.getExpr().toString()); + .quote(interpolation), node.getExpr() + .unquotedString()); } } } diff --git a/theme-compiler/src/com/vaadin/sass/internal/tree/RuleNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/RuleNode.java index 19880e4ce5..cc6dbb7b75 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/tree/RuleNode.java +++ b/theme-compiler/src/com/vaadin/sass/internal/tree/RuleNode.java @@ -91,7 +91,8 @@ public class RuleNode extends Node implements IVariableNode { if (variable != null && variable.contains(interpolation)) { variable = variable.replaceAll(Pattern.quote(interpolation), - node.getExpr().toString()); + node.getExpr().unquotedString()); + } if (value.getLexicalUnitType() == LexicalUnitImpl.SAC_FUNCTION) { @@ -120,7 +121,7 @@ public class RuleNode extends Node implements IVariableNode { .getValue() .toString() .replaceAll(Pattern.quote(interpolation), - node.getExpr().toString())); + node.getExpr().unquotedString())); } current = current.getNextLexicalUnit(); } |