diff options
4 files changed, 306 insertions, 215 deletions
diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java index 5fbec45efd..d8669a82f1 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java @@ -159,6 +159,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { /** * This method parses only one rule (style rule or at-rule, except + * * @charset). * * @param source @@ -972,6 +973,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case HASH: case MEDIA_SYM: case KEY_FRAME_SYM: + case ATKEYWORD: ; break; default: @@ -1000,6 +1002,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case HASH: case MEDIA_SYM: case KEY_FRAME_SYM: + case ATKEYWORD: ifContentStatement(); break; case MICROSOFT_RULE: @@ -1917,6 +1920,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case IMPORT_SYM: case MEDIA_SYM: case KEY_FRAME_SYM: + case ATKEYWORD: ; break; default: @@ -1945,6 +1949,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case HASH: case MEDIA_SYM: case KEY_FRAME_SYM: + case ATKEYWORD: ifContentStatement(); break; case MICROSOFT_RULE: @@ -2767,6 +2772,9 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case IF_SYM: controlDirective(); break; + case ATKEYWORD: + atRuleDeclaration(); + break; default: jj_la1[101] = jj_gen; jj_consume_token(-1); @@ -2846,14 +2854,48 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case VARIABLE: case HASH: case MEDIA_SYM: + case FONT_FACE_SYM: case KEY_FRAME_SYM: + case ATKEYWORD: ; break; default: jj_la1[104] = jj_gen; break label_68; } - ifContentStatement(); + 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 INCLUDE_SYM: + case DEBUG_SYM: + case WARN_SYM: + case EACH_SYM: + case IF_SYM: + case EXTEND_SYM: + case CONTENT_SYM: + case IDENT: + case VARIABLE: + case HASH: + case MEDIA_SYM: + case KEY_FRAME_SYM: + case ATKEYWORD: + ifContentStatement(); + break; + case FONT_FACE_SYM: + fontFace(); + break; + default: + jj_la1[105] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } } jj_consume_token(RBRACE); label_69: while (true) { @@ -2862,7 +2904,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[105] = jj_gen; + jj_la1[106] = jj_gen; break label_69; } jj_consume_token(S); @@ -2873,7 +2915,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[106] = jj_gen; + jj_la1[107] = jj_gen; break label_70; } elseDirective(); @@ -2892,7 +2934,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[107] = jj_gen; + jj_la1[108] = jj_gen; break label_71; } jj_consume_token(S); @@ -2925,13 +2967,13 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[108] = jj_gen; + jj_la1[109] = jj_gen; break label_72; } } break; default: - jj_la1[109] = jj_gen; + jj_la1[110] = jj_gen; ; } jj_consume_token(LBRACE); @@ -2941,7 +2983,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[110] = jj_gen; + jj_la1[111] = jj_gen; break label_73; } jj_consume_token(S); @@ -2973,14 +3015,48 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case VARIABLE: case HASH: case MEDIA_SYM: + case FONT_FACE_SYM: case KEY_FRAME_SYM: + case ATKEYWORD: ; break; default: - jj_la1[111] = jj_gen; + jj_la1[112] = jj_gen; break label_74; } - ifContentStatement(); + 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 INCLUDE_SYM: + case DEBUG_SYM: + case WARN_SYM: + case EACH_SYM: + case IF_SYM: + case EXTEND_SYM: + case CONTENT_SYM: + case IDENT: + case VARIABLE: + case HASH: + case MEDIA_SYM: + case KEY_FRAME_SYM: + case ATKEYWORD: + ifContentStatement(); + break; + case FONT_FACE_SYM: + fontFace(); + break; + default: + jj_la1[113] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } } jj_consume_token(RBRACE); label_75: while (true) { @@ -2989,7 +3065,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[112] = jj_gen; + jj_la1[114] = jj_gen; break label_75; } jj_consume_token(S); @@ -3055,7 +3131,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { n = jj_consume_token(NOT_EQ); break; default: - jj_la1[113] = jj_gen; + jj_la1[115] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3087,7 +3163,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[114] = jj_gen; + jj_la1[116] = jj_gen; break label_76; } jj_consume_token(S); @@ -3099,7 +3175,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[115] = jj_gen; + jj_la1[117] = jj_gen; break label_77; } jj_consume_token(S); @@ -3111,7 +3187,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[116] = jj_gen; + jj_la1[118] = jj_gen; break label_78; } jj_consume_token(S); @@ -3126,7 +3202,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { documentHandler.startEachDirective(var.image, listVariable); break; default: - jj_la1[117] = jj_gen; + jj_la1[119] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3137,7 +3213,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[118] = jj_gen; + jj_la1[120] = jj_gen; break label_79; } jj_consume_token(S); @@ -3165,10 +3241,11 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case HASH: case MEDIA_SYM: case KEY_FRAME_SYM: + case ATKEYWORD: ; break; default: - jj_la1[119] = jj_gen; + jj_la1[121] = jj_gen; break label_80; } ifContentStatement(); @@ -3180,7 +3257,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[120] = jj_gen; + jj_la1[122] = jj_gen; break label_81; } jj_consume_token(S); @@ -3198,7 +3275,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[121] = jj_gen; + jj_la1[123] = jj_gen; break label_82; } jj_consume_token(S); @@ -3210,7 +3287,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[122] = jj_gen; + jj_la1[124] = jj_gen; break label_83; } jj_consume_token(COMMA); @@ -3220,7 +3297,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[123] = jj_gen; + jj_la1[125] = jj_gen; break label_84; } jj_consume_token(S); @@ -3233,7 +3310,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[124] = jj_gen; + jj_la1[126] = jj_gen; break label_85; } jj_consume_token(S); @@ -3258,7 +3335,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[125] = jj_gen; + jj_la1[127] = jj_gen; break label_86; } jj_consume_token(S); @@ -3278,14 +3355,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[126] = jj_gen; + jj_la1[128] = jj_gen; break label_87; } jj_consume_token(S); } break; default: - jj_la1[127] = jj_gen; + jj_la1[129] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3296,7 +3373,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[128] = jj_gen; + jj_la1[130] = jj_gen; break label_88; } jj_consume_token(S); @@ -3327,10 +3404,11 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case PAGE_SYM: case FONT_FACE_SYM: case KEY_FRAME_SYM: + case ATKEYWORD: ; break; default: - jj_la1[129] = jj_gen; + jj_la1[131] = jj_gen; break label_89; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -3355,6 +3433,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case HASH: case MEDIA_SYM: case KEY_FRAME_SYM: + case ATKEYWORD: ifContentStatement(); break; case FONT_FACE_SYM: @@ -3364,7 +3443,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { page(); break; default: - jj_la1[130] = jj_gen; + jj_la1[132] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3376,7 +3455,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[131] = jj_gen; + jj_la1[133] = jj_gen; break label_90; } jj_consume_token(S); @@ -3395,7 +3474,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[132] = jj_gen; + jj_la1[134] = jj_gen; break label_91; } jj_consume_token(COMMA); @@ -3405,7 +3484,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[133] = jj_gen; + jj_la1[135] = jj_gen; break label_92; } jj_consume_token(S); @@ -3463,7 +3542,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[134] = jj_gen; + jj_la1[136] = jj_gen; break label_93; } jj_consume_token(S); @@ -3485,14 +3564,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[135] = jj_gen; + jj_la1[137] = jj_gen; break label_95; } jj_consume_token(S); } break; default: - jj_la1[136] = jj_gen; + jj_la1[138] = jj_gen; ; } prev = nonVariableTerm(prev); @@ -3504,13 +3583,13 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { token.beginColumn, prev, variable.image); break; default: - jj_la1[137] = jj_gen; + jj_la1[139] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[138] = jj_gen; + jj_la1[140] = jj_gen; ; } VariableNode arg = new VariableNode(name, first, false); @@ -3570,7 +3649,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[139] = jj_gen; + jj_la1[141] = jj_gen; break label_96; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -3582,14 +3661,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[140] = jj_gen; + jj_la1[142] = jj_gen; break label_97; } jj_consume_token(S); } break; default: - jj_la1[141] = jj_gen; + jj_la1[143] = jj_gen; ; } next = term(prev); @@ -3602,7 +3681,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[142] = jj_gen; + jj_la1[144] = jj_gen; break label_98; } jj_consume_token(COMMA); @@ -3612,7 +3691,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[143] = jj_gen; + jj_la1[145] = jj_gen; break label_99; } jj_consume_token(S); @@ -3659,7 +3738,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[144] = jj_gen; + jj_la1[146] = jj_gen; break label_100; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -3671,14 +3750,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[145] = jj_gen; + jj_la1[147] = jj_gen; break label_101; } jj_consume_token(S); } break; default: - jj_la1[146] = jj_gen; + jj_la1[148] = jj_gen; ; } next = term(prev); @@ -3704,7 +3783,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[147] = jj_gen; + jj_la1[149] = jj_gen; break label_102; } jj_consume_token(S); @@ -3728,14 +3807,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[148] = jj_gen; + jj_la1[150] = jj_gen; break label_103; } jj_consume_token(S); } break; default: - jj_la1[149] = jj_gen; + jj_la1[151] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3749,7 +3828,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[150] = jj_gen; + jj_la1[152] = jj_gen; break label_105; } jj_consume_token(S); @@ -3759,7 +3838,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[151] = jj_gen; + jj_la1[153] = jj_gen; break label_104; } } @@ -3773,7 +3852,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[152] = jj_gen; + jj_la1[154] = jj_gen; break label_106; } jj_consume_token(S); @@ -3797,7 +3876,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[153] = jj_gen; + jj_la1[155] = jj_gen; break label_107; } styleRuleOrDeclarationOrNestedProperties(); @@ -3809,7 +3888,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[154] = jj_gen; + jj_la1[156] = jj_gen; break label_108; } jj_consume_token(S); @@ -3817,7 +3896,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { documentHandler.endIncludeContentBlock(); break; default: - jj_la1[155] = jj_gen; + jj_la1[157] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3850,7 +3929,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[156] = jj_gen; + jj_la1[158] = jj_gen; break label_109; } jj_consume_token(S); @@ -3862,7 +3941,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[157] = jj_gen; + jj_la1[159] = jj_gen; break label_110; } jj_consume_token(S); @@ -3878,7 +3957,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { type = jj_consume_token(CONTAINS); break; default: - jj_la1[158] = jj_gen; + jj_la1[160] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3888,7 +3967,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[159] = jj_gen; + jj_la1[161] = jj_gen; break label_111; } jj_consume_token(S); @@ -3899,7 +3978,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { jj_consume_token(RPARAN); break; default: - jj_la1[160] = jj_gen; + jj_la1[162] = jj_gen; ; } jj_consume_token(COMMA); @@ -3909,7 +3988,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[161] = jj_gen; + jj_la1[163] = jj_gen; break label_112; } jj_consume_token(S); @@ -3924,7 +4003,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[162] = jj_gen; + jj_la1[164] = jj_gen; break label_113; } jj_consume_token(S); @@ -3937,14 +4016,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[163] = jj_gen; + jj_la1[165] = jj_gen; break label_114; } jj_consume_token(S); } break; default: - jj_la1[164] = jj_gen; + jj_la1[166] = jj_gen; ; } jj_consume_token(RPARAN); @@ -3971,7 +4050,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[165] = jj_gen; + jj_la1[167] = jj_gen; break label_115; } jj_consume_token(S); @@ -3983,7 +4062,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[166] = jj_gen; + jj_la1[168] = jj_gen; break label_116; } jj_consume_token(S); @@ -4008,7 +4087,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[167] = jj_gen; + jj_la1[169] = jj_gen; break label_117; } jj_consume_token(S); @@ -4020,7 +4099,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[168] = jj_gen; + jj_la1[170] = jj_gen; break label_118; } jj_consume_token(S); @@ -4032,7 +4111,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[169] = jj_gen; + jj_la1[171] = jj_gen; break label_119; } jj_consume_token(S); @@ -4043,7 +4122,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { jj_consume_token(RPARAN); break; default: - jj_la1[170] = jj_gen; + jj_la1[172] = jj_gen; ; } jj_consume_token(COMMA); @@ -4053,7 +4132,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[171] = jj_gen; + jj_la1[173] = jj_gen; break label_120; } jj_consume_token(S); @@ -4068,7 +4147,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[172] = jj_gen; + jj_la1[174] = jj_gen; break label_121; } jj_consume_token(S); @@ -4081,14 +4160,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[173] = jj_gen; + jj_la1[175] = jj_gen; break label_122; } jj_consume_token(S); } break; default: - jj_la1[174] = jj_gen; + jj_la1[176] = jj_gen; ; } jj_consume_token(RPARAN); @@ -4113,7 +4192,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[175] = jj_gen; + jj_la1[177] = jj_gen; break label_123; } jj_consume_token(S); @@ -4125,7 +4204,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[176] = jj_gen; + jj_la1[178] = jj_gen; break label_124; } jj_consume_token(S); @@ -4137,7 +4216,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[177] = jj_gen; + jj_la1[179] = jj_gen; break label_125; } jj_consume_token(S); @@ -4148,7 +4227,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { jj_consume_token(RPARAN); break; default: - jj_la1[178] = jj_gen; + jj_la1[180] = jj_gen; ; } jj_consume_token(COMMA); @@ -4158,7 +4237,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[179] = jj_gen; + jj_la1[181] = jj_gen; break label_126; } jj_consume_token(S); @@ -4173,7 +4252,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[180] = jj_gen; + jj_la1[182] = jj_gen; break label_127; } jj_consume_token(S); @@ -4186,14 +4265,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[181] = jj_gen; + jj_la1[183] = jj_gen; break label_128; } jj_consume_token(S); } break; default: - jj_la1[182] = jj_gen; + jj_la1[184] = jj_gen; ; } jj_consume_token(RPARAN); @@ -4220,7 +4299,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[183] = jj_gen; + jj_la1[185] = jj_gen; break label_129; } jj_consume_token(S); @@ -4232,14 +4311,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[184] = jj_gen; + jj_la1[186] = jj_gen; break label_130; } jj_consume_token(S); } break; default: - jj_la1[185] = jj_gen; + jj_la1[187] = jj_gen; ; } jj_consume_token(CONTAINS); @@ -4249,7 +4328,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[186] = jj_gen; + jj_la1[188] = jj_gen; break label_131; } jj_consume_token(S); @@ -4260,7 +4339,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { jj_consume_token(RPARAN); break; default: - jj_la1[187] = jj_gen; + jj_la1[189] = jj_gen; ; } jj_consume_token(COMMA); @@ -4270,7 +4349,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[188] = jj_gen; + jj_la1[190] = jj_gen; break label_132; } jj_consume_token(S); @@ -4285,7 +4364,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[189] = jj_gen; + jj_la1[191] = jj_gen; break label_133; } jj_consume_token(S); @@ -4298,14 +4377,14 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[190] = jj_gen; + jj_la1[192] = jj_gen; break label_134; } jj_consume_token(S); } break; default: - jj_la1[191] = jj_gen; + jj_la1[193] = jj_gen; ; } jj_consume_token(RPARAN); @@ -4407,7 +4486,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { warnDirective(); break; default: - jj_la1[192] = jj_gen; + jj_la1[194] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4425,7 +4504,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[193] = jj_gen; + jj_la1[195] = jj_gen; break label_135; } jj_consume_token(S); @@ -4444,7 +4523,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[194] = jj_gen; + jj_la1[196] = jj_gen; break label_136; } jj_consume_token(S); @@ -4471,7 +4550,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { exclusive = false; break; default: - jj_la1[195] = jj_gen; + jj_la1[197] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4482,7 +4561,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[196] = jj_gen; + jj_la1[198] = jj_gen; break label_137; } jj_consume_token(S); @@ -4519,7 +4598,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[197] = jj_gen; + jj_la1[199] = jj_gen; break label_138; } jj_consume_token(S); @@ -4533,7 +4612,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[198] = jj_gen; + jj_la1[200] = jj_gen; break label_140; } jj_consume_token(S); @@ -4543,7 +4622,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[199] = jj_gen; + jj_la1[201] = jj_gen; break label_139; } } @@ -4558,7 +4637,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[200] = jj_gen; + jj_la1[202] = jj_gen; break label_141; } jj_consume_token(S); @@ -4571,7 +4650,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[201] = jj_gen; + jj_la1[203] = jj_gen; break label_143; } jj_consume_token(S); @@ -4581,7 +4660,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[202] = jj_gen; + jj_la1[204] = jj_gen; break label_142; } } @@ -4615,7 +4694,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[203] = jj_gen; + jj_la1[205] = jj_gen; break label_144; } jj_consume_token(S); @@ -4627,7 +4706,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[204] = jj_gen; + jj_la1[206] = jj_gen; break label_145; } jj_consume_token(S); @@ -4639,7 +4718,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[205] = jj_gen; + jj_la1[207] = jj_gen; ; } label_146: while (true) { @@ -4648,7 +4727,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[206] = jj_gen; + jj_la1[208] = jj_gen; break label_146; } jj_consume_token(SEMICOLON); @@ -4658,7 +4737,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[207] = jj_gen; + jj_la1[209] = jj_gen; break label_147; } jj_consume_token(S); @@ -4669,7 +4748,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[208] = jj_gen; + jj_la1[210] = jj_gen; ; } } @@ -4681,7 +4760,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[209] = jj_gen; + jj_la1[211] = jj_gen; break label_148; } jj_consume_token(S); @@ -4701,7 +4780,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { debuggingDirective(); break; default: - jj_la1[210] = jj_gen; + jj_la1[212] = jj_gen; if (jj_2_6(2147483647)) { styleRule(); } else if (jj_2_7(3)) { @@ -4722,7 +4801,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { styleRule(); break; default: - jj_la1[211] = jj_gen; + jj_la1[213] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4773,7 +4852,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[212] = jj_gen; + jj_la1[214] = jj_gen; break label_149; } jj_consume_token(S); @@ -4818,7 +4897,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { important = prio(); break; default: - jj_la1[213] = jj_gen; + jj_la1[215] = jj_gen; ; } Token next = getToken(1); @@ -4846,7 +4925,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[214] = jj_gen; + jj_la1[216] = jj_gen; break label_150; } jj_consume_token(S); @@ -4858,7 +4937,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[215] = jj_gen; + jj_la1[217] = jj_gen; ; } label_151: while (true) { @@ -4867,7 +4946,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[216] = jj_gen; + jj_la1[218] = jj_gen; break label_151; } jj_consume_token(SEMICOLON); @@ -4877,7 +4956,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[217] = jj_gen; + jj_la1[219] = jj_gen; break label_152; } jj_consume_token(S); @@ -4888,7 +4967,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[218] = jj_gen; + jj_la1[220] = jj_gen; ; } } @@ -4899,7 +4978,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[219] = jj_gen; + jj_la1[221] = jj_gen; break label_153; } jj_consume_token(S); @@ -4907,7 +4986,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { documentHandler.endNestedProperties(name); break; default: - jj_la1[220] = jj_gen; + jj_la1[222] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4961,7 +5040,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[221] = jj_gen; + jj_la1[223] = jj_gen; break label_154; } jj_consume_token(S); @@ -4972,7 +5051,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { important = prio(); break; default: - jj_la1[222] = jj_gen; + jj_la1[224] = jj_gen; ; } documentHandler.property(name, exp, important); @@ -5019,7 +5098,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[223] = jj_gen; + jj_la1[225] = jj_gen; break label_155; } jj_consume_token(S); @@ -5040,7 +5119,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[224] = jj_gen; + jj_la1[226] = jj_gen; break label_156; } jj_consume_token(S); @@ -5079,7 +5158,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[225] = jj_gen; + jj_la1[227] = jj_gen; break label_157; } jj_consume_token(S); @@ -5099,7 +5178,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[226] = jj_gen; + jj_la1[228] = jj_gen; break label_158; } jj_consume_token(S); @@ -5119,7 +5198,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[227] = jj_gen; + jj_la1[229] = jj_gen; break label_159; } jj_consume_token(S); @@ -5139,7 +5218,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[228] = jj_gen; + jj_la1[230] = jj_gen; break label_160; } jj_consume_token(S); @@ -5160,7 +5239,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[229] = jj_gen; + jj_la1[231] = jj_gen; break label_161; } } @@ -5180,7 +5259,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[230] = jj_gen; + jj_la1[232] = jj_gen; break label_162; } } @@ -5192,7 +5271,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } break; default: - jj_la1[231] = jj_gen; + jj_la1[233] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5252,7 +5331,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } break; default: - jj_la1[232] = jj_gen; + jj_la1[234] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5307,7 +5386,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { result = variableTerm(prev); break; default: - jj_la1[233] = jj_gen; + jj_la1[235] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5371,7 +5450,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { op = unaryOperator(); break; default: - jj_la1[234] = jj_gen; + jj_la1[236] = jj_gen; ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -5487,7 +5566,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { result = function(op, prev); break; default: - jj_la1[235] = jj_gen; + jj_la1[237] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5519,7 +5598,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { s += "."; break; default: - jj_la1[236] = jj_gen; + jj_la1[238] = jj_gen; ; } switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) { @@ -5536,7 +5615,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { n = jj_consume_token(FROM); break; default: - jj_la1[237] = jj_gen; + jj_la1[239] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5574,13 +5653,13 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { result = unicode(prev); break; default: - jj_la1[238] = jj_gen; + jj_la1[240] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[239] = jj_gen; + jj_la1[241] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5590,7 +5669,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[240] = jj_gen; + jj_la1[242] = jj_gen; break label_164; } jj_consume_token(S); @@ -5620,7 +5699,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[241] = jj_gen; + jj_la1[243] = jj_gen; break label_165; } jj_consume_token(S); @@ -5680,7 +5759,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { params = expr(); break; default: - jj_la1[242] = jj_gen; + jj_la1[244] = jj_gen; ; } jj_consume_token(RPARAN); @@ -6255,7 +6334,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[243] = jj_gen; + jj_la1[245] = jj_gen; break label_166; } jj_consume_token(S); @@ -6291,7 +6370,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { fontFace(); break; default: - jj_la1[244] = jj_gen; + jj_la1[246] = jj_gen; ret = skipStatement(); if ((ret == null) || (ret.length() == 0)) { { @@ -6320,7 +6399,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[245] = jj_gen; + jj_la1[247] = jj_gen; break label_167; } jj_consume_token(S); @@ -6335,7 +6414,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[246] = jj_gen; + jj_la1[248] = jj_gen; break label_168; } jj_consume_token(S); @@ -6350,7 +6429,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[247] = jj_gen; + jj_la1[249] = jj_gen; break label_169; } jj_consume_token(S); @@ -6361,7 +6440,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[248] = jj_gen; + jj_la1[250] = jj_gen; ; } label_170: while (true) { @@ -6370,7 +6449,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[249] = jj_gen; + jj_la1[251] = jj_gen; break label_170; } jj_consume_token(SEMICOLON); @@ -6380,7 +6459,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[250] = jj_gen; + jj_la1[252] = jj_gen; break label_171; } jj_consume_token(S); @@ -6391,7 +6470,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[251] = jj_gen; + jj_la1[253] = jj_gen; ; } } @@ -6406,7 +6485,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[252] = jj_gen; + jj_la1[254] = jj_gen; break label_172; } jj_consume_token(S); @@ -8007,7 +8086,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[253]; + final private int[] jj_la1 = new int[255]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -8032,22 +8111,23 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { 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, 0x2, 0x0, 0x2, 0x134e0002, 0x0, 0x2, 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, }; + 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, }; } private static void jj_la1_init_1() { @@ -8061,21 +8141,22 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { 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, 0x0, 0x80000000, - 0x0, 0x3f, 0x0, 0x0, 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, }; + 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, }; } private static void jj_la1_init_2() { @@ -8089,47 +8170,48 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { 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, 0x0, 0x0, 0x0, 0x1300, 0x20, 0x0, 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, 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, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1000, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x100, 0x0, 0x0, 0x100, 0x0, 0x0, + 0x100, 0x0, 0x0, 0x0, 0x100, 0x0, 0x0, 0x100, 0x0, 0xfffffb80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x100, 0x0, 0x0, 0x100, 0x0, 0x0, 0x100, 0x0, - 0x0, 0x0, 0x100, 0x0, 0x0, 0x100, 0x0, 0xfffffb80, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfffffb80, - 0x0, 0xffffe200, 0x0, 0x100, 0x980, 0xffffeb80, 0x0, 0x0, - 0xfffffb80, 0x0, 0x100, 0x0, 0x0, 0x0, 0x100, 0x0, 0x0, 0x100, - 0x0, }; + 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, 0x45, 0x45, 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, 0x47, 0x47, 0x0, 0x0, 0x0, 0x1, + 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, 0x0, 0x200000, 0x0, 0x45, 0x0, 0x0, 0x0, - 0x200000, 0x0, 0x0, 0x45, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x45, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x400000, 0x0, 0x75, - 0x75, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x440001, 0x0, - 0x0, 0x0, 0x0, 0x440001, 0x0, 0x0, 0x0, 0x0, 0x400000, 0x0, - 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x380000, 0x0, 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, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 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, 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]; @@ -8142,7 +8224,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 < 253; i++) { + for (int i = 0; i < 255; i++) { jj_la1[i] = -1; } for (int i = 0; i < jj_2_rtns.length; i++) { @@ -8156,7 +8238,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 < 253; i++) { + for (int i = 0; i < 255; i++) { jj_la1[i] = -1; } for (int i = 0; i < jj_2_rtns.length; i++) { @@ -8170,7 +8252,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 < 253; i++) { + for (int i = 0; i < 255; i++) { jj_la1[i] = -1; } for (int i = 0; i < jj_2_rtns.length; i++) { @@ -8184,7 +8266,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 < 253; i++) { + for (int i = 0; i < 255; i++) { jj_la1[i] = -1; } for (int i = 0; i < jj_2_rtns.length; i++) { @@ -8335,7 +8417,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 253; i++) { + for (int i = 0; i < 255; 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 95fee1fbae..cb4f57cf01 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj @@ -1520,8 +1520,8 @@ void controlDirective() : void ifContentStatement() : {} { - contentDirective() | includeDirective() | media() | extendDirective() | styleRuleOrDeclarationOrNestedProperties() - | keyframes() | LOOKAHEAD(variable()) variable() | listModifyDirective() | controlDirective() + contentDirective() | includeDirective() | media() | extendDirective() | styleRuleOrDeclarationOrNestedProperties() + | keyframes() | LOOKAHEAD(variable()) variable() | listModifyDirective() | controlDirective() | atRuleDeclaration() } void ifDirective() : @@ -1537,7 +1537,7 @@ void ifDirective() : { documentHandler.startIfElseDirective(); documentHandler.ifDirective(evaluator); } - ( ifContentStatement() )* + ( ifContentStatement() | fontFace() )* < RBRACE >(< S >)* (elseDirective())* { documentHandler.endIfElseDirective(); } @@ -1556,7 +1556,7 @@ void elseDirective() : { if(!evaluator.trim().equals("")){ documentHandler.ifDirective(evaluator); } else{ documentHandler.elseDirective(); } } - ( ifContentStatement() )* + ( ifContentStatement() | fontFace() )* < RBRACE >(< S >)* } diff --git a/theme-compiler/tests/resources/automatic/css/at-directive-in-if.css b/theme-compiler/tests/resources/automatic/css/at-directive-in-if.css new file mode 100644 index 0000000000..80d4821ead --- /dev/null +++ b/theme-compiler/tests/resources/automatic/css/at-directive-in-if.css @@ -0,0 +1 @@ +@font-face {}
\ No newline at end of file diff --git a/theme-compiler/tests/resources/automatic/scss/at-directive-in-if.scss b/theme-compiler/tests/resources/automatic/scss/at-directive-in-if.scss new file mode 100644 index 0000000000..30556fb382 --- /dev/null +++ b/theme-compiler/tests/resources/automatic/scss/at-directive-in-if.scss @@ -0,0 +1,8 @@ +@mixin test($italic: true) { + @if $italic { + @font-face { + } + } +} + +@include test;
\ No newline at end of file |