aboutsummaryrefslogtreecommitdiffstats
path: root/theme-compiler/src/com/vaadin/sass/internal
diff options
context:
space:
mode:
Diffstat (limited to 'theme-compiler/src/com/vaadin/sass/internal')
-rw-r--r--theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandler.java6
-rw-r--r--theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java10
-rw-r--r--theme-compiler/src/com/vaadin/sass/internal/parser/CharStream.java2
-rw-r--r--theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java1604
-rw-r--r--theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj75
-rw-r--r--theme-compiler/src/com/vaadin/sass/internal/parser/Token.java2
-rw-r--r--theme-compiler/src/com/vaadin/sass/internal/parser/TokenMgrError.java2
7 files changed, 898 insertions, 803 deletions
diff --git a/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandler.java b/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandler.java
index e6916e5070..3bf6c056c4 100644
--- a/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandler.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandler.java
@@ -51,8 +51,6 @@ public interface SCSSDocumentHandler extends DocumentHandler {
void endNestedProperties(String name);
- void includeDirective(String name, List<LexicalUnitImpl> args);
-
void importStyle(String uri, SACMediaList media, boolean isURL);
void property(String name, LexicalUnitImpl value, boolean important,
@@ -99,8 +97,8 @@ public interface SCSSDocumentHandler extends DocumentHandler {
void contentDirective();
- void startIncludeContentBlock(String name, List<LexicalUnitImpl> args);
+ void startInclude(String name, List<LexicalUnitImpl> args);
- void endIncludeContentBlock();
+ void endInclude();
}
diff --git a/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java b/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java
index 99f00e3889..633ab98b9c 100644
--- a/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java
@@ -245,12 +245,6 @@ public class SCSSDocumentHandlerImpl implements SCSSDocumentHandler {
}
@Override
- public void includeDirective(String name, List<LexicalUnitImpl> args) {
- MixinNode node = new MixinNode(name, args);
- nodeStack.peek().appendChild(node);
- }
-
- @Override
public void importStyle(String uri, SACMediaList media, boolean isURL) {
ImportNode node = new ImportNode(uri, media, isURL);
nodeStack.peek().appendChild(node);
@@ -375,7 +369,7 @@ public class SCSSDocumentHandlerImpl implements SCSSDocumentHandler {
}
@Override
- public void startIncludeContentBlock(String name, List<LexicalUnitImpl> args) {
+ public void startInclude(String name, List<LexicalUnitImpl> args) {
MixinNode node = new MixinNode(name, args);
nodeStack.peek().appendChild(node);
nodeStack.push(node);
@@ -383,7 +377,7 @@ public class SCSSDocumentHandlerImpl implements SCSSDocumentHandler {
}
@Override
- public void endIncludeContentBlock() {
+ public void endInclude() {
nodeStack.pop();
}
}
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 e43320453c..c22f19451b 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=18aae0a549695f0fec96a11297b442bb (do not edit this line) */
+/* JavaCC - OriginalChecksum=deb80d024b50bdc8bfaadaf528157233 (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 86d028a7d4..eee53608b5 100644
--- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
@@ -3908,7 +3908,7 @@ boolean isPseudoElement = false;
break;
case VARIABLE:
name = variableName();
- name = "$"+name;
+ name = "$"+name;
break;
case FUNCTION:
name = functionName();
@@ -3932,8 +3932,24 @@ boolean isPseudoElement = false;
jj_consume_token(-1);
throw new ParseException();
}
+ documentHandler.startInclude(name, args);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case LBRACE:
+ includeDirectiveBlockContents();
+ break;
case SEMICOLON:
+ includeDirectiveTerminator();
+ break;
+ default:
+ jj_la1[165] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
+ documentHandler.endInclude();
+ }
+
+ final public void includeDirectiveTerminator() throws ParseException {
+ try {
label_110:
while (true) {
jj_consume_token(SEMICOLON);
@@ -3944,7 +3960,7 @@ boolean isPseudoElement = false;
;
break;
default:
- jj_la1[165] = jj_gen;
+ jj_la1[166] = jj_gen;
break label_111;
}
jj_consume_token(S);
@@ -3954,98 +3970,93 @@ boolean isPseudoElement = false;
;
break;
default:
- jj_la1[166] = jj_gen;
+ jj_la1[167] = jj_gen;
break label_110;
}
}
- documentHandler.includeDirective(name, args);
- break;
- case LBRACE:
- jj_consume_token(LBRACE);
- label_112:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case S:
- ;
- break;
- default:
- jj_la1[167] = jj_gen;
- break label_112;
- }
- jj_consume_token(S);
+ } catch (ParseException e) {
+ acceptMissingSemicolonBeforeRbrace(e);
+ }
+ }
+
+ final public void includeDirectiveBlockContents() throws ParseException {
+ jj_consume_token(LBRACE);
+ label_112:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case S:
+ ;
+ break;
+ default:
+ jj_la1[168] = jj_gen;
+ break label_112;
}
- documentHandler.startIncludeContentBlock(name, args);
- label_113:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case PLUS:
- case PRECEDES:
- case SIBLING:
- case LBRACKET:
- case ANY:
- case PARENT:
- case DOT:
- case COLON:
- case INTERPOLATION:
- case TO:
- case FROM:
- case DEBUG_SYM:
- case WARN_SYM:
- case IDENT:
- case PERCENTAGE:
- case HASH:
- ;
- break;
- default:
- jj_la1[168] = jj_gen;
- break label_113;
- }
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case PLUS:
- case PRECEDES:
- case SIBLING:
- case LBRACKET:
- case ANY:
- case PARENT:
- case DOT:
- case COLON:
- case INTERPOLATION:
- case DEBUG_SYM:
- case WARN_SYM:
- case IDENT:
- case HASH:
- styleRuleOrDeclarationOrNestedProperties();
- break;
- case TO:
- case FROM:
- case PERCENTAGE:
- keyframeSelector();
- break;
- default:
- jj_la1[169] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
+ jj_consume_token(S);
+ }
+ label_113:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case PLUS:
+ case PRECEDES:
+ case SIBLING:
+ case LBRACKET:
+ case ANY:
+ case PARENT:
+ case DOT:
+ case COLON:
+ case INTERPOLATION:
+ case TO:
+ case FROM:
+ case DEBUG_SYM:
+ case WARN_SYM:
+ case IDENT:
+ case PERCENTAGE:
+ case HASH:
+ ;
+ break;
+ default:
+ jj_la1[169] = jj_gen;
+ break label_113;
}
- jj_consume_token(RBRACE);
- label_114:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case S:
- ;
- break;
- default:
- jj_la1[170] = jj_gen;
- break label_114;
- }
- jj_consume_token(S);
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case PLUS:
+ case PRECEDES:
+ case SIBLING:
+ case LBRACKET:
+ case ANY:
+ case PARENT:
+ case DOT:
+ case COLON:
+ case INTERPOLATION:
+ case DEBUG_SYM:
+ case WARN_SYM:
+ case IDENT:
+ case HASH:
+ styleRuleOrDeclarationOrNestedProperties();
+ break;
+ case TO:
+ case FROM:
+ case PERCENTAGE:
+ keyframeSelector();
+ break;
+ default:
+ jj_la1[170] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
- documentHandler.endIncludeContentBlock();
- break;
- default:
- jj_la1[171] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
+ }
+ jj_consume_token(RBRACE);
+ label_114:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case S:
+ ;
+ break;
+ default:
+ jj_la1[171] = jj_gen;
+ break label_114;
+ }
+ jj_consume_token(S);
}
}
@@ -4662,39 +4673,71 @@ boolean isPseudoElement = false;
final public void debugDirective() throws ParseException {
jj_consume_token(DEBUG_SYM);
- String content = skipStatementUntilSemiColon();
+ String content = skipStatementUntil(new int[] {SEMICOLON,RBRACE});
// TODO should evaluate the content expression, call documentHandler.debugDirective() etc.
System.out.println(content);
- label_141:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case S:
- ;
- break;
- default:
- jj_la1[209] = jj_gen;
- break label_141;
+ try {
+ label_141:
+ while (true) {
+ jj_consume_token(SEMICOLON);
+ label_142:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case S:
+ ;
+ break;
+ default:
+ jj_la1[209] = jj_gen;
+ break label_142;
+ }
+ jj_consume_token(S);
+ }
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case SEMICOLON:
+ ;
+ break;
+ default:
+ jj_la1[210] = jj_gen;
+ break label_141;
+ }
}
- jj_consume_token(S);
+ } catch (ParseException e) {
+ acceptMissingSemicolonBeforeRbrace(e);
}
}
final public void warnDirective() throws ParseException {
jj_consume_token(WARN_SYM);
- String content = skipStatementUntilSemiColon();
+ String content = skipStatementUntil(new int[] {SEMICOLON,RBRACE});
// TODO should evaluate the content expression, call documentHandler.warnDirective() etc.
System.err.println(content);
- label_142:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case S:
- ;
- break;
- default:
- jj_la1[210] = jj_gen;
- break label_142;
+ try {
+ label_143:
+ while (true) {
+ jj_consume_token(SEMICOLON);
+ label_144:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case S:
+ ;
+ break;
+ default:
+ jj_la1[211] = jj_gen;
+ break label_144;
+ }
+ jj_consume_token(S);
+ }
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case SEMICOLON:
+ ;
+ break;
+ default:
+ jj_la1[212] = jj_gen;
+ break label_143;
+ }
}
- jj_consume_token(S);
+ } catch (ParseException e) {
+ acceptMissingSemicolonBeforeRbrace(e);
}
}
@@ -4718,20 +4761,20 @@ boolean isPseudoElement = false;
exclusive = false;
break;
default:
- jj_la1[211] = jj_gen;
+ jj_la1[213] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
to = skipStatementUntilLeftBrace();
- label_143:
+ label_145:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[212] = jj_gen;
- break label_143;
+ jj_la1[214] = jj_gen;
+ break label_145;
}
jj_consume_token(S);
}
@@ -4752,83 +4795,91 @@ boolean isPseudoElement = false;
final public void extendDirective() throws ParseException {
ArrayList<String> list;
jj_consume_token(EXTEND_SYM);
- label_144:
+ label_146:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[213] = jj_gen;
- break label_144;
+ jj_la1[215] = jj_gen;
+ break label_146;
}
jj_consume_token(S);
}
list = selectorList();
- label_145:
- while (true) {
- jj_consume_token(SEMICOLON);
- label_146:
+ documentHandler.extendDirective(list);
+ try {
+ label_147:
while (true) {
+ jj_consume_token(SEMICOLON);
+ label_148:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case S:
+ ;
+ break;
+ default:
+ jj_la1[216] = jj_gen;
+ break label_148;
+ }
+ jj_consume_token(S);
+ }
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case S:
+ case SEMICOLON:
;
break;
default:
- jj_la1[214] = jj_gen;
- break label_146;
+ jj_la1[217] = jj_gen;
+ break label_147;
}
- jj_consume_token(S);
- }
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case SEMICOLON:
- ;
- break;
- default:
- jj_la1[215] = jj_gen;
- break label_145;
}
+ } catch (ParseException e) {
+ acceptMissingSemicolonBeforeRbrace(e);
}
- documentHandler.extendDirective(list);
}
final public void contentDirective() throws ParseException {
jj_consume_token(CONTENT_SYM);
- label_147:
+ label_149:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[216] = jj_gen;
- break label_147;
+ jj_la1[218] = jj_gen;
+ break label_149;
}
jj_consume_token(S);
}
- label_148:
- while (true) {
- jj_consume_token(SEMICOLON);
- label_149:
+ try {
+ label_150:
while (true) {
+ jj_consume_token(SEMICOLON);
+ label_151:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case S:
+ ;
+ break;
+ default:
+ jj_la1[219] = jj_gen;
+ break label_151;
+ }
+ jj_consume_token(S);
+ }
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case S:
+ case SEMICOLON:
;
break;
default:
- jj_la1[217] = jj_gen;
- break label_149;
+ jj_la1[220] = jj_gen;
+ break label_150;
}
- jj_consume_token(S);
- }
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case SEMICOLON:
- ;
- break;
- default:
- jj_la1[218] = jj_gen;
- break label_148;
}
+ } catch (ParseException e) {
+ acceptMissingSemicolonBeforeRbrace(e);
}
documentHandler.contentDirective();
}
@@ -4854,28 +4905,28 @@ boolean isPseudoElement = false;
LexicalUnit exp;
name = property();
jj_consume_token(COLON);
- label_150:
+ label_152:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[219] = jj_gen;
- break label_150;
+ jj_la1[221] = jj_gen;
+ break label_152;
}
jj_consume_token(S);
}
jj_consume_token(LBRACE);
- label_151:
+ label_153:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[220] = jj_gen;
- break label_151;
+ jj_la1[222] = jj_gen;
+ break label_153;
}
jj_consume_token(S);
}
@@ -4886,29 +4937,29 @@ LexicalUnit exp;
declaration();
break;
default:
- jj_la1[221] = jj_gen;
+ jj_la1[223] = jj_gen;
;
}
- label_152:
+ label_154:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SEMICOLON:
;
break;
default:
- jj_la1[222] = jj_gen;
- break label_152;
+ jj_la1[224] = jj_gen;
+ break label_154;
}
jj_consume_token(SEMICOLON);
- label_153:
+ label_155:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[223] = jj_gen;
- break label_153;
+ jj_la1[225] = jj_gen;
+ break label_155;
}
jj_consume_token(S);
}
@@ -4918,21 +4969,21 @@ LexicalUnit exp;
declaration();
break;
default:
- jj_la1[224] = jj_gen;
+ jj_la1[226] = jj_gen;
;
}
}
jj_consume_token(RBRACE);
documentHandler.endNestedProperties(name);
- label_154:
+ label_156:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[225] = jj_gen;
- break label_154;
+ jj_la1[227] = jj_gen;
+ break label_156;
}
jj_consume_token(S);
}
@@ -4949,7 +5000,7 @@ LexicalUnit exp;
debuggingDirective();
break;
default:
- jj_la1[226] = jj_gen;
+ jj_la1[228] = jj_gen;
if (jj_2_6(2147483647)) {
styleRule();
} else if (jj_2_7(3)) {
@@ -4970,7 +5021,7 @@ LexicalUnit exp;
styleRule();
break;
default:
- jj_la1[227] = jj_gen;
+ jj_la1[229] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5015,15 +5066,15 @@ LexicalUnit exp;
name = property();
save = token;
jj_consume_token(COLON);
- label_155:
+ label_157:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[228] = jj_gen;
- break label_155;
+ jj_la1[230] = jj_gen;
+ break label_157;
}
jj_consume_token(S);
}
@@ -5067,7 +5118,7 @@ LexicalUnit exp;
important = prio();
break;
default:
- jj_la1[229] = jj_gen;
+ jj_la1[231] = jj_gen;
;
}
Token next = getToken(1);
@@ -5086,15 +5137,15 @@ LexicalUnit exp;
break;
case LBRACE:
jj_consume_token(LBRACE);
- label_156:
+ label_158:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[230] = jj_gen;
- break label_156;
+ jj_la1[232] = jj_gen;
+ break label_158;
}
jj_consume_token(S);
}
@@ -5105,29 +5156,29 @@ LexicalUnit exp;
declaration();
break;
default:
- jj_la1[231] = jj_gen;
+ jj_la1[233] = jj_gen;
;
}
- label_157:
+ label_159:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SEMICOLON:
;
break;
default:
- jj_la1[232] = jj_gen;
- break label_157;
+ jj_la1[234] = jj_gen;
+ break label_159;
}
jj_consume_token(SEMICOLON);
- label_158:
+ label_160:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[233] = jj_gen;
- break label_158;
+ jj_la1[235] = jj_gen;
+ break label_160;
}
jj_consume_token(S);
}
@@ -5137,27 +5188,27 @@ LexicalUnit exp;
declaration();
break;
default:
- jj_la1[234] = jj_gen;
+ jj_la1[236] = jj_gen;
;
}
}
jj_consume_token(RBRACE);
- label_159:
+ label_161:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[235] = jj_gen;
- break label_159;
+ jj_la1[237] = jj_gen;
+ break label_161;
}
jj_consume_token(S);
}
documentHandler.endNestedProperties(name);
break;
default:
- jj_la1[236] = jj_gen;
+ jj_la1[238] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5207,15 +5258,15 @@ LexicalUnit exp;
name = property();
save = token;
jj_consume_token(COLON);
- label_160:
+ label_162:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[237] = jj_gen;
- break label_160;
+ jj_la1[239] = jj_gen;
+ break label_162;
}
jj_consume_token(S);
}
@@ -5225,7 +5276,7 @@ LexicalUnit exp;
important = prio();
break;
default:
- jj_la1[238] = jj_gen;
+ jj_la1[240] = jj_gen;
;
}
documentHandler.property(name, exp, important);
@@ -5268,15 +5319,15 @@ LexicalUnit exp;
*/
final public boolean prio() throws ParseException {
jj_consume_token(IMPORTANT_SYM);
- label_161:
+ label_163:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[239] = jj_gen;
- break label_161;
+ jj_la1[241] = jj_gen;
+ break label_163;
}
jj_consume_token(S);
}
@@ -5286,15 +5337,15 @@ LexicalUnit exp;
final public boolean guarded() throws ParseException {
jj_consume_token(GUARDED_SYM);
- label_162:
+ label_164:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[240] = jj_gen;
- break label_162;
+ jj_la1[242] = jj_gen;
+ break label_164;
}
jj_consume_token(S);
}
@@ -5319,15 +5370,15 @@ LexicalUnit exp;
* 3. parenthesis is not supported now.
*/
n = jj_consume_token(COMMA);
- label_163:
+ label_165:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[241] = jj_gen;
- break label_163;
+ jj_la1[243] = jj_gen;
+ break label_165;
}
jj_consume_token(S);
}
@@ -5337,15 +5388,15 @@ LexicalUnit exp;
break;
case DIV:
n = jj_consume_token(DIV);
- label_164:
+ label_166:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[242] = jj_gen;
- break label_164;
+ jj_la1[244] = jj_gen;
+ break label_166;
}
jj_consume_token(S);
}
@@ -5355,15 +5406,15 @@ LexicalUnit exp;
break;
case ANY:
n = jj_consume_token(ANY);
- label_165:
+ label_167:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[243] = jj_gen;
- break label_165;
+ jj_la1[245] = jj_gen;
+ break label_167;
}
jj_consume_token(S);
}
@@ -5373,15 +5424,15 @@ LexicalUnit exp;
break;
case MOD:
n = jj_consume_token(MOD);
- label_166:
+ label_168:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[244] = jj_gen;
- break label_166;
+ jj_la1[246] = jj_gen;
+ break label_168;
}
jj_consume_token(S);
}
@@ -5391,7 +5442,7 @@ LexicalUnit exp;
break;
case PLUS:
n = jj_consume_token(PLUS);
- label_167:
+ label_169:
while (true) {
jj_consume_token(S);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -5399,8 +5450,8 @@ LexicalUnit exp;
;
break;
default:
- jj_la1[245] = jj_gen;
- break label_167;
+ jj_la1[247] = jj_gen;
+ break label_169;
}
}
{if (true) return LexicalUnitImpl.createAdd(n.beginLine,
@@ -5409,7 +5460,7 @@ LexicalUnit exp;
break;
case MINUS:
n = jj_consume_token(MINUS);
- label_168:
+ label_170:
while (true) {
jj_consume_token(S);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -5417,8 +5468,8 @@ LexicalUnit exp;
;
break;
default:
- jj_la1[246] = jj_gen;
- break label_168;
+ jj_la1[248] = jj_gen;
+ break label_170;
}
}
{if (true) return LexicalUnitImpl.createMinus(n.beginLine,
@@ -5426,7 +5477,7 @@ LexicalUnit exp;
prev);}
break;
default:
- jj_la1[247] = jj_gen;
+ jj_la1[249] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5441,12 +5492,12 @@ LexicalUnit exp;
char op;
first = term(null);
res = first;
- label_169:
+ label_171:
while (true) {
if (jj_2_8(2)) {
;
} else {
- break label_169;
+ break label_171;
}
if (jj_2_9(2)) {
res = operator(res);
@@ -5473,7 +5524,7 @@ LexicalUnit exp;
{if (true) return '+';}
break;
default:
- jj_la1[248] = jj_gen;
+ jj_la1[250] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5526,7 +5577,7 @@ LexicalUnit exp;
result = variableTerm(prev);
break;
default:
- jj_la1[249] = jj_gen;
+ jj_la1[251] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5579,7 +5630,7 @@ LexicalUnitImpl result = null;
op = unaryOperator();
break;
default:
- jj_la1[250] = jj_gen;
+ jj_la1[252] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -5695,7 +5746,7 @@ LexicalUnitImpl result = null;
result = function(op, prev);
break;
default:
- jj_la1[251] = jj_gen;
+ jj_la1[253] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5728,7 +5779,7 @@ LexicalUnitImpl result = null;
s+=".";
break;
default:
- jj_la1[252] = jj_gen;
+ jj_la1[254] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -5745,7 +5796,7 @@ LexicalUnitImpl result = null;
n = jj_consume_token(FROM);
break;
default:
- jj_la1[253] = jj_gen;
+ jj_la1[255] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5792,25 +5843,25 @@ LexicalUnitImpl result = null;
result = unicode(prev);
break;
default:
- jj_la1[254] = jj_gen;
+ jj_la1[256] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[255] = jj_gen;
+ jj_la1[257] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- label_170:
+ label_172:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[256] = jj_gen;
- break label_170;
+ jj_la1[258] = jj_gen;
+ break label_172;
}
jj_consume_token(S);
}
@@ -5826,15 +5877,15 @@ LexicalUnitImpl result = null;
Token n;
LexicalUnit params = null;
n = jj_consume_token(FUNCTION);
- label_171:
+ label_173:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[257] = jj_gen;
- break label_171;
+ jj_la1[259] = jj_gen;
+ break label_173;
}
jj_consume_token(S);
}
@@ -5885,7 +5936,7 @@ LexicalUnitImpl result = null;
params = expr();
break;
default:
- jj_la1[258] = jj_gen;
+ jj_la1[260] = jj_gen;
;
}
jj_consume_token(RPARAN);
@@ -6342,15 +6393,15 @@ LexicalUnitImpl result = null;
// TODO required by original parser but not used by Vaadin?
final public void _parseRule() throws ParseException {
String ret = null;
- label_172:
+ label_174:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[259] = jj_gen;
- break label_172;
+ jj_la1[261] = jj_gen;
+ break label_174;
}
jj_consume_token(S);
}
@@ -6385,7 +6436,7 @@ LexicalUnitImpl result = null;
fontFace();
break;
default:
- jj_la1[260] = jj_gen;
+ jj_la1[262] = jj_gen;
ret = skipStatement();
if ((ret == null) || (ret.length() == 0)) {
{if (true) return;}
@@ -6400,15 +6451,15 @@ LexicalUnitImpl result = null;
}
final public void _parseImportRule() throws ParseException {
- label_173:
+ label_175:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[261] = jj_gen;
- break label_173;
+ jj_la1[263] = jj_gen;
+ break label_175;
}
jj_consume_token(S);
}
@@ -6416,15 +6467,15 @@ LexicalUnitImpl result = null;
}
final public void _parseMediaRule() throws ParseException {
- label_174:
+ label_176:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[262] = jj_gen;
- break label_174;
+ jj_la1[264] = jj_gen;
+ break label_176;
}
jj_consume_token(S);
}
@@ -6432,15 +6483,15 @@ LexicalUnitImpl result = null;
}
final public void _parseDeclarationBlock() throws ParseException {
- label_175:
+ label_177:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[263] = jj_gen;
- break label_175;
+ jj_la1[265] = jj_gen;
+ break label_177;
}
jj_consume_token(S);
}
@@ -6450,29 +6501,29 @@ LexicalUnitImpl result = null;
declaration();
break;
default:
- jj_la1[264] = jj_gen;
+ jj_la1[266] = jj_gen;
;
}
- label_176:
+ label_178:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SEMICOLON:
;
break;
default:
- jj_la1[265] = jj_gen;
- break label_176;
+ jj_la1[267] = jj_gen;
+ break label_178;
}
jj_consume_token(SEMICOLON);
- label_177:
+ label_179:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[266] = jj_gen;
- break label_177;
+ jj_la1[268] = jj_gen;
+ break label_179;
}
jj_consume_token(S);
}
@@ -6482,7 +6533,7 @@ LexicalUnitImpl result = null;
declaration();
break;
default:
- jj_la1[267] = jj_gen;
+ jj_la1[269] = jj_gen;
;
}
}
@@ -6491,15 +6542,15 @@ LexicalUnitImpl result = null;
final public ArrayList<String> _parseSelectors() throws ParseException {
ArrayList<String> p = null;
try {
- label_178:
+ label_180:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
;
break;
default:
- jj_la1[268] = jj_gen;
- break label_178;
+ jj_la1[270] = jj_gen;
+ break label_180;
}
jj_consume_token(S);
}
@@ -6511,6 +6562,13 @@ LexicalUnitImpl result = null;
throw new Error("Missing return statement in function");
}
+ void acceptMissingSemicolonBeforeRbrace(ParseException parseException) throws ParseException {
+ Token next = getToken(1);
+ if (next.kind != RBRACE) {
+ throw parseException;
+ }
+ }
+
private boolean jj_2_1(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
try { return !jj_3_1(); }
@@ -6574,29 +6632,14 @@ LexicalUnitImpl result = null;
finally { jj_save(8, xla); }
}
- private boolean jj_3R_213() {
- if (jj_scan_token(MOD)) return true;
- Token xsp;
- while (true) {
- xsp = jj_scanpos;
- if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
- }
- return false;
- }
-
- private boolean jj_3R_212() {
- if (jj_scan_token(ANY)) return true;
+ private boolean jj_3R_202() {
+ if (jj_scan_token(VARIABLE)) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
}
- return false;
- }
-
- private boolean jj_3R_211() {
- if (jj_scan_token(DIV)) return true;
- Token xsp;
+ if (jj_scan_token(COLON)) return true;
while (true) {
xsp = jj_scanpos;
if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
@@ -6604,54 +6647,25 @@ LexicalUnitImpl result = null;
return false;
}
- private boolean jj_3R_210() {
- if (jj_scan_token(COMMA)) return true;
- Token xsp;
- while (true) {
- xsp = jj_scanpos;
- if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
- }
+ private boolean jj_3R_220() {
+ if (jj_3R_219()) return true;
return false;
}
- private boolean jj_3R_188() {
+ private boolean jj_3R_184() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_210()) {
- jj_scanpos = xsp;
- if (jj_3R_211()) {
- jj_scanpos = xsp;
- if (jj_3R_212()) {
- jj_scanpos = xsp;
- if (jj_3R_213()) {
- jj_scanpos = xsp;
- if (jj_3R_214()) {
- jj_scanpos = xsp;
- if (jj_3R_215()) return true;
- }
- }
- }
- }
- }
- return false;
- }
-
- private boolean jj_3R_216() {
- if (jj_scan_token(GUARDED_SYM)) return true;
- Token xsp;
+ if (jj_3R_202()) jj_scanpos = xsp;
+ if (jj_scan_token(CONTAINS)) return true;
while (true) {
xsp = jj_scanpos;
if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
}
+ if (true) { jj_la = 0; jj_scanpos = jj_lastpos; return false;}
return false;
}
- private boolean jj_3R_218() {
- if (jj_3R_217()) return true;
- return false;
- }
-
- private boolean jj_3R_217() {
+ private boolean jj_3R_219() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(18)) {
@@ -6668,68 +6682,61 @@ LexicalUnitImpl result = null;
return false;
}
- private boolean jj_3R_179() {
- if (jj_3R_189()) return true;
+ private boolean jj_3R_181() {
+ if (jj_3R_191()) 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; }
}
- if (jj_3R_190()) return true;
- xsp = jj_scanpos;
- if (jj_3R_191()) jj_scanpos = xsp;
if (jj_3R_192()) return true;
+ xsp = jj_scanpos;
+ if (jj_3R_193()) jj_scanpos = xsp;
+ if (jj_3R_194()) return true;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_192()) { jj_scanpos = xsp; break; }
+ if (jj_3R_194()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_194() {
+ private boolean jj_3R_196() {
if (jj_scan_token(S)) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_218()) jj_scanpos = xsp;
+ if (jj_3R_220()) jj_scanpos = xsp;
return false;
}
- private boolean jj_3R_193() {
- if (jj_3R_217()) return true;
+ private boolean jj_3R_195() {
+ if (jj_3R_219()) return true;
return false;
}
- private boolean jj_3R_180() {
+ private boolean jj_3R_182() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_193()) {
+ if (jj_3R_195()) {
jj_scanpos = xsp;
- if (jj_3R_194()) return true;
+ if (jj_3R_196()) return true;
}
return false;
}
- private boolean jj_3R_200() {
- if (jj_scan_token(VARIABLE)) return true;
- Token xsp;
- while (true) {
- xsp = jj_scanpos;
- if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
- }
- if (jj_scan_token(COLON)) return true;
- while (true) {
- xsp = jj_scanpos;
- if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
- }
+ private boolean jj_3R_222() {
+ if (jj_scan_token(HASH)) return true;
return false;
}
- private boolean jj_3R_182() {
+ private boolean jj_3R_292() {
+ if (jj_scan_token(IDENT)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_293() {
+ if (jj_scan_token(FUNCTION)) return true;
Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_200()) jj_scanpos = xsp;
- if (jj_scan_token(CONTAINS)) return true;
while (true) {
xsp = jj_scanpos;
if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
@@ -6738,119 +6745,138 @@ LexicalUnitImpl result = null;
return false;
}
- private boolean jj_3R_220() {
- if (jj_scan_token(HASH)) return true;
+ private boolean jj_3_7() {
+ if (jj_3R_188()) return true;
return false;
}
- private boolean jj_3R_290() {
- if (jj_scan_token(IDENT)) return true;
+ private boolean jj_3R_291() {
+ if (jj_scan_token(COLON)) return true;
return false;
}
- private boolean jj_3R_291() {
- if (jj_scan_token(FUNCTION)) return true;
+ private boolean jj_3R_209() {
+ if (jj_scan_token(LBRACE)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_224() {
+ 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_291()) jj_scanpos = xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_292()) {
+ jj_scanpos = xsp;
+ if (jj_3R_293()) return true;
}
- if (true) { jj_la = 0; jj_scanpos = jj_lastpos; return false;}
return false;
}
- private boolean jj_3R_289() {
- if (jj_scan_token(COLON)) return true;
+ private boolean jj_3R_208() {
+ if (jj_3R_192()) return true;
return false;
}
- private boolean jj_3R_222() {
+ private boolean jj_3_6() {
+ if (jj_3R_187()) return true;
+ if (jj_scan_token(LBRACE)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_188() {
+ if (jj_3R_207()) 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_289()) jj_scanpos = xsp;
- xsp = jj_scanpos;
- if (jj_3R_290()) {
+ if (jj_3R_208()) {
jj_scanpos = xsp;
- if (jj_3R_291()) return true;
+ if (jj_3R_209()) return true;
}
return false;
}
- private boolean jj_3_7() {
- if (jj_3R_186()) return true;
+ private boolean jj_3R_271() {
+ if (jj_3R_192()) return true;
return false;
}
- private boolean jj_3R_207() {
- if (jj_scan_token(LBRACE)) return true;
+ private boolean jj_3R_312() {
+ if (jj_scan_token(STRING)) return true;
return false;
}
- private boolean jj_3R_310() {
- if (jj_scan_token(STRING)) return true;
+ private boolean jj_3R_261() {
+ if (jj_scan_token(FUNCTION)) return true;
+ Token xsp;
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
+ }
+ xsp = jj_scanpos;
+ if (jj_3R_271()) jj_scanpos = xsp;
+ if (jj_scan_token(RPARAN)) return true;
return false;
}
- private boolean jj_3R_308() {
+ private boolean jj_3R_310() {
if (jj_scan_token(STARMATCH)) return true;
return false;
}
- private boolean jj_3R_309() {
+ private boolean jj_3R_311() {
if (jj_scan_token(IDENT)) return true;
return false;
}
- private boolean jj_3R_307() {
+ private boolean jj_3R_309() {
if (jj_scan_token(DOLLARMATCH)) return true;
return false;
}
- private boolean jj_3R_306() {
+ private boolean jj_3R_308() {
if (jj_scan_token(CARETMATCH)) return true;
return false;
}
- private boolean jj_3R_305() {
+ private boolean jj_3R_307() {
if (jj_scan_token(DASHMATCH)) return true;
return false;
}
- private boolean jj_3R_304() {
+ private boolean jj_3R_306() {
if (jj_scan_token(INCLUDES)) return true;
return false;
}
- private boolean jj_3R_206() {
- if (jj_3R_190()) return true;
- return false;
- }
-
- private boolean jj_3R_271() {
+ private boolean jj_3R_273() {
if (jj_scan_token(INTERPOLATION)) return true;
return false;
}
- private boolean jj_3R_303() {
+ private boolean jj_3R_305() {
if (jj_scan_token(EQ)) return true;
return false;
}
- private boolean jj_3R_296() {
+ private boolean jj_3R_298() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_303()) {
- jj_scanpos = xsp;
- if (jj_3R_304()) {
- jj_scanpos = xsp;
if (jj_3R_305()) {
jj_scanpos = xsp;
if (jj_3R_306()) {
jj_scanpos = xsp;
if (jj_3R_307()) {
jj_scanpos = xsp;
- if (jj_3R_308()) return true;
+ if (jj_3R_308()) {
+ jj_scanpos = xsp;
+ if (jj_3R_309()) {
+ jj_scanpos = xsp;
+ if (jj_3R_310()) return true;
}
}
}
@@ -6861,9 +6887,9 @@ LexicalUnitImpl result = null;
if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
}
xsp = jj_scanpos;
- if (jj_3R_309()) {
+ if (jj_3R_311()) {
jj_scanpos = xsp;
- if (jj_3R_310()) return true;
+ if (jj_3R_312()) return true;
}
while (true) {
xsp = jj_scanpos;
@@ -6872,29 +6898,22 @@ LexicalUnitImpl result = null;
return false;
}
- private boolean jj_3_6() {
- if (jj_3R_185()) return true;
- if (jj_scan_token(LBRACE)) return true;
+ private boolean jj_3R_252() {
+ if (jj_3R_265()) return true;
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_251() {
+ if (jj_3R_264()) return true;
return false;
}
- private boolean jj_3R_223() {
+ private boolean jj_3R_250() {
+ if (jj_3R_263()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_225() {
if (jj_scan_token(LBRACKET)) return true;
Token xsp;
while (true) {
@@ -6907,83 +6926,65 @@ LexicalUnitImpl result = null;
if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
}
xsp = jj_scanpos;
- if (jj_3R_296()) jj_scanpos = xsp;
+ if (jj_3R_298()) jj_scanpos = xsp;
if (jj_scan_token(RBRACKET)) return true;
return false;
}
- private boolean jj_3R_269() {
- if (jj_3R_190()) return true;
- return false;
- }
-
- private boolean jj_3R_302() {
+ private boolean jj_3R_304() {
if (jj_scan_token(INTERPOLATION)) return true;
return false;
}
- private boolean jj_3R_257() {
+ private boolean jj_3R_259() {
if (jj_scan_token(PARENT)) return true;
return false;
}
- private boolean jj_3R_256() {
+ private boolean jj_3R_258() {
if (jj_scan_token(ANY)) return true;
return false;
}
- private boolean jj_3R_266() {
+ private boolean jj_3R_268() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_270()) {
+ if (jj_3R_272()) {
jj_scanpos = xsp;
- if (jj_3R_271()) return true;
+ if (jj_3R_273()) return true;
}
return false;
}
- private boolean jj_3R_270() {
+ private boolean jj_3R_272() {
if (jj_scan_token(IDENT)) return true;
return false;
}
- private boolean jj_3R_219() {
+ private boolean jj_3R_221() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_255()) {
+ if (jj_3R_257()) {
jj_scanpos = xsp;
- if (jj_3R_256()) {
+ if (jj_3R_258()) {
jj_scanpos = xsp;
- if (jj_3R_257()) return true;
- }
+ if (jj_3R_259()) return true;
}
- return false;
- }
-
- private boolean jj_3R_255() {
- Token xsp;
- if (jj_3R_266()) return true;
- while (true) {
- xsp = jj_scanpos;
- if (jj_3R_266()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_259() {
- if (jj_scan_token(FUNCTION)) return true;
+ private boolean jj_3R_257() {
Token xsp;
+ if (jj_3R_268()) return true;
while (true) {
xsp = jj_scanpos;
- if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
+ if (jj_3R_268()) { jj_scanpos = xsp; break; }
}
- xsp = jj_scanpos;
- if (jj_3R_269()) jj_scanpos = xsp;
- if (jj_scan_token(RPARAN)) return true;
return false;
}
- private boolean jj_3R_183() {
+ private boolean jj_3R_185() {
if (jj_scan_token(COMMA)) return true;
Token xsp;
while (true) {
@@ -6993,32 +6994,40 @@ LexicalUnitImpl result = null;
return false;
}
- private boolean jj_3R_250() {
- if (jj_3R_263()) return true;
- return false;
- }
-
- private boolean jj_3R_249() {
- if (jj_3R_262()) return true;
+ private boolean jj_3R_303() {
+ if (jj_scan_token(IDENT)) return true;
return false;
}
- private boolean jj_3R_248() {
- if (jj_3R_261()) return true;
+ private boolean jj_3R_286() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_303()) {
+ jj_scanpos = xsp;
+ if (jj_3R_304()) return true;
+ }
return false;
}
- private boolean jj_3R_301() {
- if (jj_scan_token(IDENT)) return true;
+ private boolean jj_3R_262() {
+ if (jj_scan_token(DOT)) return true;
return false;
}
- private boolean jj_3R_284() {
+ private boolean jj_3R_249() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_301()) {
+ if (jj_3R_262()) jj_scanpos = xsp;
+ xsp = jj_scanpos;
+ if (jj_scan_token(72)) {
jj_scanpos = xsp;
- if (jj_3R_302()) return true;
+ if (jj_scan_token(49)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(50)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(52)) return true;
+ }
+ }
}
return false;
}
@@ -7026,318 +7035,355 @@ LexicalUnitImpl result = null;
private boolean jj_3_5() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_183()) jj_scanpos = xsp;
- if (jj_3R_184()) return true;
+ if (jj_3R_185()) jj_scanpos = xsp;
+ if (jj_3R_186()) return true;
return false;
}
- private boolean jj_3R_300() {
- if (jj_3R_222()) return true;
+ private boolean jj_3R_302() {
+ if (jj_3R_224()) return true;
return false;
}
- private boolean jj_3R_221() {
+ private boolean jj_3R_248() {
+ if (jj_scan_token(STRING)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_223() {
if (jj_scan_token(DOT)) return true;
Token xsp;
- if (jj_3R_284()) return true;
+ if (jj_3R_286()) return true;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_284()) { jj_scanpos = xsp; break; }
+ if (jj_3R_286()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_298() {
- if (jj_3R_221()) return true;
+ private boolean jj_3R_247() {
+ if (jj_3R_261()) return true;
return false;
}
- private boolean jj_3R_293() {
- if (jj_3R_221()) return true;
+ private boolean jj_3R_204() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_248()) {
+ jj_scanpos = xsp;
+ 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_300() {
+ if (jj_3R_223()) return true;
return false;
}
private boolean jj_3R_295() {
- if (jj_3R_222()) return true;
+ if (jj_3R_223()) return true;
return false;
}
- private boolean jj_3R_283() {
- if (jj_3R_222()) return true;
+ private boolean jj_3R_297() {
+ if (jj_3R_224()) return true;
return false;
}
- private boolean jj_3R_286() {
- if (jj_3R_221()) return true;
+ private boolean jj_3R_285() {
+ if (jj_3R_224()) return true;
return false;
}
private boolean jj_3R_288() {
- if (jj_3R_222()) return true;
+ if (jj_3R_223()) return true;
return false;
}
- private boolean jj_3R_299() {
- if (jj_3R_223()) return true;
+ private boolean jj_3R_290() {
+ if (jj_3R_224()) return true;
return false;
}
- private boolean jj_3R_276() {
+ private boolean jj_3R_246() {
+ if (jj_scan_token(DIMEN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_245() {
+ if (jj_scan_token(KHZ)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_301() {
+ if (jj_3R_225()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_244() {
+ if (jj_scan_token(HZ)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_278() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_297()) {
+ if (jj_3R_299()) {
jj_scanpos = xsp;
- if (jj_3R_298()) {
+ if (jj_3R_300()) {
jj_scanpos = xsp;
- if (jj_3R_299()) {
+ if (jj_3R_301()) {
jj_scanpos = xsp;
- if (jj_3R_300()) return true;
+ if (jj_3R_302()) return true;
}
}
}
return false;
}
- private boolean jj_3R_297() {
- if (jj_3R_220()) return true;
+ private boolean jj_3R_299() {
+ if (jj_3R_222()) return true;
return false;
}
- private boolean jj_3R_275() {
+ private boolean jj_3R_277() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_292()) {
+ if (jj_3R_294()) {
jj_scanpos = xsp;
- if (jj_3R_293()) {
+ if (jj_3R_295()) {
jj_scanpos = xsp;
- if (jj_3R_294()) {
+ if (jj_3R_296()) {
jj_scanpos = xsp;
- if (jj_3R_295()) return true;
+ if (jj_3R_297()) return true;
}
}
}
return false;
}
- private boolean jj_3R_292() {
- if (jj_3R_220()) return true;
+ private boolean jj_3R_294() {
+ if (jj_3R_222()) return true;
return false;
}
- private boolean jj_3R_280() {
- if (jj_3R_222()) return true;
+ private boolean jj_3R_243() {
+ if (jj_scan_token(MS)) return true;
return false;
}
- private boolean jj_3R_274() {
+ private boolean jj_3R_282() {
+ if (jj_3R_224()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_276() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_285()) {
+ if (jj_3R_287()) {
jj_scanpos = xsp;
- if (jj_3R_286()) {
+ if (jj_3R_288()) {
jj_scanpos = xsp;
- if (jj_3R_287()) {
+ if (jj_3R_289()) {
jj_scanpos = xsp;
- if (jj_3R_288()) return true;
+ if (jj_3R_290()) return true;
}
}
}
return false;
}
- private boolean jj_3R_285() {
- if (jj_3R_220()) return true;
+ private boolean jj_3R_287() {
+ if (jj_3R_222()) return true;
return false;
}
- private boolean jj_3R_294() {
- if (jj_3R_223()) return true;
+ private boolean jj_3R_296() {
+ if (jj_3R_225()) return true;
return false;
}
- private boolean jj_3R_282() {
- if (jj_3R_223()) return true;
+ private boolean jj_3R_284() {
+ if (jj_3R_225()) return true;
return false;
}
- private boolean jj_3R_287() {
- if (jj_3R_223()) return true;
+ private boolean jj_3R_242() {
+ if (jj_scan_token(SECOND)) return true;
return false;
}
- private boolean jj_3R_273() {
+ private boolean jj_3R_289() {
+ if (jj_3R_225()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_275() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_281()) {
+ if (jj_3R_283()) {
jj_scanpos = xsp;
- if (jj_3R_282()) {
+ if (jj_3R_284()) {
jj_scanpos = xsp;
- if (jj_3R_283()) return true;
+ if (jj_3R_285()) return true;
}
}
return false;
}
- private boolean jj_3R_278() {
- if (jj_3R_221()) return true;
+ private boolean jj_3R_280() {
+ if (jj_3R_223()) return true;
return false;
}
- private boolean jj_3R_281() {
- if (jj_3R_221()) return true;
+ private boolean jj_3R_283() {
+ if (jj_3R_223()) return true;
return false;
}
- private boolean jj_3R_260() {
- if (jj_scan_token(DOT)) return true;
+ private boolean jj_3R_241() {
+ if (jj_scan_token(GRAD)) return true;
return false;
}
- private boolean jj_3R_247() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_260()) jj_scanpos = xsp;
- xsp = jj_scanpos;
- if (jj_scan_token(72)) {
- jj_scanpos = xsp;
- if (jj_scan_token(49)) {
- jj_scanpos = xsp;
- if (jj_scan_token(50)) {
- jj_scanpos = xsp;
- if (jj_scan_token(52)) return true;
- }
- }
- }
+ private boolean jj_3R_240() {
+ if (jj_scan_token(RAD)) return true;
return false;
}
- private boolean jj_3R_246() {
- if (jj_scan_token(STRING)) return true;
+ private boolean jj_3R_239() {
+ if (jj_scan_token(DEG)) return true;
return false;
}
- private boolean jj_3R_245() {
- if (jj_3R_259()) return true;
+ private boolean jj_3R_238() {
+ if (jj_scan_token(EXS)) return true;
return false;
}
- private boolean jj_3R_202() {
+ private boolean jj_3R_201() {
+ if (jj_3R_225()) return true;
Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_246()) {
- jj_scanpos = xsp;
- if (jj_3R_247()) {
- jj_scanpos = xsp;
- if (jj_3R_248()) {
- jj_scanpos = xsp;
- if (jj_3R_249()) {
- jj_scanpos = xsp;
- if (jj_3R_250()) return true;
- }
- }
- }
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_3R_278()) { jj_scanpos = xsp; break; }
}
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; }
- }
+ private boolean jj_3R_237() {
+ if (jj_scan_token(REM)) return true;
return false;
}
- private boolean jj_3R_198() {
- if (jj_3R_222()) return true;
+ private boolean jj_3R_200() {
+ if (jj_3R_224()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_275()) { jj_scanpos = xsp; break; }
+ if (jj_3R_277()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_279() {
- if (jj_3R_223()) return true;
+ private boolean jj_3R_281() {
+ if (jj_3R_225()) return true;
return false;
}
- private boolean jj_3R_197() {
- if (jj_3R_221()) return true;
+ private boolean jj_3R_236() {
+ if (jj_scan_token(LEM)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_199() {
+ if (jj_3R_223()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_274()) { jj_scanpos = xsp; break; }
+ if (jj_3R_276()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_196() {
- if (jj_3R_220()) return true;
+ private boolean jj_3R_198() {
+ if (jj_3R_222()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_273()) { jj_scanpos = xsp; break; }
+ if (jj_3R_275()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_272() {
+ private boolean jj_3R_274() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_277()) {
+ if (jj_3R_279()) {
jj_scanpos = xsp;
- if (jj_3R_278()) {
+ if (jj_3R_280()) {
jj_scanpos = xsp;
- if (jj_3R_279()) {
+ if (jj_3R_281()) {
jj_scanpos = xsp;
- if (jj_3R_280()) return true;
+ if (jj_3R_282()) return true;
}
}
}
return false;
}
- private boolean jj_3R_277() {
- if (jj_3R_220()) return true;
+ private boolean jj_3R_279() {
+ if (jj_3R_222()) return true;
return false;
}
- private boolean jj_3R_244() {
- if (jj_scan_token(DIMEN)) return true;
+ private boolean jj_3R_235() {
+ if (jj_scan_token(EMS)) return true;
return false;
}
- private boolean jj_3R_195() {
- if (jj_3R_219()) return true;
+ private boolean jj_3R_234() {
+ if (jj_scan_token(PX)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_197() {
+ if (jj_3R_221()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_272()) { jj_scanpos = xsp; break; }
+ if (jj_3R_274()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_243() {
- if (jj_scan_token(KHZ)) return true;
+ private boolean jj_3R_233() {
+ if (jj_scan_token(IN)) return true;
return false;
}
- private boolean jj_3R_181() {
+ private boolean jj_3R_183() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_195()) {
- jj_scanpos = xsp;
- if (jj_3R_196()) {
- jj_scanpos = xsp;
if (jj_3R_197()) {
jj_scanpos = xsp;
if (jj_3R_198()) {
jj_scanpos = xsp;
- if (jj_3R_199()) return true;
+ if (jj_3R_199()) {
+ jj_scanpos = xsp;
+ if (jj_3R_200()) {
+ jj_scanpos = xsp;
+ if (jj_3R_201()) return true;
}
}
}
@@ -7345,161 +7391,57 @@ LexicalUnitImpl result = null;
return false;
}
- private boolean jj_3R_242() {
- if (jj_scan_token(HZ)) return true;
- return false;
- }
-
- private boolean jj_3R_252() {
- if (jj_3R_217()) return true;
- if (jj_3R_181()) return true;
- return false;
- }
-
- private boolean jj_3R_241() {
- if (jj_scan_token(MS)) return true;
- return false;
- }
-
- private boolean jj_3R_240() {
- if (jj_scan_token(SECOND)) return true;
- return false;
- }
-
- private boolean jj_3R_239() {
- if (jj_scan_token(GRAD)) return true;
- return false;
- }
-
- private boolean jj_3R_238() {
- if (jj_scan_token(RAD)) return true;
- return false;
- }
-
- private boolean jj_3R_237() {
- if (jj_scan_token(DEG)) return true;
- return false;
- }
-
- private boolean jj_3R_236() {
- if (jj_scan_token(EXS)) return true;
- return false;
- }
-
- private boolean jj_3R_235() {
- if (jj_scan_token(REM)) return true;
- return false;
- }
-
- private boolean jj_3R_234() {
- if (jj_scan_token(LEM)) return true;
- return false;
- }
-
- private boolean jj_3R_233() {
- if (jj_scan_token(EMS)) return true;
- 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_231() {
- if (jj_scan_token(IN)) return true;
- return false;
- }
-
- private boolean jj_3R_230() {
if (jj_scan_token(PC)) return true;
return false;
}
- private boolean jj_3R_204() {
- if (jj_scan_token(COMMA)) return true;
- Token xsp;
- while (true) {
- xsp = jj_scanpos;
- if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
- }
- if (jj_3R_203()) return true;
- return false;
- }
-
- private boolean jj_3R_251() {
- if (jj_3R_181()) return true;
+ private boolean jj_3R_254() {
+ if (jj_3R_219()) return true;
+ if (jj_3R_183()) return true;
return false;
}
- private boolean jj_3R_229() {
+ private boolean jj_3R_231() {
if (jj_scan_token(MM)) return true;
return false;
}
- private boolean jj_3R_228() {
+ private boolean jj_3R_230() {
if (jj_scan_token(CM)) return true;
return false;
}
- private boolean jj_3R_203() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_251()) {
- jj_scanpos = xsp;
- if (jj_3R_252()) return true;
- }
- while (true) {
- xsp = jj_scanpos;
- if (jj_3_2()) { jj_scanpos = xsp; break; }
- }
- while (true) {
- xsp = jj_scanpos;
- if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
- }
- return false;
- }
-
- private boolean jj_3R_227() {
+ private boolean jj_3R_229() {
if (jj_scan_token(PT)) return true;
return false;
}
- private boolean jj_3R_226() {
+ private boolean jj_3R_228() {
if (jj_scan_token(PERCENTAGE)) return true;
return false;
}
- private boolean jj_3R_209() {
- if (jj_3R_254()) return true;
+ private boolean jj_3R_211() {
+ if (jj_3R_256()) return true;
return false;
}
- private boolean jj_3R_225() {
+ private boolean jj_3R_227() {
if (jj_scan_token(NUMBER)) return true;
return false;
}
- private boolean jj_3R_224() {
- if (jj_3R_258()) return true;
+ private boolean jj_3R_226() {
+ if (jj_3R_260()) return true;
return false;
}
- private boolean jj_3R_201() {
+ private boolean jj_3R_203() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_224()) jj_scanpos = xsp;
+ if (jj_3R_226()) jj_scanpos = xsp;
xsp = jj_scanpos;
- if (jj_3R_225()) {
- jj_scanpos = xsp;
- if (jj_3R_226()) {
- jj_scanpos = xsp;
if (jj_3R_227()) {
jj_scanpos = xsp;
if (jj_3R_228()) {
@@ -7536,7 +7478,11 @@ LexicalUnitImpl result = null;
jj_scanpos = xsp;
if (jj_3R_244()) {
jj_scanpos = xsp;
- if (jj_3R_245()) return true;
+ if (jj_3R_245()) {
+ jj_scanpos = xsp;
+ if (jj_3R_246()) {
+ jj_scanpos = xsp;
+ if (jj_3R_247()) return true;
}
}
}
@@ -7560,12 +7506,12 @@ LexicalUnitImpl result = null;
return false;
}
- private boolean jj_3R_184() {
+ private boolean jj_3R_186() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_201()) {
+ if (jj_3R_203()) {
jj_scanpos = xsp;
- if (jj_3R_202()) return true;
+ if (jj_3R_204()) return true;
}
while (true) {
xsp = jj_scanpos;
@@ -7574,92 +7520,117 @@ LexicalUnitImpl result = null;
return false;
}
- private boolean jj_3R_261() {
+ private boolean jj_3R_263() {
if (jj_scan_token(HASH)) return true;
return false;
}
- private boolean jj_3_1() {
- if (jj_3R_179()) return true;
+ private boolean jj_3_2() {
+ if (jj_3R_182()) return true;
+ if (jj_3R_183()) return true;
return false;
}
- private boolean jj_3R_185() {
- if (jj_3R_203()) return true;
+ private boolean jj_3R_256() {
+ if (jj_3R_191()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_264() {
+ if (jj_scan_token(URL)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_206() {
+ if (jj_scan_token(COMMA)) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_204()) { jj_scanpos = xsp; break; }
+ if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
}
+ if (jj_3R_205()) return true;
return false;
}
- private boolean jj_3_4() {
- if (jj_3R_182()) return true;
- return false;
- }
-
- private boolean jj_3R_254() {
- if (jj_3R_189()) return true;
+ private boolean jj_3R_253() {
+ if (jj_3R_183()) return true;
return false;
}
- private boolean jj_3R_262() {
- if (jj_scan_token(URL)) return true;
+ private boolean jj_3R_205() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_253()) {
+ jj_scanpos = xsp;
+ if (jj_3R_254()) return true;
+ }
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_3_2()) { jj_scanpos = xsp; break; }
+ }
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
+ }
return false;
}
- private boolean jj_3R_208() {
- if (jj_3R_184()) return true;
+ private boolean jj_3R_210() {
+ if (jj_3R_186()) return true;
return false;
}
- private boolean jj_3R_187() {
+ private boolean jj_3R_189() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_208()) {
+ if (jj_3R_210()) {
jj_scanpos = xsp;
- if (jj_3R_209()) return true;
+ if (jj_3R_211()) return true;
}
return false;
}
private boolean jj_3_9() {
- if (jj_3R_188()) return true;
- return false;
- }
-
- private boolean jj_3R_265() {
- if (jj_scan_token(INTERPOLATION)) return true;
+ if (jj_3R_190()) return true;
return false;
}
- private boolean jj_3R_268() {
+ private boolean jj_3R_270() {
if (jj_scan_token(PLUS)) return true;
return false;
}
- private boolean jj_3R_258() {
+ private boolean jj_3R_260() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_267()) {
+ if (jj_3R_269()) {
jj_scanpos = xsp;
- if (jj_3R_268()) return true;
+ if (jj_3R_270()) return true;
}
return false;
}
- private boolean jj_3R_267() {
+ private boolean jj_3R_269() {
if (jj_scan_token(MINUS)) return true;
return false;
}
- private boolean jj_3_3() {
- if (jj_3R_179()) return true;
+ private boolean jj_3_1() {
+ if (jj_3R_181()) return true;
return false;
}
- private boolean jj_3R_263() {
+ private boolean jj_3R_187() {
+ if (jj_3R_205()) return true;
+ Token xsp;
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_3R_206()) { jj_scanpos = xsp; break; }
+ }
+ return false;
+ }
+
+ private boolean jj_3R_265() {
if (jj_scan_token(UNICODERANGE)) return true;
return false;
}
@@ -7668,12 +7639,17 @@ LexicalUnitImpl result = null;
Token xsp;
xsp = jj_scanpos;
if (jj_3_9()) jj_scanpos = xsp;
- if (jj_3R_187()) return true;
+ if (jj_3R_189()) return true;
return false;
}
- private boolean jj_3R_190() {
- if (jj_3R_187()) return true;
+ private boolean jj_3_4() {
+ if (jj_3R_184()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_192() {
+ if (jj_3R_189()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
@@ -7682,9 +7658,10 @@ LexicalUnitImpl result = null;
return false;
}
- private boolean jj_3R_192() {
- if (jj_scan_token(SEMICOLON)) return true;
+ private boolean jj_3R_217() {
+ if (jj_scan_token(MINUS)) return true;
Token xsp;
+ if (jj_scan_token(1)) return true;
while (true) {
xsp = jj_scanpos;
if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
@@ -7692,9 +7669,10 @@ LexicalUnitImpl result = null;
return false;
}
- private boolean jj_3R_189() {
- if (jj_scan_token(VARIABLE)) return true;
+ private boolean jj_3R_216() {
+ if (jj_scan_token(PLUS)) return true;
Token xsp;
+ if (jj_scan_token(1)) return true;
while (true) {
xsp = jj_scanpos;
if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
@@ -7702,28 +7680,49 @@ LexicalUnitImpl result = null;
return false;
}
- private boolean jj_3R_253() {
+ private boolean jj_3R_267() {
+ if (jj_scan_token(INTERPOLATION)) return true;
+ return false;
+ }
+
+ private boolean jj_3_3() {
+ if (jj_3R_181()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_215() {
+ if (jj_scan_token(MOD)) return true;
Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_264()) {
- jj_scanpos = xsp;
- if (jj_3R_265()) return true;
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_264() {
- if (jj_scan_token(IDENT)) return true;
+ private boolean jj_3R_214() {
+ if (jj_scan_token(ANY)) return true;
+ Token xsp;
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
+ }
return false;
}
- private boolean jj_3R_205() {
+ private boolean jj_3R_213() {
+ if (jj_scan_token(DIV)) return true;
Token xsp;
- if (jj_3R_253()) return true;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_253()) { jj_scanpos = xsp; break; }
+ if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
}
+ return false;
+ }
+
+ private boolean jj_3R_194() {
+ if (jj_scan_token(SEMICOLON)) return true;
+ Token xsp;
while (true) {
xsp = jj_scanpos;
if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
@@ -7731,10 +7730,9 @@ LexicalUnitImpl result = null;
return false;
}
- private boolean jj_3R_215() {
- if (jj_scan_token(MINUS)) return true;
+ private boolean jj_3R_212() {
+ if (jj_scan_token(COMMA)) return true;
Token xsp;
- if (jj_scan_token(1)) return true;
while (true) {
xsp = jj_scanpos;
if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
@@ -7742,10 +7740,31 @@ LexicalUnitImpl result = null;
return false;
}
- private boolean jj_3R_214() {
- if (jj_scan_token(PLUS)) return true;
+ private boolean jj_3R_190() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_212()) {
+ jj_scanpos = xsp;
+ if (jj_3R_213()) {
+ jj_scanpos = xsp;
+ if (jj_3R_214()) {
+ jj_scanpos = xsp;
+ if (jj_3R_215()) {
+ jj_scanpos = xsp;
+ if (jj_3R_216()) {
+ jj_scanpos = xsp;
+ if (jj_3R_217()) return true;
+ }
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+ private boolean jj_3R_191() {
+ if (jj_scan_token(VARIABLE)) return true;
Token xsp;
- if (jj_scan_token(1)) return true;
while (true) {
xsp = jj_scanpos;
if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
@@ -7753,8 +7772,47 @@ LexicalUnitImpl result = null;
return false;
}
- private boolean jj_3R_191() {
- if (jj_3R_216()) return true;
+ private boolean jj_3R_255() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_266()) {
+ jj_scanpos = xsp;
+ if (jj_3R_267()) return true;
+ }
+ return false;
+ }
+
+ private boolean jj_3R_266() {
+ if (jj_scan_token(IDENT)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_207() {
+ Token xsp;
+ if (jj_3R_255()) return true;
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_3R_255()) { jj_scanpos = xsp; break; }
+ }
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
+ }
+ return false;
+ }
+
+ private boolean jj_3R_218() {
+ if (jj_scan_token(GUARDED_SYM)) return true;
+ Token xsp;
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
+ }
+ return false;
+ }
+
+ private boolean jj_3R_193() {
+ if (jj_3R_218()) return true;
return false;
}
@@ -7768,7 +7826,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[269];
+ final private int[] jj_la1 = new int[271];
static private int[] jj_la1_0;
static private int[] jj_la1_1;
static private int[] jj_la1_2;
@@ -7780,16 +7838,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,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,};
+ 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,0x200400,0x2,0x200000,0x2,0xd4c40000,0xd4c40000,0x2,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,0x200000,0x2,0x200000,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,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,};
+ 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,0x0,0x61200c0,0x61200c0,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,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,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,};
+ 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,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,0x1000,0x0,0x0,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,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,};
+ 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,0x0,0x1,0x1,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,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;
@@ -7801,7 +7859,7 @@ LexicalUnitImpl result = null;
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 269; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 271; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -7811,7 +7869,7 @@ LexicalUnitImpl result = null;
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 269; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 271; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -7821,7 +7879,7 @@ LexicalUnitImpl result = null;
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 269; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 271; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -7831,7 +7889,7 @@ LexicalUnitImpl result = null;
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 269; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 271; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -7948,7 +8006,7 @@ LexicalUnitImpl result = null;
la1tokens[jj_kind] = true;
jj_kind = -1;
}
- for (int i = 0; i < 269; i++) {
+ for (int i = 0; i < 271; 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 98e2f7fb04..13810bd601 100644
--- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj
@@ -1741,17 +1741,33 @@ void includeDirective() :
{
<INCLUDE_SYM>
(<S>)*
- (name = property()|name = variableName(){ name = "$"+name;}
- |(name = functionName()
- args = argValuelist()) <RPARAN>(<S>)*)
- ((";"(<S>)*)+
- {documentHandler.includeDirective(name, args);}
- | <LBRACE> (<S>)* {documentHandler.startIncludeContentBlock(name, args);}
- (styleRuleOrDeclarationOrNestedProperties() | keyframeSelector())*
- <RBRACE> (<S>)* {documentHandler.endIncludeContentBlock();}
- )
+ (name = property() | name = variableName(){ name = "$"+name;}
+ | (name = functionName() args = argValuelist()) <RPARAN>(<S>)*)
+ {documentHandler.startInclude(name, args);}
+ (includeDirectiveBlockContents() | includeDirectiveTerminator())
+ {documentHandler.endInclude();}
}
+void includeDirectiveTerminator():
+{}
+{
+ try {
+ (";"(<S>)*)+
+ }
+ catch (ParseException e) {
+ acceptMissingSemicolonBeforeRbrace(e);
+ }
+}
+
+void includeDirectiveBlockContents():
+{}
+{
+ <LBRACE> (<S>)*
+ (styleRuleOrDeclarationOrNestedProperties() | keyframeSelector())*
+ <RBRACE> (<S>)*
+}
+
+
String interpolation() :
{
Token n;
@@ -1976,11 +1992,16 @@ void debugDirective() :
{
<DEBUG_SYM>
{
- String content = skipStatementUntilSemiColon();
+ String content = skipStatementUntil(new int[] {SEMICOLON,RBRACE});
// TODO should evaluate the content expression, call documentHandler.debugDirective() etc.
System.out.println(content);
}
- (<S>)*
+ try {
+ (";"(<S>)*)+
+ }
+ catch (ParseException e) {
+ acceptMissingSemicolonBeforeRbrace(e);
+ }
}
void warnDirective() :
@@ -1988,11 +2009,16 @@ void warnDirective() :
{
<WARN_SYM>
{
- String content = skipStatementUntilSemiColon();
+ String content = skipStatementUntil(new int[] {SEMICOLON,RBRACE});
// TODO should evaluate the content expression, call documentHandler.warnDirective() etc.
System.err.println(content);
}
- (<S>)*
+ try {
+ (";"(<S>)*)+
+ }
+ catch (ParseException e) {
+ acceptMissingSemicolonBeforeRbrace(e);
+ }
}
Node forDirective() :
@@ -2035,8 +2061,13 @@ void extendDirective() :
<EXTEND_SYM>
(<S>)*
list = selectorList()
- (";"(<S>)*)+
{documentHandler.extendDirective(list);}
+ try {
+ (";"(<S>)*)+
+ }
+ catch (ParseException e) {
+ acceptMissingSemicolonBeforeRbrace(e);
+ }
}
void contentDirective() :
@@ -2044,7 +2075,12 @@ void contentDirective() :
{
<CONTENT_SYM>
(<S>)*
- (";"(<S>)*)+
+ try {
+ (";"(<S>)*)+
+ }
+ catch (ParseException e) {
+ acceptMissingSemicolonBeforeRbrace(e);
+ }
{documentHandler.contentDirective();}
}
@@ -3050,6 +3086,15 @@ ArrayList<String> _parseSelectors() :
}
}
+JAVACODE
+void acceptMissingSemicolonBeforeRbrace( ParseException parseException ) {
+ Token next = getToken(1);
+ if (next.kind != RBRACE) {
+ throw parseException;
+ }
+}
+
+
/*
* Local Variables:
* compile-command: javacc Parser.jj & javac Parser.java
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 ba29df7d33..26d1121f96 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=8b653fc6be4ca9bd10137ee3ad4c32c4 (do not edit this line) */
+/* JavaCC - OriginalChecksum=dad2146dc89e68f66e77382c9e448fb7 (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 1757cf6705..f093357e96 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=525946b34c715198d7c29f668b049f5d (do not edit this line) */
+/* JavaCC - OriginalChecksum=c7c96e9cf4a9320d03dd722437439354 (do not edit this line) */