diff options
Diffstat (limited to 'theme-compiler')
| -rw-r--r-- | theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java | 794 | ||||
| -rw-r--r-- | theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj | 17 | ||||
| -rw-r--r-- | theme-compiler/tests/resources/sasslang/css/369-test_mixins_with_empty_args.css (renamed from theme-compiler/tests/resources/sasslangbroken/css/369-test_mixins_with_empty_args.css) | 0 | ||||
| -rw-r--r-- | theme-compiler/tests/resources/sasslang/scss/369-test_mixins_with_empty_args.scss (renamed from theme-compiler/tests/resources/sasslangbroken/scss/369-test_mixins_with_empty_args.scss) | 0 |
4 files changed, 430 insertions, 381 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 79dd65e805..5fa5155a55 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java @@ -3456,34 +3456,41 @@ boolean isPseudoElement = false; ArrayList<VariableNode> args = new ArrayList<VariableNode>(); VariableNode arg; boolean hasNonOptionalArgument = false; - arg = mixinArg(); - label_94: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case COMMA: - ; - break; - default: - jj_la1[139] = jj_gen; - break label_94; - } - jj_consume_token(COMMA); - label_95: + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case VARIABLE: + arg = mixinArg(); + label_94: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case S: + case COMMA: ; break; default: - jj_la1[140] = jj_gen; - break label_95; + jj_la1[139] = jj_gen; + break label_94; } - jj_consume_token(S); + jj_consume_token(COMMA); + label_95: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case S: + ; + break; + default: + jj_la1[140] = jj_gen; + break label_95; + } + jj_consume_token(S); + } + hasNonOptionalArgument = checkMixinForNonOptionalArguments(arg, hasNonOptionalArgument); args.add(arg); + arg = mixinArg(); } - hasNonOptionalArgument = checkMixinForNonOptionalArguments(arg, hasNonOptionalArgument); args.add(arg); - arg = mixinArg(); - } hasNonOptionalArgument = checkMixinForNonOptionalArguments(arg, hasNonOptionalArgument); args.add(arg); + break; + default: + jj_la1[141] = jj_gen; + ; + } {if (true) return args;} throw new Error("Missing return statement in function"); } @@ -3524,7 +3531,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[141] = jj_gen; + jj_la1[142] = jj_gen; break label_96; } jj_consume_token(S); @@ -3548,14 +3555,14 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[142] = jj_gen; + jj_la1[143] = jj_gen; break label_98; } jj_consume_token(S); } break; default: - jj_la1[143] = jj_gen; + jj_la1[144] = jj_gen; ; } prev = nonVariableTerm(prev); @@ -3567,13 +3574,13 @@ boolean isPseudoElement = false; prev, variable.image); break; default: - jj_la1[144] = jj_gen; + jj_la1[145] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[145] = jj_gen; + jj_la1[146] = jj_gen; ; } VariableNode arg = new VariableNode(name, first, false); @@ -3586,100 +3593,43 @@ boolean isPseudoElement = false; LexicalUnitImpl first = null; LexicalUnitImpl next = null; LexicalUnitImpl prev = null; - first = term(null); - args.add(first); prev = first; - label_99: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case PLUS: - case MINUS: - case DOT: - case COLON: - case TO: - case THROUGH: - case FROM: - case STRING: - case IDENT: - case NUMBER: - case URL: - case VARIABLE: - case PERCENTAGE: - case PT: - case MM: - case CM: - case PC: - case IN: - case PX: - case EMS: - case LEM: - case REM: - case EXS: - case DEG: - case RAD: - case GRAD: - case MS: - case SECOND: - case HZ: - case KHZ: - case DIMEN: - case HASH: - case UNICODERANGE: - case FUNCTION: - ; - break; - default: - jj_la1[146] = jj_gen; - break label_99; - } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case COLON: - jj_consume_token(COLON); - label_100: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case S: - ; - break; - default: - jj_la1[147] = jj_gen; - break label_100; - } - jj_consume_token(S); - } - break; - default: - jj_la1[148] = jj_gen; - ; - } - next = term(prev); - prev.setNextLexicalUnit(next); prev = next; - } - label_101: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case COMMA: - ; - break; - default: - jj_la1[149] = jj_gen; - break label_101; - } - jj_consume_token(COMMA); - label_102: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case S: - ; - break; - default: - jj_la1[150] = jj_gen; - break label_102; - } - jj_consume_token(S); - } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PLUS: + case MINUS: + case DOT: + case TO: + case THROUGH: + case FROM: + case STRING: + case IDENT: + case NUMBER: + case URL: + case VARIABLE: + case PERCENTAGE: + case PT: + case MM: + case CM: + case PC: + case IN: + case PX: + case EMS: + case LEM: + case REM: + case EXS: + case DEG: + case RAD: + case GRAD: + case MS: + case SECOND: + case HZ: + case KHZ: + case DIMEN: + case HASH: + case UNICODERANGE: + case FUNCTION: first = term(null); - args.add(first); prev = first; - label_103: + args.add(first); prev = first; + label_99: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: @@ -3719,32 +3669,128 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[151] = jj_gen; - break label_103; + jj_la1[147] = jj_gen; + break label_99; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COLON: jj_consume_token(COLON); - label_104: + label_100: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[152] = jj_gen; - break label_104; + jj_la1[148] = jj_gen; + break label_100; } jj_consume_token(S); } break; default: - jj_la1[153] = jj_gen; + jj_la1[149] = jj_gen; ; } next = term(prev); - prev.setNextLexicalUnit(next); prev = next; + prev.setNextLexicalUnit(next); prev = next; } + label_101: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case COMMA: + ; + break; + default: + jj_la1[150] = jj_gen; + break label_101; + } + jj_consume_token(COMMA); + label_102: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case S: + ; + break; + default: + jj_la1[151] = jj_gen; + break label_102; + } + jj_consume_token(S); + } + first = term(null); + args.add(first); prev = first; + label_103: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PLUS: + case MINUS: + case DOT: + case COLON: + case TO: + case THROUGH: + case FROM: + case STRING: + case IDENT: + case NUMBER: + case URL: + case VARIABLE: + case PERCENTAGE: + case PT: + case MM: + case CM: + case PC: + case IN: + case PX: + case EMS: + case LEM: + case REM: + case EXS: + case DEG: + case RAD: + case GRAD: + case MS: + case SECOND: + case HZ: + case KHZ: + case DIMEN: + case HASH: + case UNICODERANGE: + case FUNCTION: + ; + break; + default: + jj_la1[152] = jj_gen; + break label_103; + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case COLON: + jj_consume_token(COLON); + label_104: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case S: + ; + break; + default: + jj_la1[153] = jj_gen; + break label_104; + } + jj_consume_token(S); + } + break; + default: + jj_la1[154] = jj_gen; + ; + } + next = term(prev); + prev.setNextLexicalUnit(next); prev = next; + } + } + break; + default: + jj_la1[155] = jj_gen; + ; } {if (true) return args;} throw new Error("Missing return statement in function"); @@ -3761,7 +3807,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[154] = jj_gen; + jj_la1[156] = jj_gen; break label_105; } jj_consume_token(S); @@ -3786,14 +3832,14 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[155] = jj_gen; + jj_la1[157] = jj_gen; break label_106; } jj_consume_token(S); } break; default: - jj_la1[156] = jj_gen; + jj_la1[158] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3809,7 +3855,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[157] = jj_gen; + jj_la1[159] = jj_gen; break label_108; } jj_consume_token(S); @@ -3819,7 +3865,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[158] = jj_gen; + jj_la1[160] = jj_gen; break label_107; } } @@ -3834,7 +3880,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[159] = jj_gen; + jj_la1[161] = jj_gen; break label_109; } jj_consume_token(S); @@ -3862,7 +3908,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[160] = jj_gen; + jj_la1[162] = jj_gen; break label_110; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3887,7 +3933,7 @@ boolean isPseudoElement = false; keyframeSelector(); break; default: - jj_la1[161] = jj_gen; + jj_la1[163] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3900,7 +3946,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[162] = jj_gen; + jj_la1[164] = jj_gen; break label_111; } jj_consume_token(S); @@ -3908,7 +3954,7 @@ boolean isPseudoElement = false; documentHandler.endIncludeContentBlock(); break; default: - jj_la1[163] = jj_gen; + jj_la1[165] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3938,7 +3984,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[164] = jj_gen; + jj_la1[166] = jj_gen; break label_112; } jj_consume_token(S); @@ -3951,7 +3997,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[165] = jj_gen; + jj_la1[167] = jj_gen; break label_113; } jj_consume_token(S); @@ -3967,7 +4013,7 @@ boolean isPseudoElement = false; type = jj_consume_token(CONTAINS); break; default: - jj_la1[166] = jj_gen; + jj_la1[168] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3978,7 +4024,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[167] = jj_gen; + jj_la1[169] = jj_gen; break label_114; } jj_consume_token(S); @@ -3989,7 +4035,7 @@ boolean isPseudoElement = false; jj_consume_token(RPARAN); break; default: - jj_la1[168] = jj_gen; + jj_la1[170] = jj_gen; ; } jj_consume_token(COMMA); @@ -4000,7 +4046,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[169] = jj_gen; + jj_la1[171] = jj_gen; break label_115; } jj_consume_token(S); @@ -4016,7 +4062,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[170] = jj_gen; + jj_la1[172] = jj_gen; break label_116; } jj_consume_token(S); @@ -4030,14 +4076,14 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[171] = jj_gen; + jj_la1[173] = jj_gen; break label_117; } jj_consume_token(S); } break; default: - jj_la1[172] = jj_gen; + jj_la1[174] = jj_gen; ; } jj_consume_token(RPARAN); @@ -4064,7 +4110,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[173] = jj_gen; + jj_la1[175] = jj_gen; break label_118; } jj_consume_token(S); @@ -4077,7 +4123,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[174] = jj_gen; + jj_la1[176] = jj_gen; break label_119; } jj_consume_token(S); @@ -4102,7 +4148,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[175] = jj_gen; + jj_la1[177] = jj_gen; break label_120; } jj_consume_token(S); @@ -4115,7 +4161,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[176] = jj_gen; + jj_la1[178] = jj_gen; break label_121; } jj_consume_token(S); @@ -4128,7 +4174,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[177] = jj_gen; + jj_la1[179] = jj_gen; break label_122; } jj_consume_token(S); @@ -4139,7 +4185,7 @@ boolean isPseudoElement = false; jj_consume_token(RPARAN); break; default: - jj_la1[178] = jj_gen; + jj_la1[180] = jj_gen; ; } jj_consume_token(COMMA); @@ -4150,7 +4196,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[179] = jj_gen; + jj_la1[181] = jj_gen; break label_123; } jj_consume_token(S); @@ -4166,7 +4212,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[180] = jj_gen; + jj_la1[182] = jj_gen; break label_124; } jj_consume_token(S); @@ -4180,14 +4226,14 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[181] = jj_gen; + jj_la1[183] = jj_gen; break label_125; } jj_consume_token(S); } break; default: - jj_la1[182] = jj_gen; + jj_la1[184] = jj_gen; ; } jj_consume_token(RPARAN); @@ -4212,7 +4258,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[183] = jj_gen; + jj_la1[185] = jj_gen; break label_126; } jj_consume_token(S); @@ -4225,7 +4271,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[184] = jj_gen; + jj_la1[186] = jj_gen; break label_127; } jj_consume_token(S); @@ -4238,7 +4284,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[185] = jj_gen; + jj_la1[187] = jj_gen; break label_128; } jj_consume_token(S); @@ -4249,7 +4295,7 @@ boolean isPseudoElement = false; jj_consume_token(RPARAN); break; default: - jj_la1[186] = jj_gen; + jj_la1[188] = jj_gen; ; } jj_consume_token(COMMA); @@ -4260,7 +4306,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[187] = jj_gen; + jj_la1[189] = jj_gen; break label_129; } jj_consume_token(S); @@ -4276,7 +4322,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[188] = jj_gen; + jj_la1[190] = jj_gen; break label_130; } jj_consume_token(S); @@ -4290,14 +4336,14 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[189] = jj_gen; + jj_la1[191] = jj_gen; break label_131; } jj_consume_token(S); } break; default: - jj_la1[190] = jj_gen; + jj_la1[192] = jj_gen; ; } jj_consume_token(RPARAN); @@ -4324,7 +4370,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[191] = jj_gen; + jj_la1[193] = jj_gen; break label_132; } jj_consume_token(S); @@ -4337,14 +4383,14 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[192] = jj_gen; + jj_la1[194] = jj_gen; break label_133; } jj_consume_token(S); } break; default: - jj_la1[193] = jj_gen; + jj_la1[195] = jj_gen; ; } jj_consume_token(CONTAINS); @@ -4355,7 +4401,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[194] = jj_gen; + jj_la1[196] = jj_gen; break label_134; } jj_consume_token(S); @@ -4366,7 +4412,7 @@ boolean isPseudoElement = false; jj_consume_token(RPARAN); break; default: - jj_la1[195] = jj_gen; + jj_la1[197] = jj_gen; ; } jj_consume_token(COMMA); @@ -4377,7 +4423,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[196] = jj_gen; + jj_la1[198] = jj_gen; break label_135; } jj_consume_token(S); @@ -4393,7 +4439,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[197] = jj_gen; + jj_la1[199] = jj_gen; break label_136; } jj_consume_token(S); @@ -4407,14 +4453,14 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[198] = jj_gen; + jj_la1[200] = jj_gen; break label_137; } jj_consume_token(S); } break; default: - jj_la1[199] = jj_gen; + jj_la1[201] = jj_gen; ; } jj_consume_token(RPARAN); @@ -4519,7 +4565,7 @@ boolean isPseudoElement = false; warnDirective(); break; default: - jj_la1[200] = jj_gen; + jj_la1[202] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4537,7 +4583,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[201] = jj_gen; + jj_la1[203] = jj_gen; break label_138; } jj_consume_token(S); @@ -4556,7 +4602,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[202] = jj_gen; + jj_la1[204] = jj_gen; break label_139; } jj_consume_token(S); @@ -4583,7 +4629,7 @@ boolean isPseudoElement = false; exclusive = false; break; default: - jj_la1[203] = jj_gen; + jj_la1[205] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4595,7 +4641,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[204] = jj_gen; + jj_la1[206] = jj_gen; break label_140; } jj_consume_token(S); @@ -4624,7 +4670,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[205] = jj_gen; + jj_la1[207] = jj_gen; break label_141; } jj_consume_token(S); @@ -4640,7 +4686,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[206] = jj_gen; + jj_la1[208] = jj_gen; break label_143; } jj_consume_token(S); @@ -4650,7 +4696,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[207] = jj_gen; + jj_la1[209] = jj_gen; break label_142; } } @@ -4666,7 +4712,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[208] = jj_gen; + jj_la1[210] = jj_gen; break label_144; } jj_consume_token(S); @@ -4681,7 +4727,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[209] = jj_gen; + jj_la1[211] = jj_gen; break label_146; } jj_consume_token(S); @@ -4691,7 +4737,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[210] = jj_gen; + jj_la1[212] = jj_gen; break label_145; } } @@ -4726,7 +4772,7 @@ LexicalUnit exp; ; break; default: - jj_la1[211] = jj_gen; + jj_la1[213] = jj_gen; break label_147; } jj_consume_token(S); @@ -4739,7 +4785,7 @@ LexicalUnit exp; ; break; default: - jj_la1[212] = jj_gen; + jj_la1[214] = jj_gen; break label_148; } jj_consume_token(S); @@ -4751,7 +4797,7 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[213] = jj_gen; + jj_la1[215] = jj_gen; ; } label_149: @@ -4761,7 +4807,7 @@ LexicalUnit exp; ; break; default: - jj_la1[214] = jj_gen; + jj_la1[216] = jj_gen; break label_149; } jj_consume_token(SEMICOLON); @@ -4772,7 +4818,7 @@ LexicalUnit exp; ; break; default: - jj_la1[215] = jj_gen; + jj_la1[217] = jj_gen; break label_150; } jj_consume_token(S); @@ -4783,7 +4829,7 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[216] = jj_gen; + jj_la1[218] = jj_gen; ; } } @@ -4796,7 +4842,7 @@ LexicalUnit exp; ; break; default: - jj_la1[217] = jj_gen; + jj_la1[219] = jj_gen; break label_151; } jj_consume_token(S); @@ -4814,7 +4860,7 @@ LexicalUnit exp; debuggingDirective(); break; default: - jj_la1[218] = jj_gen; + jj_la1[220] = jj_gen; if (jj_2_6(2147483647)) { styleRule(); } else if (jj_2_7(3)) { @@ -4835,7 +4881,7 @@ LexicalUnit exp; styleRule(); break; default: - jj_la1[219] = jj_gen; + jj_la1[221] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4887,7 +4933,7 @@ LexicalUnit exp; ; break; default: - jj_la1[220] = jj_gen; + jj_la1[222] = jj_gen; break label_152; } jj_consume_token(S); @@ -4932,7 +4978,7 @@ LexicalUnit exp; important = prio(); break; default: - jj_la1[221] = jj_gen; + jj_la1[223] = jj_gen; ; } Token next = getToken(1); @@ -4958,7 +5004,7 @@ LexicalUnit exp; ; break; default: - jj_la1[222] = jj_gen; + jj_la1[224] = jj_gen; break label_153; } jj_consume_token(S); @@ -4970,7 +5016,7 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[223] = jj_gen; + jj_la1[225] = jj_gen; ; } label_154: @@ -4980,7 +5026,7 @@ LexicalUnit exp; ; break; default: - jj_la1[224] = jj_gen; + jj_la1[226] = jj_gen; break label_154; } jj_consume_token(SEMICOLON); @@ -4991,7 +5037,7 @@ LexicalUnit exp; ; break; default: - jj_la1[225] = jj_gen; + jj_la1[227] = jj_gen; break label_155; } jj_consume_token(S); @@ -5002,7 +5048,7 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[226] = jj_gen; + jj_la1[228] = jj_gen; ; } } @@ -5014,7 +5060,7 @@ LexicalUnit exp; ; break; default: - jj_la1[227] = jj_gen; + jj_la1[229] = jj_gen; break label_156; } jj_consume_token(S); @@ -5022,7 +5068,7 @@ LexicalUnit exp; documentHandler.endNestedProperties(name); break; default: - jj_la1[228] = jj_gen; + jj_la1[230] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5079,7 +5125,7 @@ LexicalUnit exp; ; break; default: - jj_la1[229] = jj_gen; + jj_la1[231] = jj_gen; break label_157; } jj_consume_token(S); @@ -5090,7 +5136,7 @@ LexicalUnit exp; important = prio(); break; default: - jj_la1[230] = jj_gen; + jj_la1[232] = jj_gen; ; } documentHandler.property(name, exp, important); @@ -5140,7 +5186,7 @@ LexicalUnit exp; ; break; default: - jj_la1[231] = jj_gen; + jj_la1[233] = jj_gen; break label_158; } jj_consume_token(S); @@ -5158,7 +5204,7 @@ LexicalUnit exp; ; break; default: - jj_la1[232] = jj_gen; + jj_la1[234] = jj_gen; break label_159; } jj_consume_token(S); @@ -5191,7 +5237,7 @@ LexicalUnit exp; ; break; default: - jj_la1[233] = jj_gen; + jj_la1[235] = jj_gen; break label_160; } jj_consume_token(S); @@ -5209,7 +5255,7 @@ LexicalUnit exp; ; break; default: - jj_la1[234] = jj_gen; + jj_la1[236] = jj_gen; break label_161; } jj_consume_token(S); @@ -5227,7 +5273,7 @@ LexicalUnit exp; ; break; default: - jj_la1[235] = jj_gen; + jj_la1[237] = jj_gen; break label_162; } jj_consume_token(S); @@ -5245,7 +5291,7 @@ LexicalUnit exp; ; break; default: - jj_la1[236] = jj_gen; + jj_la1[238] = jj_gen; break label_163; } jj_consume_token(S); @@ -5264,7 +5310,7 @@ LexicalUnit exp; ; break; default: - jj_la1[237] = jj_gen; + jj_la1[239] = jj_gen; break label_164; } } @@ -5282,7 +5328,7 @@ LexicalUnit exp; ; break; default: - jj_la1[238] = jj_gen; + jj_la1[240] = jj_gen; break label_165; } } @@ -5291,7 +5337,7 @@ LexicalUnit exp; prev);} break; default: - jj_la1[239] = jj_gen; + jj_la1[241] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5338,7 +5384,7 @@ LexicalUnit exp; {if (true) return '+';} break; default: - jj_la1[240] = jj_gen; + jj_la1[242] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5391,7 +5437,7 @@ LexicalUnit exp; result = variableTerm(prev); break; default: - jj_la1[241] = jj_gen; + jj_la1[243] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5444,7 +5490,7 @@ LexicalUnitImpl result = null; op = unaryOperator(); break; default: - jj_la1[242] = jj_gen; + jj_la1[244] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -5560,7 +5606,7 @@ LexicalUnitImpl result = null; result = function(op, prev); break; default: - jj_la1[243] = jj_gen; + jj_la1[245] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5593,7 +5639,7 @@ LexicalUnitImpl result = null; s+="."; break; default: - jj_la1[244] = jj_gen; + jj_la1[246] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -5610,7 +5656,7 @@ LexicalUnitImpl result = null; n = jj_consume_token(FROM); break; default: - jj_la1[245] = jj_gen; + jj_la1[247] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5657,13 +5703,13 @@ LexicalUnitImpl result = null; result = unicode(prev); break; default: - jj_la1[246] = jj_gen; + jj_la1[248] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[247] = jj_gen; + jj_la1[249] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5674,7 +5720,7 @@ LexicalUnitImpl result = null; ; break; default: - jj_la1[248] = jj_gen; + jj_la1[250] = jj_gen; break label_167; } jj_consume_token(S); @@ -5698,7 +5744,7 @@ LexicalUnitImpl result = null; ; break; default: - jj_la1[249] = jj_gen; + jj_la1[251] = jj_gen; break label_168; } jj_consume_token(S); @@ -5750,7 +5796,7 @@ LexicalUnitImpl result = null; params = expr(); break; default: - jj_la1[250] = jj_gen; + jj_la1[252] = jj_gen; ; } jj_consume_token(RPARAN); @@ -6240,7 +6286,7 @@ LexicalUnitImpl result = null; ; break; default: - jj_la1[251] = jj_gen; + jj_la1[253] = jj_gen; break label_169; } jj_consume_token(S); @@ -6276,7 +6322,7 @@ LexicalUnitImpl result = null; fontFace(); break; default: - jj_la1[252] = jj_gen; + jj_la1[254] = jj_gen; ret = skipStatement(); if ((ret == null) || (ret.length() == 0)) { {if (true) return;} @@ -6298,7 +6344,7 @@ LexicalUnitImpl result = null; ; break; default: - jj_la1[253] = jj_gen; + jj_la1[255] = jj_gen; break label_170; } jj_consume_token(S); @@ -6314,7 +6360,7 @@ LexicalUnitImpl result = null; ; break; default: - jj_la1[254] = jj_gen; + jj_la1[256] = jj_gen; break label_171; } jj_consume_token(S); @@ -6330,7 +6376,7 @@ LexicalUnitImpl result = null; ; break; default: - jj_la1[255] = jj_gen; + jj_la1[257] = jj_gen; break label_172; } jj_consume_token(S); @@ -6341,7 +6387,7 @@ LexicalUnitImpl result = null; declaration(); break; default: - jj_la1[256] = jj_gen; + jj_la1[258] = jj_gen; ; } label_173: @@ -6351,7 +6397,7 @@ LexicalUnitImpl result = null; ; break; default: - jj_la1[257] = jj_gen; + jj_la1[259] = jj_gen; break label_173; } jj_consume_token(SEMICOLON); @@ -6362,7 +6408,7 @@ LexicalUnitImpl result = null; ; break; default: - jj_la1[258] = jj_gen; + jj_la1[260] = jj_gen; break label_174; } jj_consume_token(S); @@ -6373,7 +6419,7 @@ LexicalUnitImpl result = null; declaration(); break; default: - jj_la1[259] = jj_gen; + jj_la1[261] = jj_gen; ; } } @@ -6389,7 +6435,7 @@ LexicalUnitImpl result = null; ; break; default: - jj_la1[260] = jj_gen; + jj_la1[262] = jj_gen; break label_175; } jj_consume_token(S); @@ -6549,14 +6595,6 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_191() { - if (jj_scan_token(S)) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_212()) jj_scanpos = xsp; - return false; - } - private boolean jj_3R_210() { if (jj_scan_token(GUARDED_SYM)) return true; Token xsp; @@ -6567,6 +6605,14 @@ LexicalUnitImpl result = null; return false; } + private boolean jj_3R_191() { + if (jj_scan_token(S)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_212()) jj_scanpos = xsp; + return false; + } + private boolean jj_3R_176() { if (jj_3R_186()) return true; if (jj_scan_token(COLON)) return true; @@ -6713,6 +6759,11 @@ LexicalUnitImpl result = null; return false; } + private boolean jj_3R_200() { + if (jj_3R_187()) return true; + return false; + } + private boolean jj_3R_270() { if (jj_scan_token(INTERPOLATION)) return true; return false; @@ -6723,11 +6774,6 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_200() { - if (jj_3R_187()) return true; - return false; - } - private boolean jj_3R_277() { Token xsp; xsp = jj_scanpos; @@ -6769,6 +6815,22 @@ LexicalUnitImpl result = null; return false; } + private boolean jj_3R_183() { + if (jj_3R_199()) return true; + if (jj_scan_token(COLON)) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(1)) { jj_scanpos = xsp; break; } + } + xsp = jj_scanpos; + if (jj_3R_200()) { + jj_scanpos = xsp; + if (jj_3R_201()) return true; + } + return false; + } + private boolean jj_3R_264() { if (jj_scan_token(LBRACKET)) return true; Token xsp; @@ -6787,19 +6849,8 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_183() { - if (jj_3R_199()) return true; - if (jj_scan_token(COLON)) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(1)) { jj_scanpos = xsp; break; } - } - xsp = jj_scanpos; - if (jj_3R_200()) { - jj_scanpos = xsp; - if (jj_3R_201()) return true; - } + private boolean jj_3R_268() { + if (jj_3R_187()) return true; return false; } @@ -6808,11 +6859,6 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_268() { - if (jj_3R_187()) return true; - return false; - } - private boolean jj_3R_248() { if (jj_scan_token(PARENT)) return true; return false; @@ -6889,6 +6935,16 @@ LexicalUnitImpl result = null; return false; } + private boolean jj_3R_240() { + if (jj_3R_257()) return true; + return false; + } + + private boolean jj_3R_239() { + if (jj_3R_256()) return true; + return false; + } + private boolean jj_3R_276() { Token xsp; xsp = jj_scanpos; @@ -6904,16 +6960,6 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_240() { - if (jj_3R_257()) return true; - return false; - } - - private boolean jj_3R_239() { - if (jj_3R_256()) return true; - return false; - } - private boolean jj_3_5() { Token xsp; xsp = jj_scanpos; @@ -6953,39 +6999,18 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_251() { - if (jj_3R_264()) return true; - return false; - } - - private boolean jj_3R_274() { - if (jj_3R_264()) return true; - return false; - } - private boolean jj_3R_255() { if (jj_scan_token(DOT)) return true; return false; } - private boolean jj_3R_271() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_272()) { - jj_scanpos = xsp; - if (jj_3R_273()) { - jj_scanpos = xsp; - if (jj_3R_274()) { - jj_scanpos = xsp; - if (jj_3R_275()) return true; - } - } - } + private boolean jj_3R_251() { + if (jj_3R_264()) return true; return false; } - private boolean jj_3R_272() { - if (jj_3R_262()) return true; + private boolean jj_3R_274() { + if (jj_3R_264()) return true; return false; } @@ -7007,32 +7032,32 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_237() { - if (jj_scan_token(STRING)) return true; - return false; - } - - private boolean jj_3R_214() { + private boolean jj_3R_271() { Token xsp; xsp = jj_scanpos; - if (jj_3R_249()) { + if (jj_3R_272()) { jj_scanpos = xsp; - if (jj_3R_250()) { + if (jj_3R_273()) { jj_scanpos = xsp; - if (jj_3R_251()) { + if (jj_3R_274()) { jj_scanpos = xsp; - if (jj_3R_252()) return true; + if (jj_3R_275()) return true; } } } return false; } - private boolean jj_3R_249() { + private boolean jj_3R_272() { if (jj_3R_262()) return true; return false; } + private boolean jj_3R_237() { + if (jj_scan_token(STRING)) return true; + return false; + } + private boolean jj_3R_236() { if (jj_3R_254()) return true; return false; @@ -7057,6 +7082,27 @@ LexicalUnitImpl result = null; return false; } + private boolean jj_3R_214() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_249()) { + jj_scanpos = xsp; + if (jj_3R_250()) { + jj_scanpos = xsp; + if (jj_3R_251()) { + jj_scanpos = xsp; + if (jj_3R_252()) return true; + } + } + } + return false; + } + + private boolean jj_3R_249() { + if (jj_3R_262()) return true; + return false; + } + private boolean jj_3R_193() { Token xsp; if (jj_3R_214()) return true; @@ -7087,14 +7133,14 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_243() { - if (jj_3R_211()) return true; - if (jj_3R_178()) return true; + private boolean jj_3R_235() { + if (jj_scan_token(DIMEN)) return true; return false; } - private boolean jj_3R_235() { - if (jj_scan_token(DIMEN)) return true; + private boolean jj_3R_243() { + if (jj_3R_211()) return true; + if (jj_3R_178()) return true; return false; } @@ -7143,19 +7189,24 @@ LexicalUnitImpl result = null; return false; } + private boolean jj_3R_225() { + if (jj_scan_token(LEM)) return true; + return false; + } + private boolean jj_3_2() { if (jj_3R_177()) return true; if (jj_3R_178()) return true; return false; } - private boolean jj_3R_225() { - if (jj_scan_token(LEM)) return true; + private boolean jj_3R_224() { + if (jj_scan_token(EMS)) return true; return false; } - private boolean jj_3R_224() { - if (jj_scan_token(EMS)) return true; + private boolean jj_3R_223() { + if (jj_scan_token(PX)) return true; return false; } @@ -7175,13 +7226,13 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_223() { - if (jj_scan_token(PX)) return true; + private boolean jj_3R_222() { + if (jj_scan_token(IN)) return true; return false; } - private boolean jj_3R_222() { - if (jj_scan_token(IN)) return true; + private boolean jj_3R_221() { + if (jj_scan_token(PC)) return true; return false; } @@ -7203,11 +7254,6 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_221() { - if (jj_scan_token(PC)) return true; - return false; - } - private boolean jj_3R_220() { if (jj_scan_token(MM)) return true; return false; @@ -7233,16 +7279,6 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_182() { - if (jj_3R_197()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_198()) { jj_scanpos = xsp; break; } - } - return false; - } - private boolean jj_3R_216() { if (jj_scan_token(NUMBER)) return true; return false; @@ -7253,6 +7289,16 @@ LexicalUnitImpl result = null; return false; } + private boolean jj_3R_182() { + if (jj_3R_197()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_198()) { jj_scanpos = xsp; break; } + } + return false; + } + private boolean jj_3R_195() { Token xsp; xsp = jj_scanpos; @@ -7322,11 +7368,6 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3_1() { - if (jj_3R_176()) return true; - return false; - } - private boolean jj_3R_181() { Token xsp; xsp = jj_scanpos; @@ -7346,6 +7387,11 @@ LexicalUnitImpl result = null; return false; } + private boolean jj_3_1() { + if (jj_3R_176()) return true; + return false; + } + private boolean jj_3_4() { if (jj_3R_179()) return true; return false; @@ -7366,11 +7412,6 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_260() { - if (jj_scan_token(INTERPOLATION)) return true; - return false; - } - private boolean jj_3R_184() { Token xsp; xsp = jj_scanpos; @@ -7381,13 +7422,13 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3_9() { - if (jj_3R_185()) return true; + private boolean jj_3R_260() { + if (jj_scan_token(INTERPOLATION)) return true; return false; } - private boolean jj_3_3() { - if (jj_3R_176()) return true; + private boolean jj_3_9() { + if (jj_3R_185()) return true; return false; } @@ -7411,6 +7452,11 @@ LexicalUnitImpl result = null; return false; } + private boolean jj_3_3() { + if (jj_3R_176()) return true; + return false; + } + private boolean jj_3R_258() { if (jj_scan_token(UNICODERANGE)) return true; return false; @@ -7424,18 +7470,18 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_186() { - if (jj_scan_token(VARIABLE)) return true; + private boolean jj_3R_187() { + if (jj_3R_184()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_scan_token(1)) { jj_scanpos = xsp; break; } + if (jj_3_8()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_189() { - if (jj_scan_token(SEMICOLON)) return true; + private boolean jj_3R_186() { + if (jj_scan_token(VARIABLE)) return true; Token xsp; while (true) { xsp = jj_scanpos; @@ -7444,12 +7490,12 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_187() { - if (jj_3R_184()) return true; + private boolean jj_3R_189() { + if (jj_scan_token(SEMICOLON)) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_8()) { jj_scanpos = xsp; break; } + if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } return false; } @@ -7494,11 +7540,6 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_188() { - if (jj_3R_210()) return true; - return false; - } - private boolean jj_3R_208() { if (jj_scan_token(PLUS)) return true; Token xsp; @@ -7510,6 +7551,11 @@ LexicalUnitImpl result = null; return false; } + private boolean jj_3R_188() { + if (jj_3R_210()) return true; + return false; + } + /** Generated Token Manager. */ public ParserTokenManager token_source; /** Current token. */ @@ -7520,7 +7566,7 @@ LexicalUnitImpl result = null; private Token jj_scanpos, jj_lastpos; private int jj_la; private int jj_gen; - final private int[] jj_la1 = new int[261]; + final private int[] jj_la1 = new int[263]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -7532,16 +7578,16 @@ LexicalUnitImpl result = null; jj_la1_init_3(); } private static void jj_la1_init_0() { - jj_la1_0 = new int[] {0x0,0x302,0x302,0x0,0x300,0x2,0x2,0x2,0xd4c40000,0x0,0x300,0x2,0x300,0x2,0x0,0x2,0x2,0x2,0x0,0x0,0x2,0x2,0x0,0x0,0x2,0x0,0x2,0x100000,0x2,0x0,0x2,0x2,0xd4c40000,0xd4c40000,0x2,0x2,0x2,0xd4fd1500,0x2,0xd4fd1500,0x2,0x2,0x0,0x0,0x2,0x0,0x200000,0x2,0x0,0x2,0x2,0x2,0x2,0x0,0x200000,0x2,0x0,0x2,0x391500,0xc40000,0xc40002,0xc40000,0x2,0x2,0x80120002,0x80120002,0x2,0x0,0x0,0x2,0x2,0x2,0x2,0xd4c40000,0xd4c40000,0x2,0x100000,0x2,0xd4c40000,0x2,0x84000000,0x84000000,0x84000000,0x84000000,0xd4000000,0x0,0x0,0x0,0x0,0x50000000,0x2,0x2,0x3f000,0x2,0x0,0x2,0x3f000,0x0,0x2,0x0,0x2,0x0,0x2,0x200000,0x0,0xd4c40000,0x0,0x134e0002,0x2,0xd4c40000,0xd4c40000,0x2,0x0,0x2,0x134e0002,0x0,0x2,0xd4c40000,0xd4c40000,0x2,0x134e0002,0x2,0x2,0x2,0x0,0x2,0xd4c40000,0x2,0x2,0x100000,0x2,0x2,0x2,0x2,0x0,0x2,0xd4c40000,0xd4c40000,0x2,0x100000,0x2,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,}; + jj_la1_0 = new int[] {0x0,0x302,0x302,0x0,0x300,0x2,0x2,0x2,0xd4c40000,0x0,0x300,0x2,0x300,0x2,0x0,0x2,0x2,0x2,0x0,0x0,0x2,0x2,0x0,0x0,0x2,0x0,0x2,0x100000,0x2,0x0,0x2,0x2,0xd4c40000,0xd4c40000,0x2,0x2,0x2,0xd4fd1500,0x2,0xd4fd1500,0x2,0x2,0x0,0x0,0x2,0x0,0x200000,0x2,0x0,0x2,0x2,0x2,0x2,0x0,0x200000,0x2,0x0,0x2,0x391500,0xc40000,0xc40002,0xc40000,0x2,0x2,0x80120002,0x80120002,0x2,0x0,0x0,0x2,0x2,0x2,0x2,0xd4c40000,0xd4c40000,0x2,0x100000,0x2,0xd4c40000,0x2,0x84000000,0x84000000,0x84000000,0x84000000,0xd4000000,0x0,0x0,0x0,0x0,0x50000000,0x2,0x2,0x3f000,0x2,0x0,0x2,0x3f000,0x0,0x2,0x0,0x2,0x0,0x2,0x200000,0x0,0xd4c40000,0x0,0x134e0002,0x2,0xd4c40000,0xd4c40000,0x2,0x0,0x2,0x134e0002,0x0,0x2,0xd4c40000,0xd4c40000,0x2,0x134e0002,0x2,0x2,0x2,0x0,0x2,0xd4c40000,0x2,0x2,0x100000,0x2,0x2,0x2,0x2,0x0,0x2,0xd4c40000,0xd4c40000,0x2,0x100000,0x2,0x0,0x2,0x2,0x100000,0x0,0x0,0x800c0000,0x2,0x0,0x100000,0x2,0x800c0000,0x2,0x0,0x800c0000,0x2,0x2,0x0,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,0x120000,0x0,0x120000,0x0,0x0,0x0,0x120000,0x0,0x0,0x564000c0,0x564000c0,0x0,0x0,0x0,0x60001c0,0x0,0x60001c0,0x0,0x0,0x0,0x40,0x0,0x80,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0xc2,0xc2,0x0,0x80,0x80,0x0,0x0,0x0,0x0,0x564000c0,0x564000c0,0x0,0x0,0x0,0xc0,0x0,0x40,0x40,0x40,0x40,0xc0,0x80,0x80,0x80,0x80,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x50000000,0x64000c0,0x50000000,0x3f,0x0,0x564000c0,0x564000c0,0x0,0x80000000,0x0,0x3f,0x0,0x0,0x564000c0,0x564000c0,0x0,0x3f,0x0,0x0,0x0,0x0,0x0,0x564000c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x564000c0,0x564000c0,0x0,0x0,0x0,0x0,0x0,0x0,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,}; + jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x566000c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x80,0x0,0x0,0x120000,0x120000,0x0,0x120000,0x0,0x0,0x0,0x120000,0x0,0x0,0x564000c0,0x564000c0,0x0,0x0,0x0,0x60001c0,0x0,0x60001c0,0x0,0x0,0x0,0x40,0x0,0x80,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0xc2,0xc2,0x0,0x80,0x80,0x0,0x0,0x0,0x0,0x564000c0,0x564000c0,0x0,0x0,0x0,0xc0,0x0,0x40,0x40,0x40,0x40,0xc0,0x80,0x80,0x80,0x80,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x50000000,0x64000c0,0x50000000,0x3f,0x0,0x564000c0,0x564000c0,0x0,0x80000000,0x0,0x3f,0x0,0x0,0x564000c0,0x564000c0,0x0,0x3f,0x0,0x0,0x0,0x0,0x0,0x564000c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x564000c0,0x564000c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x40,0x160040,0x0,0x40,0x0,0x0,0x160040,0x0,0x40,0x160000,0x0,0x0,0x80,0x0,0x0,0x0,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,0x2008,0x2008,0x0,0x2000,0x0,0x0,0x0,0x2000,0x0,0x0,0x1119,0x1119,0x0,0x0,0x0,0x2b88,0x0,0x2b88,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x2a80,0x0,0x0,0x0,0x0,0x0,0x380,0x380,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x1119,0x1119,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x100,0x100,0x100,0x100,0x100,0x100,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x100,0x0,0x40,0x0,0x0,0x0,0x109,0x1000,0x1300,0x0,0x1109,0x1109,0x0,0x0,0x0,0x1300,0x20,0x0,0x1109,0x1109,0x0,0x1300,0x0,0x0,0x0,0x1100,0x0,0x1109,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x1109,0x1109,0x0,0x0,0x0,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,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0xfffffb80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffb80,0x0,0xffffe200,0x0,0x100,0x980,0xffffeb80,0x0,0x0,0xfffffb80,0x0,0x100,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,}; + jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x1000,0x0,0x0,0x0,0x0,0x880,0x0,0x0,0x0,0x100,0x100,0x0,0x0,0x2008,0x2008,0x0,0x2000,0x0,0x0,0x0,0x2000,0x0,0x0,0x1119,0x1119,0x0,0x0,0x0,0x2b88,0x0,0x2b88,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x2a80,0x0,0x0,0x0,0x0,0x0,0x380,0x380,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x1119,0x1119,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x100,0x100,0x100,0x100,0x100,0x100,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x100,0x0,0x40,0x0,0x0,0x0,0x109,0x1000,0x1300,0x0,0x1109,0x1109,0x0,0x0,0x0,0x1300,0x20,0x0,0x1109,0x1109,0x0,0x1300,0x0,0x0,0x0,0x1100,0x0,0x1109,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x1109,0x1109,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x1000,0x1000,0xfffffb80,0x0,0x0,0x0,0x0,0xfffffb80,0x0,0x0,0xfffffb80,0x0,0x0,0x1100,0x0,0x0,0x0,0x2100,0x2100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0xfffffb80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffb80,0x0,0xffffe200,0x0,0x100,0x980,0xffffeb80,0x0,0x0,0xfffffb80,0x0,0x100,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,}; } private static void jj_la1_init_3() { - jj_la1_3 = new int[] {0x8,0x80,0x80,0x2,0x80,0x0,0x0,0x0,0x75,0x0,0x80,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc5,0xc5,0x0,0x0,0x0,0xc401bf,0x0,0xc401bf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc401be,0x0,0x0,0x0,0x0,0x0,0x400000,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc7,0xc7,0x0,0x0,0x0,0x1,0x0,0x1,0x1,0x1,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x0,0x0,0x0,0x45,0x80,0x200000,0x0,0xe5,0xe5,0x0,0x0,0x0,0x200000,0x0,0x0,0xe5,0xe5,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc5,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0xf5,0xf5,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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,0x0,0x0,0x0,0x0,0x1,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x440001,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x440001,0x0,0x400000,0x0,0x0,0x40001,0x440001,0x0,0x0,0x440001,0x0,0x37,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_3 = new int[] {0x8,0x80,0x80,0x2,0x80,0x0,0x0,0x0,0x75,0x0,0x80,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc5,0xc5,0x0,0x0,0x0,0xc401bf,0x0,0xc401bf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc401be,0x0,0x0,0x0,0x0,0x0,0x400000,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc7,0xc7,0x0,0x0,0x0,0x1,0x0,0x1,0x1,0x1,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x0,0x0,0x0,0x45,0x80,0x200000,0x0,0xe5,0xe5,0x0,0x0,0x0,0x200000,0x0,0x0,0xe5,0xe5,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc5,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0xf5,0xf5,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x440001,0x0,0x0,0x0,0x0,0x440001,0x0,0x0,0x440001,0x0,0x0,0x400000,0x0,0x0,0x0,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,0x0,0x0,0x0,0x0,0x1,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x440001,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x440001,0x0,0x400000,0x0,0x0,0x40001,0x440001,0x0,0x0,0x440001,0x0,0x37,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; } final private JJCalls[] jj_2_rtns = new JJCalls[9]; private boolean jj_rescan = false; @@ -7553,7 +7599,7 @@ LexicalUnitImpl result = null; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 261; i++) jj_la1[i] = -1; + for (int i = 0; i < 263; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -7563,7 +7609,7 @@ LexicalUnitImpl result = null; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 261; i++) jj_la1[i] = -1; + for (int i = 0; i < 263; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -7573,7 +7619,7 @@ LexicalUnitImpl result = null; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 261; i++) jj_la1[i] = -1; + for (int i = 0; i < 263; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -7583,7 +7629,7 @@ LexicalUnitImpl result = null; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 261; i++) jj_la1[i] = -1; + for (int i = 0; i < 263; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -7700,7 +7746,7 @@ LexicalUnitImpl result = null; la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 261; i++) { + for (int i = 0; i < 263; 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 17373532a7..69698b7950 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj @@ -1663,9 +1663,11 @@ ArrayList<VariableNode> arglist() : boolean hasNonOptionalArgument = false; } { - arg=mixinArg() ( <COMMA> (<S>)* { hasNonOptionalArgument = checkMixinForNonOptionalArguments(arg, hasNonOptionalArgument); args.add(arg); } - arg=mixinArg() )* - { hasNonOptionalArgument = checkMixinForNonOptionalArguments(arg, hasNonOptionalArgument); args.add(arg); + (arg=mixinArg() ( <COMMA> (<S>)* { hasNonOptionalArgument = checkMixinForNonOptionalArguments(arg, hasNonOptionalArgument); args.add(arg); } + arg=mixinArg() )* + { hasNonOptionalArgument = checkMixinForNonOptionalArguments(arg, hasNonOptionalArgument); args.add(arg); } + )? + { return args; } } @@ -1725,10 +1727,11 @@ ArrayList<LexicalUnitImpl> argValuelist() : LexicalUnitImpl prev = null; } { - first = term(null) { args.add(first); prev = first;}((< COLON > (< S >)*)?next=term(prev){prev.setNextLexicalUnit(next); prev = next;})* - ( <COMMA> (<S>)* - first = term(null) { args.add(first); prev = first;}((< COLON > (< S >)*)?next=term(prev){prev.setNextLexicalUnit(next); prev = next;})* - )* + (first = term(null) { args.add(first); prev = first;}((< COLON > (< S >)*)?next=term(prev){prev.setNextLexicalUnit(next); prev = next;})* + ( <COMMA> (<S>)* + first = term(null) { args.add(first); prev = first;}((< COLON > (< S >)*)?next=term(prev){prev.setNextLexicalUnit(next); prev = next;})* + )* + )? {return args;} } diff --git a/theme-compiler/tests/resources/sasslangbroken/css/369-test_mixins_with_empty_args.css b/theme-compiler/tests/resources/sasslang/css/369-test_mixins_with_empty_args.css index 234d524066..234d524066 100644 --- a/theme-compiler/tests/resources/sasslangbroken/css/369-test_mixins_with_empty_args.css +++ b/theme-compiler/tests/resources/sasslang/css/369-test_mixins_with_empty_args.css diff --git a/theme-compiler/tests/resources/sasslangbroken/scss/369-test_mixins_with_empty_args.scss b/theme-compiler/tests/resources/sasslang/scss/369-test_mixins_with_empty_args.scss index f608979293..f608979293 100644 --- a/theme-compiler/tests/resources/sasslangbroken/scss/369-test_mixins_with_empty_args.scss +++ b/theme-compiler/tests/resources/sasslang/scss/369-test_mixins_with_empty_args.scss |