diff options
author | Mika Murtojarvi <mika@vaadin.com> | 2013-11-25 16:31:55 +0200 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2013-11-26 13:08:00 +0000 |
commit | a705f8cc3fd5804e828b6647510795dbbb99eaa3 (patch) | |
tree | 930c41e32a909c9a112b075f26e16a0540fe1b5e /theme-compiler | |
parent | f4fa4e8ec53b0943635edf3f147680c9b9214db8 (diff) | |
download | vaadin-framework-a705f8cc3fd5804e828b6647510795dbbb99eaa3.tar.gz vaadin-framework-a705f8cc3fd5804e828b6647510795dbbb99eaa3.zip |
Mixins now accept an empty argument list in parentheses
(#12992).
Change-Id: If2484e2f289aa7039984df0d9a73ba595117462c
Diffstat (limited to 'theme-compiler')
7 files changed, 450 insertions, 358 deletions
diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/CharStream.java b/theme-compiler/src/com/vaadin/sass/internal/parser/CharStream.java index c22f19451b..e43320453c 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/CharStream.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/CharStream.java @@ -127,4 +127,4 @@ interface CharStream { void Done(); } -/* JavaCC - OriginalChecksum=deb80d024b50bdc8bfaadaf528157233 (do not edit this line) */ +/* JavaCC - OriginalChecksum=18aae0a549695f0fec96a11297b442bb (do not edit this line) */ diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java index 679e696aa3..86d028a7d4 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java @@ -3545,34 +3545,41 @@ boolean isPseudoElement = false; ArrayList<VariableNode> args = new ArrayList<VariableNode>(); VariableNode arg; boolean hasNonOptionalArgument = false; - arg = mixinArg(); - label_97: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case COMMA: - ; - break; - default: - jj_la1[145] = jj_gen; - break label_97; - } - jj_consume_token(COMMA); - label_98: + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case VARIABLE: + arg = mixinArg(); + label_97: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case S: + case COMMA: ; break; default: - jj_la1[146] = jj_gen; - break label_98; + jj_la1[145] = jj_gen; + break label_97; } - jj_consume_token(S); + jj_consume_token(COMMA); + label_98: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case S: + ; + break; + default: + jj_la1[146] = jj_gen; + break label_98; + } + 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[147] = jj_gen; + ; + } {if (true) return args;} throw new Error("Missing return statement in function"); } @@ -3613,7 +3620,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[147] = jj_gen; + jj_la1[148] = jj_gen; break label_99; } jj_consume_token(S); @@ -3637,14 +3644,14 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[148] = jj_gen; + jj_la1[149] = jj_gen; break label_101; } jj_consume_token(S); } break; default: - jj_la1[149] = jj_gen; + jj_la1[150] = jj_gen; ; } prev = nonVariableTerm(prev); @@ -3656,13 +3663,13 @@ boolean isPseudoElement = false; prev, variable.image); break; default: - jj_la1[150] = jj_gen; + jj_la1[151] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[151] = jj_gen; + jj_la1[152] = jj_gen; ; } VariableNode arg = new VariableNode(name, first, false); @@ -3675,100 +3682,43 @@ boolean isPseudoElement = false; LexicalUnitImpl first = null; LexicalUnitImpl next = null; LexicalUnitImpl prev = null; - first = term(null); - args.add(first); prev = first; - label_102: - 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_102; - } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case COLON: - jj_consume_token(COLON); - label_103: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case S: - ; - break; - default: - jj_la1[153] = jj_gen; - break label_103; - } - jj_consume_token(S); - } - break; - default: - jj_la1[154] = jj_gen; - ; - } - next = term(prev); - prev.setNextLexicalUnit(next); prev = next; - } - label_104: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case COMMA: - ; - break; - default: - jj_la1[155] = jj_gen; - break label_104; - } - jj_consume_token(COMMA); - label_105: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case S: - ; - break; - default: - jj_la1[156] = jj_gen; - break label_105; - } - 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_106: + args.add(first); prev = first; + label_102: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: @@ -3808,32 +3758,128 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[157] = jj_gen; - break label_106; + jj_la1[153] = jj_gen; + break label_102; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COLON: jj_consume_token(COLON); - label_107: + label_103: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[158] = jj_gen; - break label_107; + jj_la1[154] = jj_gen; + break label_103; } jj_consume_token(S); } break; default: - jj_la1[159] = jj_gen; + jj_la1[155] = jj_gen; ; } next = term(prev); - prev.setNextLexicalUnit(next); prev = next; + prev.setNextLexicalUnit(next); prev = next; + } + label_104: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case COMMA: + ; + break; + default: + jj_la1[156] = jj_gen; + break label_104; + } + jj_consume_token(COMMA); + label_105: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case S: + ; + break; + default: + jj_la1[157] = jj_gen; + break label_105; + } + jj_consume_token(S); + } + first = term(null); + args.add(first); prev = first; + label_106: + 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[158] = jj_gen; + break label_106; + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case COLON: + jj_consume_token(COLON); + label_107: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case S: + ; + break; + default: + jj_la1[159] = jj_gen; + break label_107; + } + jj_consume_token(S); + } + break; + default: + jj_la1[160] = jj_gen; + ; + } + next = term(prev); + prev.setNextLexicalUnit(next); prev = next; + } } + break; + default: + jj_la1[161] = jj_gen; + ; } {if (true) return args;} throw new Error("Missing return statement in function"); @@ -3850,7 +3896,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[160] = jj_gen; + jj_la1[162] = jj_gen; break label_108; } jj_consume_token(S); @@ -3875,14 +3921,14 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[161] = jj_gen; + jj_la1[163] = jj_gen; break label_109; } jj_consume_token(S); } break; default: - jj_la1[162] = jj_gen; + jj_la1[164] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3898,7 +3944,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[163] = jj_gen; + jj_la1[165] = jj_gen; break label_111; } jj_consume_token(S); @@ -3908,7 +3954,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[164] = jj_gen; + jj_la1[166] = jj_gen; break label_110; } } @@ -3923,7 +3969,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[165] = jj_gen; + jj_la1[167] = jj_gen; break label_112; } jj_consume_token(S); @@ -3951,7 +3997,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[166] = jj_gen; + jj_la1[168] = jj_gen; break label_113; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3976,7 +4022,7 @@ boolean isPseudoElement = false; keyframeSelector(); break; default: - jj_la1[167] = jj_gen; + jj_la1[169] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3989,7 +4035,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[168] = jj_gen; + jj_la1[170] = jj_gen; break label_114; } jj_consume_token(S); @@ -3997,7 +4043,7 @@ boolean isPseudoElement = false; documentHandler.endIncludeContentBlock(); break; default: - jj_la1[169] = jj_gen; + jj_la1[171] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4027,7 +4073,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[170] = jj_gen; + jj_la1[172] = jj_gen; break label_115; } jj_consume_token(S); @@ -4040,7 +4086,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[171] = jj_gen; + jj_la1[173] = jj_gen; break label_116; } jj_consume_token(S); @@ -4056,7 +4102,7 @@ boolean isPseudoElement = false; type = jj_consume_token(CONTAINS); break; default: - jj_la1[172] = jj_gen; + jj_la1[174] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4067,7 +4113,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[173] = jj_gen; + jj_la1[175] = jj_gen; break label_117; } jj_consume_token(S); @@ -4078,7 +4124,7 @@ boolean isPseudoElement = false; jj_consume_token(RPARAN); break; default: - jj_la1[174] = jj_gen; + jj_la1[176] = jj_gen; ; } jj_consume_token(COMMA); @@ -4089,7 +4135,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[175] = jj_gen; + jj_la1[177] = jj_gen; break label_118; } jj_consume_token(S); @@ -4105,7 +4151,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[176] = jj_gen; + jj_la1[178] = jj_gen; break label_119; } jj_consume_token(S); @@ -4119,14 +4165,14 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[177] = jj_gen; + jj_la1[179] = jj_gen; break label_120; } jj_consume_token(S); } break; default: - jj_la1[178] = jj_gen; + jj_la1[180] = jj_gen; ; } jj_consume_token(RPARAN); @@ -4153,7 +4199,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[179] = jj_gen; + jj_la1[181] = jj_gen; break label_121; } 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_122; } jj_consume_token(S); @@ -4191,7 +4237,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[181] = jj_gen; + jj_la1[183] = jj_gen; break label_123; } jj_consume_token(S); @@ -4204,7 +4250,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[182] = jj_gen; + jj_la1[184] = jj_gen; break label_124; } jj_consume_token(S); @@ -4217,7 +4263,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[183] = jj_gen; + jj_la1[185] = jj_gen; break label_125; } jj_consume_token(S); @@ -4228,7 +4274,7 @@ boolean isPseudoElement = false; jj_consume_token(RPARAN); break; default: - jj_la1[184] = jj_gen; + jj_la1[186] = jj_gen; ; } jj_consume_token(COMMA); @@ -4239,7 +4285,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[185] = jj_gen; + jj_la1[187] = jj_gen; break label_126; } jj_consume_token(S); @@ -4255,7 +4301,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[186] = jj_gen; + jj_la1[188] = jj_gen; break label_127; } jj_consume_token(S); @@ -4269,14 +4315,14 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[187] = jj_gen; + jj_la1[189] = jj_gen; break label_128; } jj_consume_token(S); } break; default: - jj_la1[188] = jj_gen; + jj_la1[190] = jj_gen; ; } jj_consume_token(RPARAN); @@ -4301,7 +4347,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[189] = jj_gen; + jj_la1[191] = jj_gen; break label_129; } jj_consume_token(S); @@ -4314,7 +4360,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[190] = jj_gen; + jj_la1[192] = jj_gen; break label_130; } jj_consume_token(S); @@ -4327,7 +4373,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[191] = jj_gen; + jj_la1[193] = jj_gen; break label_131; } jj_consume_token(S); @@ -4338,7 +4384,7 @@ boolean isPseudoElement = false; jj_consume_token(RPARAN); break; default: - jj_la1[192] = jj_gen; + jj_la1[194] = jj_gen; ; } jj_consume_token(COMMA); @@ -4349,7 +4395,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[193] = jj_gen; + jj_la1[195] = jj_gen; break label_132; } jj_consume_token(S); @@ -4365,7 +4411,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[194] = jj_gen; + jj_la1[196] = jj_gen; break label_133; } jj_consume_token(S); @@ -4379,14 +4425,14 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[195] = jj_gen; + jj_la1[197] = jj_gen; break label_134; } jj_consume_token(S); } break; default: - jj_la1[196] = jj_gen; + jj_la1[198] = jj_gen; ; } jj_consume_token(RPARAN); @@ -4413,7 +4459,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[197] = jj_gen; + jj_la1[199] = jj_gen; break label_135; } jj_consume_token(S); @@ -4426,14 +4472,14 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[198] = jj_gen; + jj_la1[200] = jj_gen; break label_136; } jj_consume_token(S); } break; default: - jj_la1[199] = jj_gen; + jj_la1[201] = jj_gen; ; } jj_consume_token(CONTAINS); @@ -4444,7 +4490,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[200] = jj_gen; + jj_la1[202] = jj_gen; break label_137; } jj_consume_token(S); @@ -4455,7 +4501,7 @@ boolean isPseudoElement = false; jj_consume_token(RPARAN); break; default: - jj_la1[201] = jj_gen; + jj_la1[203] = jj_gen; ; } jj_consume_token(COMMA); @@ -4466,7 +4512,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[202] = jj_gen; + jj_la1[204] = jj_gen; break label_138; } jj_consume_token(S); @@ -4482,7 +4528,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[203] = jj_gen; + jj_la1[205] = jj_gen; break label_139; } jj_consume_token(S); @@ -4496,14 +4542,14 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[204] = jj_gen; + jj_la1[206] = jj_gen; break label_140; } jj_consume_token(S); } break; default: - jj_la1[205] = jj_gen; + jj_la1[207] = jj_gen; ; } jj_consume_token(RPARAN); @@ -4608,7 +4654,7 @@ boolean isPseudoElement = false; warnDirective(); break; default: - jj_la1[206] = jj_gen; + jj_la1[208] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4626,7 +4672,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[207] = jj_gen; + jj_la1[209] = jj_gen; break label_141; } jj_consume_token(S); @@ -4645,7 +4691,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[208] = jj_gen; + jj_la1[210] = jj_gen; break label_142; } jj_consume_token(S); @@ -4672,7 +4718,7 @@ boolean isPseudoElement = false; exclusive = false; break; default: - jj_la1[209] = jj_gen; + jj_la1[211] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4684,7 +4730,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[210] = jj_gen; + jj_la1[212] = jj_gen; break label_143; } jj_consume_token(S); @@ -4713,7 +4759,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[211] = jj_gen; + jj_la1[213] = jj_gen; break label_144; } jj_consume_token(S); @@ -4729,7 +4775,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[212] = jj_gen; + jj_la1[214] = jj_gen; break label_146; } jj_consume_token(S); @@ -4739,7 +4785,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[213] = jj_gen; + jj_la1[215] = jj_gen; break label_145; } } @@ -4755,7 +4801,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[214] = jj_gen; + jj_la1[216] = jj_gen; break label_147; } jj_consume_token(S); @@ -4770,7 +4816,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[215] = jj_gen; + jj_la1[217] = jj_gen; break label_149; } jj_consume_token(S); @@ -4780,7 +4826,7 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[216] = jj_gen; + jj_la1[218] = jj_gen; break label_148; } } @@ -4815,7 +4861,7 @@ LexicalUnit exp; ; break; default: - jj_la1[217] = jj_gen; + jj_la1[219] = jj_gen; break label_150; } jj_consume_token(S); @@ -4828,7 +4874,7 @@ LexicalUnit exp; ; break; default: - jj_la1[218] = jj_gen; + jj_la1[220] = jj_gen; break label_151; } jj_consume_token(S); @@ -4840,7 +4886,7 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[219] = jj_gen; + jj_la1[221] = jj_gen; ; } label_152: @@ -4850,7 +4896,7 @@ LexicalUnit exp; ; break; default: - jj_la1[220] = jj_gen; + jj_la1[222] = jj_gen; break label_152; } jj_consume_token(SEMICOLON); @@ -4861,7 +4907,7 @@ LexicalUnit exp; ; break; default: - jj_la1[221] = jj_gen; + jj_la1[223] = jj_gen; break label_153; } jj_consume_token(S); @@ -4872,7 +4918,7 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[222] = jj_gen; + jj_la1[224] = jj_gen; ; } } @@ -4885,7 +4931,7 @@ LexicalUnit exp; ; break; default: - jj_la1[223] = jj_gen; + jj_la1[225] = jj_gen; break label_154; } jj_consume_token(S); @@ -4903,7 +4949,7 @@ LexicalUnit exp; debuggingDirective(); break; default: - jj_la1[224] = jj_gen; + jj_la1[226] = jj_gen; if (jj_2_6(2147483647)) { styleRule(); } else if (jj_2_7(3)) { @@ -4924,7 +4970,7 @@ LexicalUnit exp; styleRule(); break; default: - jj_la1[225] = jj_gen; + jj_la1[227] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4976,7 +5022,7 @@ LexicalUnit exp; ; break; default: - jj_la1[226] = jj_gen; + jj_la1[228] = jj_gen; break label_155; } jj_consume_token(S); @@ -5021,7 +5067,7 @@ LexicalUnit exp; important = prio(); break; default: - jj_la1[227] = jj_gen; + jj_la1[229] = jj_gen; ; } Token next = getToken(1); @@ -5047,7 +5093,7 @@ LexicalUnit exp; ; break; default: - jj_la1[228] = jj_gen; + jj_la1[230] = jj_gen; break label_156; } jj_consume_token(S); @@ -5059,7 +5105,7 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[229] = jj_gen; + jj_la1[231] = jj_gen; ; } label_157: @@ -5069,7 +5115,7 @@ LexicalUnit exp; ; break; default: - jj_la1[230] = jj_gen; + jj_la1[232] = jj_gen; break label_157; } jj_consume_token(SEMICOLON); @@ -5080,7 +5126,7 @@ LexicalUnit exp; ; break; default: - jj_la1[231] = jj_gen; + jj_la1[233] = jj_gen; break label_158; } jj_consume_token(S); @@ -5091,7 +5137,7 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[232] = jj_gen; + jj_la1[234] = jj_gen; ; } } @@ -5103,7 +5149,7 @@ LexicalUnit exp; ; break; default: - jj_la1[233] = jj_gen; + jj_la1[235] = jj_gen; break label_159; } jj_consume_token(S); @@ -5111,7 +5157,7 @@ LexicalUnit exp; documentHandler.endNestedProperties(name); break; default: - jj_la1[234] = jj_gen; + jj_la1[236] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5168,7 +5214,7 @@ LexicalUnit exp; ; break; default: - jj_la1[235] = jj_gen; + jj_la1[237] = jj_gen; break label_160; } jj_consume_token(S); @@ -5179,7 +5225,7 @@ LexicalUnit exp; important = prio(); break; default: - jj_la1[236] = jj_gen; + jj_la1[238] = jj_gen; ; } documentHandler.property(name, exp, important); @@ -5229,7 +5275,7 @@ LexicalUnit exp; ; break; default: - jj_la1[237] = jj_gen; + jj_la1[239] = jj_gen; break label_161; } jj_consume_token(S); @@ -5247,7 +5293,7 @@ LexicalUnit exp; ; break; default: - jj_la1[238] = jj_gen; + jj_la1[240] = jj_gen; break label_162; } jj_consume_token(S); @@ -5280,7 +5326,7 @@ LexicalUnit exp; ; break; default: - jj_la1[239] = jj_gen; + jj_la1[241] = jj_gen; break label_163; } jj_consume_token(S); @@ -5298,7 +5344,7 @@ LexicalUnit exp; ; break; default: - jj_la1[240] = jj_gen; + jj_la1[242] = jj_gen; break label_164; } jj_consume_token(S); @@ -5316,7 +5362,7 @@ LexicalUnit exp; ; break; default: - jj_la1[241] = jj_gen; + jj_la1[243] = jj_gen; break label_165; } jj_consume_token(S); @@ -5334,7 +5380,7 @@ LexicalUnit exp; ; break; default: - jj_la1[242] = jj_gen; + jj_la1[244] = jj_gen; break label_166; } jj_consume_token(S); @@ -5353,7 +5399,7 @@ LexicalUnit exp; ; break; default: - jj_la1[243] = jj_gen; + jj_la1[245] = jj_gen; break label_167; } } @@ -5371,7 +5417,7 @@ LexicalUnit exp; ; break; default: - jj_la1[244] = jj_gen; + jj_la1[246] = jj_gen; break label_168; } } @@ -5380,7 +5426,7 @@ LexicalUnit exp; prev);} break; default: - jj_la1[245] = jj_gen; + jj_la1[247] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5427,7 +5473,7 @@ LexicalUnit exp; {if (true) return '+';} break; default: - jj_la1[246] = jj_gen; + jj_la1[248] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5480,7 +5526,7 @@ LexicalUnit exp; result = variableTerm(prev); break; default: - jj_la1[247] = jj_gen; + jj_la1[249] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5533,7 +5579,7 @@ LexicalUnitImpl result = null; op = unaryOperator(); break; default: - jj_la1[248] = jj_gen; + jj_la1[250] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -5649,7 +5695,7 @@ LexicalUnitImpl result = null; result = function(op, prev); break; default: - jj_la1[249] = jj_gen; + jj_la1[251] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5682,7 +5728,7 @@ LexicalUnitImpl result = null; s+="."; break; default: - jj_la1[250] = jj_gen; + jj_la1[252] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -5699,7 +5745,7 @@ LexicalUnitImpl result = null; n = jj_consume_token(FROM); break; default: - jj_la1[251] = jj_gen; + jj_la1[253] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5746,13 +5792,13 @@ LexicalUnitImpl result = null; result = unicode(prev); break; default: - jj_la1[252] = jj_gen; + jj_la1[254] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[253] = jj_gen; + jj_la1[255] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5763,7 +5809,7 @@ LexicalUnitImpl result = null; ; break; default: - jj_la1[254] = jj_gen; + jj_la1[256] = jj_gen; break label_170; } jj_consume_token(S); @@ -5787,7 +5833,7 @@ LexicalUnitImpl result = null; ; break; default: - jj_la1[255] = jj_gen; + jj_la1[257] = jj_gen; break label_171; } jj_consume_token(S); @@ -5839,7 +5885,7 @@ LexicalUnitImpl result = null; params = expr(); break; default: - jj_la1[256] = jj_gen; + jj_la1[258] = jj_gen; ; } jj_consume_token(RPARAN); @@ -6303,7 +6349,7 @@ LexicalUnitImpl result = null; ; break; default: - jj_la1[257] = jj_gen; + jj_la1[259] = jj_gen; break label_172; } jj_consume_token(S); @@ -6339,7 +6385,7 @@ LexicalUnitImpl result = null; fontFace(); break; default: - jj_la1[258] = jj_gen; + jj_la1[260] = jj_gen; ret = skipStatement(); if ((ret == null) || (ret.length() == 0)) { {if (true) return;} @@ -6361,7 +6407,7 @@ LexicalUnitImpl result = null; ; break; default: - jj_la1[259] = jj_gen; + jj_la1[261] = jj_gen; break label_173; } jj_consume_token(S); @@ -6377,7 +6423,7 @@ LexicalUnitImpl result = null; ; break; default: - jj_la1[260] = jj_gen; + jj_la1[262] = jj_gen; break label_174; } jj_consume_token(S); @@ -6393,7 +6439,7 @@ LexicalUnitImpl result = null; ; break; default: - jj_la1[261] = jj_gen; + jj_la1[263] = jj_gen; break label_175; } jj_consume_token(S); @@ -6404,7 +6450,7 @@ LexicalUnitImpl result = null; declaration(); break; default: - jj_la1[262] = jj_gen; + jj_la1[264] = jj_gen; ; } label_176: @@ -6414,7 +6460,7 @@ LexicalUnitImpl result = null; ; break; default: - jj_la1[263] = jj_gen; + jj_la1[265] = jj_gen; break label_176; } jj_consume_token(SEMICOLON); @@ -6425,7 +6471,7 @@ LexicalUnitImpl result = null; ; break; default: - jj_la1[264] = jj_gen; + jj_la1[266] = jj_gen; break label_177; } jj_consume_token(S); @@ -6436,7 +6482,7 @@ LexicalUnitImpl result = null; declaration(); break; default: - jj_la1[265] = jj_gen; + jj_la1[267] = jj_gen; ; } } @@ -6452,7 +6498,7 @@ LexicalUnitImpl result = null; ; break; default: - jj_la1[266] = jj_gen; + jj_la1[268] = jj_gen; break label_178; } jj_consume_token(S); @@ -6590,11 +6636,6 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_218() { - if (jj_3R_217()) return true; - return false; - } - private boolean jj_3R_216() { if (jj_scan_token(GUARDED_SYM)) return true; Token xsp; @@ -6605,6 +6646,11 @@ LexicalUnitImpl result = null; return false; } + private boolean jj_3R_218() { + if (jj_3R_217()) return true; + return false; + } + private boolean jj_3R_217() { Token xsp; xsp = jj_scanpos; @@ -6776,6 +6822,11 @@ LexicalUnitImpl result = null; return false; } + private boolean jj_3R_206() { + if (jj_3R_190()) return true; + return false; + } + private boolean jj_3R_271() { if (jj_scan_token(INTERPOLATION)) return true; return false; @@ -6786,11 +6837,6 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_206() { - if (jj_3R_190()) return true; - return false; - } - private boolean jj_3R_296() { Token xsp; xsp = jj_scanpos; @@ -6832,6 +6878,22 @@ LexicalUnitImpl result = null; return false; } + private boolean jj_3R_186() { + if (jj_3R_205()) 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_206()) { + jj_scanpos = xsp; + if (jj_3R_207()) return true; + } + return false; + } + private boolean jj_3R_223() { if (jj_scan_token(LBRACKET)) return true; Token xsp; @@ -6850,19 +6912,8 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_186() { - if (jj_3R_205()) 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_206()) { - jj_scanpos = xsp; - if (jj_3R_207()) return true; - } + private boolean jj_3R_269() { + if (jj_3R_190()) return true; return false; } @@ -6871,11 +6922,6 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_269() { - if (jj_3R_190()) return true; - return false; - } - private boolean jj_3R_257() { if (jj_scan_token(PARENT)) return true; return false; @@ -6952,6 +6998,16 @@ LexicalUnitImpl result = null; return false; } + private boolean jj_3R_249() { + if (jj_3R_262()) return true; + return false; + } + + private boolean jj_3R_248() { + if (jj_3R_261()) return true; + return false; + } + private boolean jj_3R_301() { if (jj_scan_token(IDENT)) return true; return false; @@ -6967,21 +7023,6 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_249() { - if (jj_3R_262()) return true; - return false; - } - - private boolean jj_3R_248() { - if (jj_3R_261()) return true; - return false; - } - - private boolean jj_3R_300() { - if (jj_3R_222()) return true; - return false; - } - private boolean jj_3_5() { Token xsp; xsp = jj_scanpos; @@ -6990,6 +7031,11 @@ LexicalUnitImpl result = null; return false; } + private boolean jj_3R_300() { + if (jj_3R_222()) return true; + return false; + } + private boolean jj_3R_221() { if (jj_scan_token(DOT)) return true; Token xsp; @@ -7175,16 +7221,6 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_199() { - if (jj_3R_223()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_276()) { jj_scanpos = xsp; break; } - } - return false; - } - private boolean jj_3R_202() { Token xsp; xsp = jj_scanpos; @@ -7204,6 +7240,16 @@ LexicalUnitImpl result = null; return false; } + private boolean jj_3R_199() { + if (jj_3R_223()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_276()) { jj_scanpos = xsp; break; } + } + return false; + } + private boolean jj_3R_198() { if (jj_3R_222()) return true; Token xsp; @@ -7260,6 +7306,11 @@ LexicalUnitImpl result = null; return false; } + private boolean jj_3R_244() { + if (jj_scan_token(DIMEN)) return true; + return false; + } + private boolean jj_3R_195() { if (jj_3R_219()) return true; Token xsp; @@ -7270,8 +7321,8 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_244() { - if (jj_scan_token(DIMEN)) return true; + private boolean jj_3R_243() { + if (jj_scan_token(KHZ)) return true; return false; } @@ -7294,8 +7345,8 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_243() { - if (jj_scan_token(KHZ)) return true; + private boolean jj_3R_242() { + if (jj_scan_token(HZ)) return true; return false; } @@ -7305,11 +7356,6 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_242() { - if (jj_scan_token(HZ)) return true; - return false; - } - private boolean jj_3R_241() { if (jj_scan_token(MS)) return true; return false; @@ -7355,19 +7401,24 @@ LexicalUnitImpl result = null; return false; } + private boolean jj_3R_232() { + if (jj_scan_token(PX)) return true; + return false; + } + private boolean jj_3_2() { if (jj_3R_180()) return true; if (jj_3R_181()) return true; return false; } - private boolean jj_3R_232() { - if (jj_scan_token(PX)) return true; + private boolean jj_3R_231() { + if (jj_scan_token(IN)) return true; return false; } - private boolean jj_3R_231() { - if (jj_scan_token(IN)) return true; + private boolean jj_3R_230() { + if (jj_scan_token(PC)) return true; return false; } @@ -7387,13 +7438,13 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_230() { - if (jj_scan_token(PC)) return true; + private boolean jj_3R_229() { + if (jj_scan_token(MM)) return true; return false; } - private boolean jj_3R_229() { - if (jj_scan_token(MM)) return true; + private boolean jj_3R_228() { + if (jj_scan_token(CM)) return true; return false; } @@ -7415,11 +7466,6 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_228() { - if (jj_scan_token(CM)) return true; - return false; - } - private boolean jj_3R_227() { if (jj_scan_token(PT)) return true; return false; @@ -7514,21 +7560,6 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3_1() { - if (jj_3R_179()) return true; - return false; - } - - private boolean jj_3R_185() { - if (jj_3R_203()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_204()) { jj_scanpos = xsp; break; } - } - return false; - } - private boolean jj_3R_184() { Token xsp; xsp = jj_scanpos; @@ -7548,6 +7579,21 @@ LexicalUnitImpl result = null; return false; } + private boolean jj_3_1() { + if (jj_3R_179()) return true; + return false; + } + + private boolean jj_3R_185() { + if (jj_3R_203()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_204()) { jj_scanpos = xsp; break; } + } + return false; + } + private boolean jj_3_4() { if (jj_3R_182()) return true; return false; @@ -7588,11 +7634,6 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3_3() { - if (jj_3R_179()) return true; - return false; - } - private boolean jj_3R_268() { if (jj_scan_token(PLUS)) return true; return false; @@ -7613,6 +7654,11 @@ LexicalUnitImpl result = null; return false; } + private boolean jj_3_3() { + if (jj_3R_179()) return true; + return false; + } + private boolean jj_3R_263() { if (jj_scan_token(UNICODERANGE)) return true; return false; @@ -7626,22 +7672,22 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_192() { - if (jj_scan_token(SEMICOLON)) return true; + private boolean jj_3R_190() { + if (jj_3R_187()) 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_190() { - if (jj_3R_187()) return true; + private boolean jj_3R_192() { + 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; } @@ -7696,11 +7742,6 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_191() { - if (jj_3R_216()) return true; - return false; - } - private boolean jj_3R_214() { if (jj_scan_token(PLUS)) return true; Token xsp; @@ -7712,6 +7753,11 @@ LexicalUnitImpl result = null; return false; } + private boolean jj_3R_191() { + if (jj_3R_216()) return true; + return false; + } + /** Generated Token Manager. */ public ParserTokenManager token_source; /** Current token. */ @@ -7722,7 +7768,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[267]; + final private int[] jj_la1 = new int[269]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -7734,16 +7780,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,0xd4fd1500,0x2,0x2,0x2,0x0,0x0,0x2,0x0,0x200000,0x2,0x0,0x2,0x2,0x2,0x2,0x0,0x200000,0x2,0x0,0x2,0x391500,0xc40000,0xc40002,0xc40000,0x2,0x2,0x80120002,0x80120002,0x2,0x0,0x0,0x2,0x2,0x2,0x2,0xd4c40000,0xd4c40000,0x2,0x100000,0x2,0xd4c40000,0x2,0x84000000,0x84000000,0x84000000,0x84000000,0x84000000,0x84000000,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,0xd4fd1500,0x2,0x2,0x2,0x0,0x0,0x2,0x0,0x200000,0x2,0x0,0x2,0x2,0x2,0x2,0x0,0x200000,0x2,0x0,0x2,0x391500,0xc40000,0xc40002,0xc40000,0x2,0x2,0x80120002,0x80120002,0x2,0x0,0x0,0x2,0x2,0x2,0x2,0xd4c40000,0xd4c40000,0x2,0x100000,0x2,0xd4c40000,0x2,0x84000000,0x84000000,0x84000000,0x84000000,0x84000000,0x84000000,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,0x60001c0,0x0,0x0,0x0,0x0,0x40,0x0,0x80,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0xc2,0xc2,0x0,0x80,0x80,0x0,0x0,0x0,0x0,0x564000c0,0x564000c0,0x0,0x0,0x0,0xc0,0x0,0x40,0x40,0x40,0x40,0x40,0x40,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,0x60001c0,0x0,0x0,0x0,0x0,0x40,0x0,0x80,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0xc2,0xc2,0x0,0x80,0x80,0x0,0x0,0x0,0x0,0x564000c0,0x564000c0,0x0,0x0,0x0,0xc0,0x0,0x40,0x40,0x40,0x40,0x40,0x40,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,0x2b80,0x2b80,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x2a80,0x0,0x0,0x0,0x0,0x0,0x380,0x380,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x1119,0x1119,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x100,0x100,0x100,0x100,0x100,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x100,0x0,0x40,0x0,0x0,0x0,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,0x2b80,0x2b80,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x2a80,0x0,0x0,0x0,0x0,0x0,0x380,0x380,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x1119,0x1119,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x100,0x100,0x100,0x100,0x100,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x100,0x0,0x40,0x0,0x0,0x0,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,0xc401bf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc401be,0x0,0x0,0x0,0x0,0x0,0x400000,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc7,0xc7,0x0,0x0,0x0,0x1,0x0,0x1,0x1,0x0,0x0,0x1,0x1,0x1,0x1,0x1,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x0,0x0,0x0,0x45,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,0xc401bf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc401be,0x0,0x0,0x0,0x0,0x0,0x400000,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc7,0xc7,0x0,0x0,0x0,0x1,0x0,0x1,0x1,0x0,0x0,0x1,0x1,0x1,0x1,0x1,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x0,0x0,0x0,0x45,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; @@ -7755,7 +7801,7 @@ LexicalUnitImpl result = null; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 267; i++) jj_la1[i] = -1; + for (int i = 0; i < 269; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -7765,7 +7811,7 @@ LexicalUnitImpl result = null; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 267; i++) jj_la1[i] = -1; + for (int i = 0; i < 269; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -7775,7 +7821,7 @@ LexicalUnitImpl result = null; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 267; i++) jj_la1[i] = -1; + for (int i = 0; i < 269; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -7785,7 +7831,7 @@ LexicalUnitImpl result = null; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 267; i++) jj_la1[i] = -1; + for (int i = 0; i < 269; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -7902,7 +7948,7 @@ LexicalUnitImpl result = null; la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 267; i++) { + for (int i = 0; i < 269; 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 1c45d815a5..98e2f7fb04 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj @@ -1661,9 +1661,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; } } @@ -1723,10 +1725,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/src/com/vaadin/sass/internal/parser/Token.java b/theme-compiler/src/com/vaadin/sass/internal/parser/Token.java index 26d1121f96..ba29df7d33 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/Token.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Token.java @@ -143,4 +143,4 @@ public class Token implements java.io.Serializable { } } -/* JavaCC - OriginalChecksum=dad2146dc89e68f66e77382c9e448fb7 (do not edit this line) */ +/* JavaCC - OriginalChecksum=8b653fc6be4ca9bd10137ee3ad4c32c4 (do not edit this line) */ diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/TokenMgrError.java b/theme-compiler/src/com/vaadin/sass/internal/parser/TokenMgrError.java index f093357e96..1757cf6705 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/TokenMgrError.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/TokenMgrError.java @@ -159,4 +159,4 @@ public class TokenMgrError extends Error this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason); } } -/* JavaCC - OriginalChecksum=c7c96e9cf4a9320d03dd722437439354 (do not edit this line) */ +/* JavaCC - OriginalChecksum=525946b34c715198d7c29f668b049f5d (do not edit this line) */ diff --git a/theme-compiler/tests/resources/automatic/css/mixin-empty-paramlist.css b/theme-compiler/tests/resources/automatic/css/mixin-empty-paramlist.css new file mode 100644 index 0000000000..59ef68680d --- /dev/null +++ b/theme-compiler/tests/resources/automatic/css/mixin-empty-paramlist.css @@ -0,0 +1,15 @@ +body { + color: blue; +} + +h1 { + text-align: center; +} + +p { + font-style: italic; +} + +table { + width: 100%; +}
\ No newline at end of file diff --git a/theme-compiler/tests/resources/automatic/scss/mixin-empty-paramlist.scss b/theme-compiler/tests/resources/automatic/scss/mixin-empty-paramlist.scss new file mode 100644 index 0000000000..27033ba850 --- /dev/null +++ b/theme-compiler/tests/resources/automatic/scss/mixin-empty-paramlist.scss @@ -0,0 +1,28 @@ +@mixin emptyarglist1(){ + body{ + color: blue; + } +} + +@mixin emptyarglist2(){ + h1{ + text-align:center; + } +} + +@mixin emptyarglist3{ + p{ + font-style:italic; + } +} + +@mixin emptyarglist4{ + table{ + width: 100%; + } +} + +@include emptyarglist1(); +@include emptyarglist2; +@include emptyarglist3(); +@include emptyarglist4;
\ No newline at end of file |