diff options
| author | Marc Englund <marc@vaadin.com> | 2012-09-06 09:41:08 +0300 |
|---|---|---|
| committer | Marc Englund <marc@vaadin.com> | 2012-09-06 09:41:22 +0300 |
| commit | 4710cbf7d6a73490ff292319af82b4746e509e4b (patch) | |
| tree | 4f5403eea093032941c25abaed194a07973b61ee /sass/src | |
| parent | 28a504e64a9701ccae9177cf815e27a13b1b1ca1 (diff) | |
| download | vaadin-framework-4710cbf7d6a73490ff292319af82b4746e509e4b.tar.gz vaadin-framework-4710cbf7d6a73490ff292319af82b4746e509e4b.zip | |
Applied patch from #9471 (+ generated with JavaCC)
Diffstat (limited to 'sass/src')
14 files changed, 3038 insertions, 2597 deletions
diff --git a/sass/src/com/vaadin/sass/ScssStylesheet.java b/sass/src/com/vaadin/sass/ScssStylesheet.java index caef1720b1..b38cab82a0 100644 --- a/sass/src/com/vaadin/sass/ScssStylesheet.java +++ b/sass/src/com/vaadin/sass/ScssStylesheet.java @@ -32,6 +32,7 @@ import com.vaadin.sass.resolver.ScssStylesheetResolver; import com.vaadin.sass.resolver.VaadinResolver; import com.vaadin.sass.tree.Node; import com.vaadin.sass.visitor.BlockVisitor; +import com.vaadin.sass.visitor.ControlVisitor; import com.vaadin.sass.visitor.ExtendVisitor; import com.vaadin.sass.visitor.ImportVisitor; import com.vaadin.sass.visitor.MixinVisitor; @@ -123,6 +124,8 @@ public class ScssStylesheet extends Node { visitors.add(new BlockVisitor()); visitors.add(new NestPropertiesVisitor()); visitors.add(new ExtendVisitor()); + visitors.add(new ControlVisitor()); + ArrayList<Node> children2 = children; for (Visitor visitor : visitors) { visitor.traverse(this); } diff --git a/sass/src/com/vaadin/sass/handler/SCSSDocumentHandler.java b/sass/src/com/vaadin/sass/handler/SCSSDocumentHandler.java index 3da3efd39b..c489a6a4a7 100644 --- a/sass/src/com/vaadin/sass/handler/SCSSDocumentHandler.java +++ b/sass/src/com/vaadin/sass/handler/SCSSDocumentHandler.java @@ -16,6 +16,7 @@ package com.vaadin.sass.handler; +import java.util.ArrayList; import java.util.Collection; import org.w3c.css.sac.DocumentHandler; @@ -24,12 +25,12 @@ import org.w3c.css.sac.SACMediaList; import org.w3c.css.sac.SelectorList; import com.vaadin.sass.ScssStylesheet; -import com.vaadin.sass.tree.EachNode; import com.vaadin.sass.tree.ForNode; import com.vaadin.sass.tree.IfNode; import com.vaadin.sass.tree.MixinDefNode; import com.vaadin.sass.tree.VariableNode; import com.vaadin.sass.tree.WhileNode; +import com.vaadin.sass.tree.controldirective.EachDefNode; public interface SCSSDocumentHandler extends DocumentHandler { ScssStylesheet getStyleSheet(); @@ -47,8 +48,6 @@ public interface SCSSDocumentHandler extends DocumentHandler { ForNode forDirective(String var, String from, String to, boolean exclusive, String body); - EachNode eachDirective(String var, String list, String body); - WhileNode whileDirective(String condition, String body); IfNode ifDirective(); @@ -65,4 +64,9 @@ public interface SCSSDocumentHandler extends DocumentHandler { void property(String name, LexicalUnit value, boolean important, String comment); + + EachDefNode startEachDirective(String variable, ArrayList<String> list); + + void endEachDirective(); + } diff --git a/sass/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java b/sass/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java index 33ff273412..c31dd78970 100644 --- a/sass/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java +++ b/sass/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java @@ -16,6 +16,7 @@ package com.vaadin.sass.handler; +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -30,7 +31,6 @@ import org.w3c.css.sac.SelectorList; import com.vaadin.sass.ScssStylesheet; import com.vaadin.sass.tree.BlockNode; import com.vaadin.sass.tree.CommentNode; -import com.vaadin.sass.tree.EachNode; import com.vaadin.sass.tree.ExtendNode; import com.vaadin.sass.tree.ForNode; import com.vaadin.sass.tree.IfNode; @@ -43,6 +43,7 @@ import com.vaadin.sass.tree.Node; import com.vaadin.sass.tree.RuleNode; import com.vaadin.sass.tree.VariableNode; import com.vaadin.sass.tree.WhileNode; +import com.vaadin.sass.tree.controldirective.EachDefNode; public class SCSSDocumentHandlerImpl implements SCSSDocumentHandler { @@ -120,13 +121,19 @@ public class SCSSDocumentHandlerImpl implements SCSSDocumentHandler { } @Override - public EachNode eachDirective(String var, String list, String body) { - EachNode node = new EachNode(var, list, body); - System.out.println(node); + public EachDefNode startEachDirective(String var, ArrayList<String> list) { + EachDefNode node = new EachDefNode(var, list); + nodeStack.peek().appendChild(node); + nodeStack.push(node); return node; } @Override + public void endEachDirective() { + nodeStack.pop(); + } + + @Override public WhileNode whileDirective(String condition, String body) { WhileNode node = new WhileNode(condition, body); System.out.println(node); diff --git a/sass/src/com/vaadin/sass/parser/Parser.java b/sass/src/com/vaadin/sass/parser/Parser.java index 152ae1ddb2..68e0aa7231 100644 --- a/sass/src/com/vaadin/sass/parser/Parser.java +++ b/sass/src/com/vaadin/sass/parser/Parser.java @@ -564,6 +564,9 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case MIXIN_SYM: mixinDirective(); break; + case EACH_SYM: + eachDirective(); + break; case INCLUDE_SYM: includeDirective(); break; @@ -572,6 +575,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case PARENT: case DOT: case COLON: + case EACH_VAR: case IDENT: case HASH: styleRule(); @@ -787,6 +791,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case PARENT: case DOT: case COLON: + case EACH_VAR: case NONASCII: case STRING: case IDENT: @@ -816,6 +821,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case PARENT: case DOT: case COLON: + case EACH_VAR: case IDENT: case HASH: styleRule(); @@ -1390,7 +1396,7 @@ char connector = ' '; } jj_consume_token(S); } - {if (true) return convertIdent(n.image);} + {if (true) return convertIdent(n.image);} throw new Error("Missing return statement in function"); } @@ -1466,7 +1472,9 @@ char connector = ' '; case PARENT: case DOT: case COLON: + case EACH_VAR: case INCLUDE_SYM: + case EACH_SYM: case EXTEND_SYM: case IDENT: case VARIABLE: @@ -1488,6 +1496,9 @@ char connector = ' '; case EXTEND_SYM: extendDirective(); break; + case EACH_SYM: + eachDirective(); + break; case VARIABLE: variable(); break; @@ -1502,6 +1513,7 @@ char connector = ' '; case PARENT: case DOT: case COLON: + case EACH_VAR: case IDENT: case HASH: styleRule(); @@ -1650,6 +1662,7 @@ char connector = ' '; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ANY: case PARENT: + case EACH_VAR: case IDENT: simple_current = element_name(); label_45: @@ -1867,11 +1880,37 @@ char connector = ' '; * @exception ParseException exception during the parse */ final public Condition _class(Condition pred) throws ParseException { - Token n; + Token t; +String s = ""; Condition c; jj_consume_token(DOT); - n = jj_consume_token(IDENT); - c = conditionFactory.createClassCondition(null, n.image); + label_50: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IDENT: + t = jj_consume_token(IDENT); + s += t.image; + break; + case EACH_VAR: + t = jj_consume_token(EACH_VAR); + s += t.image; + break; + default: + jj_la1[72] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case EACH_VAR: + case IDENT: + ; + break; + default: + jj_la1[73] = jj_gen; + break label_50; + } + } + c = conditionFactory.createClassCondition(null, s); if (pred == null) { {if (true) return c;} } else { @@ -1884,11 +1923,37 @@ Condition c; * @exception ParseException exception during the parse */ final public SimpleSelector element_name() throws ParseException { - Token n; + Token t; String s = ""; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case EACH_VAR: case IDENT: - n = jj_consume_token(IDENT); - {if (true) return selectorFactory.createElementSelector(null, convertIdent(n.image));} + label_51: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IDENT: + t = jj_consume_token(IDENT); + s += t.image; + break; + case EACH_VAR: + t = jj_consume_token(EACH_VAR); + s += t.image; + break; + default: + jj_la1[74] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case EACH_VAR: + case IDENT: + ; + break; + default: + jj_la1[75] = jj_gen; + break label_51; + } + } + {if (true) return selectorFactory.createElementSelector(null, s);} break; case ANY: jj_consume_token(ANY); @@ -1899,7 +1964,7 @@ Condition c; {if (true) return selectorFactory.createElementSelector(null, "&");} break; default: - jj_la1[72] = jj_gen; + jj_la1[76] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1915,28 +1980,28 @@ Condition c; Token val = null; String attValue = null; jj_consume_token(LBRACKET); - label_50: + label_52: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[73] = jj_gen; - break label_50; + jj_la1[77] = jj_gen; + break label_52; } jj_consume_token(S); } att = jj_consume_token(IDENT); - label_51: + label_53: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[74] = jj_gen; - break label_51; + jj_la1[78] = jj_gen; + break label_53; } jj_consume_token(S); } @@ -1958,19 +2023,19 @@ Condition c; cases = 3; break; default: - jj_la1[75] = jj_gen; + jj_la1[79] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_52: + label_54: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[76] = jj_gen; - break label_52; + jj_la1[80] = jj_gen; + break label_54; } jj_consume_token(S); } @@ -1985,25 +2050,25 @@ Condition c; val.image.length() -1); break; default: - jj_la1[77] = jj_gen; + jj_la1[81] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_53: + label_55: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[78] = jj_gen; - break label_53; + jj_la1[82] = jj_gen; + break label_55; } jj_consume_token(S); } break; default: - jj_la1[79] = jj_gen; + jj_la1[83] = jj_gen; ; } jj_consume_token(RBRACKET); @@ -2052,7 +2117,7 @@ boolean isPseudoElement = false; isPseudoElement=true; break; default: - jj_la1[80] = jj_gen; + jj_la1[84] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2079,28 +2144,28 @@ boolean isPseudoElement = false; break; case FUNCTION: n = jj_consume_token(FUNCTION); - label_54: + label_56: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[81] = jj_gen; - break label_54; + jj_la1[85] = jj_gen; + break label_56; } jj_consume_token(S); } language = jj_consume_token(IDENT); - label_55: + label_57: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[82] = jj_gen; - break label_55; + jj_la1[86] = jj_gen; + break label_57; } jj_consume_token(S); } @@ -2120,7 +2185,7 @@ boolean isPseudoElement = false; } break; default: - jj_la1[83] = jj_gen; + jj_la1[87] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2151,15 +2216,15 @@ boolean isPseudoElement = false; try { name = variableName(); jj_consume_token(COLON); - label_56: + label_58: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[84] = jj_gen; - break label_56; + jj_la1[88] = jj_gen; + break label_58; } jj_consume_token(S); } @@ -2169,21 +2234,21 @@ boolean isPseudoElement = false; guarded = guarded(); break; default: - jj_la1[85] = jj_gen; + jj_la1[89] = jj_gen; ; } - label_57: + label_59: while (true) { jj_consume_token(SEMICOLON); - label_58: + label_60: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[86] = jj_gen; - break label_58; + jj_la1[90] = jj_gen; + break label_60; } jj_consume_token(S); } @@ -2192,8 +2257,8 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[87] = jj_gen; - break label_57; + jj_la1[91] = jj_gen; + break label_59; } } documentHandler.variable(name, exp, guarded); @@ -2224,20 +2289,210 @@ boolean isPseudoElement = false; } } + final public void eachDirective() throws ParseException { + Token var; + ArrayList<String> list; + jj_consume_token(EACH_SYM); + label_61: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case S: + ; + break; + default: + jj_la1[92] = jj_gen; + break label_61; + } + jj_consume_token(S); + } + var = jj_consume_token(VARIABLE); + label_62: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case S: + ; + break; + default: + jj_la1[93] = jj_gen; + break label_62; + } + jj_consume_token(S); + } + jj_consume_token(EACH_IN); + label_63: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case S: + ; + break; + default: + jj_la1[94] = jj_gen; + break label_63; + } + jj_consume_token(S); + } + list = stringList(); + jj_consume_token(LBRACE); + label_64: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case S: + ; + break; + default: + jj_la1[95] = jj_gen; + break label_64; + } + jj_consume_token(S); + } + documentHandler.startEachDirective(var.image, list); + label_65: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case LBRACKET: + case ANY: + case PARENT: + case DOT: + case COLON: + case EACH_VAR: + case INCLUDE_SYM: + case EXTEND_SYM: + case IDENT: + case VARIABLE: + case HASH: + case MEDIA_SYM: + ; + break; + default: + jj_la1[96] = jj_gen; + break label_65; + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case INCLUDE_SYM: + includeDirective(); + break; + case MEDIA_SYM: + media(); + break; + case EXTEND_SYM: + extendDirective(); + break; + case VARIABLE: + variable(); + break; + default: + jj_la1[97] = jj_gen; + if (jj_2_3(3)) { + declarationOrNestedProperties(); + } else { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case LBRACKET: + case ANY: + case PARENT: + case DOT: + case COLON: + case EACH_VAR: + case IDENT: + case HASH: + styleRule(); + break; + default: + jj_la1[98] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } + } + } + jj_consume_token(RBRACE); + label_66: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case S: + ; + break; + default: + jj_la1[99] = jj_gen; + break label_66; + } + jj_consume_token(S); + } + documentHandler.endEachDirective(); + } + + final public ArrayList<String > stringList() throws ParseException { + ArrayList<String > strings = new ArrayList<String >(); + Token input; + input = jj_consume_token(IDENT); + label_67: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case S: + ; + break; + default: + jj_la1[100] = jj_gen; + break label_67; + } + jj_consume_token(S); + } + strings.add(input.image); + label_68: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case COMMA: + ; + break; + default: + jj_la1[101] = jj_gen; + break label_68; + } + jj_consume_token(COMMA); + label_69: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case S: + ; + break; + default: + jj_la1[102] = jj_gen; + break label_69; + } + jj_consume_token(S); + } + input = jj_consume_token(IDENT); + strings.add(input.image); + label_70: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case S: + ; + break; + default: + jj_la1[103] = jj_gen; + break label_70; + } + jj_consume_token(S); + } + } + {if (true) return strings;} + throw new Error("Missing return statement in function"); + } + final public void mixinDirective() throws ParseException { String name; ArrayList<VariableNode> args = null; String body; jj_consume_token(MIXIN_SYM); - label_59: + label_71: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[88] = jj_gen; - break label_59; + jj_la1[104] = jj_gen; + break label_71; } jj_consume_token(S); } @@ -2249,39 +2504,39 @@ boolean isPseudoElement = false; name = functionName(); args = arglist(); jj_consume_token(RPARAN); - label_60: + label_72: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[89] = jj_gen; - break label_60; + jj_la1[105] = jj_gen; + break label_72; } jj_consume_token(S); } break; default: - jj_la1[90] = jj_gen; + jj_la1[106] = jj_gen; jj_consume_token(-1); throw new ParseException(); } jj_consume_token(LBRACE); - label_61: + label_73: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[91] = jj_gen; - break label_61; + jj_la1[107] = jj_gen; + break label_73; } jj_consume_token(S); } documentHandler.startMixinDirective(name, args); - label_62: + label_74: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: @@ -2289,6 +2544,7 @@ boolean isPseudoElement = false; case PARENT: case DOT: case COLON: + case EACH_VAR: case INCLUDE_SYM: case EXTEND_SYM: case IDENT: @@ -2298,8 +2554,8 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[92] = jj_gen; - break label_62; + jj_la1[108] = jj_gen; + break label_74; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case INCLUDE_SYM: @@ -2315,8 +2571,8 @@ boolean isPseudoElement = false; variable(); break; default: - jj_la1[93] = jj_gen; - if (jj_2_3(3)) { + jj_la1[109] = jj_gen; + if (jj_2_4(3)) { declarationOrNestedProperties(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2325,12 +2581,13 @@ boolean isPseudoElement = false; case PARENT: case DOT: case COLON: + case EACH_VAR: case IDENT: case HASH: styleRule(); break; default: - jj_la1[94] = jj_gen; + jj_la1[110] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2338,15 +2595,15 @@ boolean isPseudoElement = false; } } jj_consume_token(RBRACE); - label_63: + label_75: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[95] = jj_gen; - break label_63; + jj_la1[111] = jj_gen; + break label_75; } jj_consume_token(S); } @@ -2357,26 +2614,26 @@ boolean isPseudoElement = false; ArrayList<VariableNode> args = new ArrayList<VariableNode>(); VariableNode arg; arg = mixinArg(); - label_64: + label_76: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[96] = jj_gen; - break label_64; + jj_la1[112] = jj_gen; + break label_76; } jj_consume_token(COMMA); - label_65: + label_77: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[97] = jj_gen; - break label_65; + jj_la1[113] = jj_gen; + break label_77; } jj_consume_token(S); } @@ -2395,22 +2652,22 @@ boolean isPseudoElement = false; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COLON: jj_consume_token(COLON); - label_66: + label_78: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[98] = jj_gen; - break label_66; + jj_la1[114] = jj_gen; + break label_78; } jj_consume_token(S); } value = term(null); break; default: - jj_la1[99] = jj_gen; + jj_la1[115] = jj_gen; ; } VariableNode arg = new VariableNode(name, value, false); @@ -2423,26 +2680,26 @@ boolean isPseudoElement = false; LexicalUnit argValue; argValue = term(null); args.add(argValue); - label_67: + label_79: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[100] = jj_gen; - break label_67; + jj_la1[116] = jj_gen; + break label_79; } jj_consume_token(COMMA); - label_68: + label_80: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[101] = jj_gen; - break label_68; + jj_la1[117] = jj_gen; + break label_80; } jj_consume_token(S); } @@ -2457,15 +2714,15 @@ boolean isPseudoElement = false; String name; ArrayList<LexicalUnit> args=null; jj_consume_token(INCLUDE_SYM); - label_69: + label_81: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[102] = jj_gen; - break label_69; + jj_la1[118] = jj_gen; + break label_81; } jj_consume_token(S); } @@ -2479,22 +2736,22 @@ boolean isPseudoElement = false; jj_consume_token(RPARAN); break; default: - jj_la1[103] = jj_gen; + jj_la1[119] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_70: + label_82: while (true) { jj_consume_token(SEMICOLON); - label_71: + label_83: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[104] = jj_gen; - break label_71; + jj_la1[120] = jj_gen; + break label_83; } jj_consume_token(S); } @@ -2503,8 +2760,8 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[105] = jj_gen; - break label_70; + jj_la1[121] = jj_gen; + break label_82; } } documentHandler.includeDirective(name, args); @@ -2518,15 +2775,15 @@ boolean isPseudoElement = false; name = functionName(); args = skipStatementUntilRightParan(); jj_consume_token(RPARAN); - label_72: + label_84: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[106] = jj_gen; - break label_72; + jj_la1[122] = jj_gen; + break label_84; } jj_consume_token(S); } @@ -2568,20 +2825,20 @@ boolean isPseudoElement = false; exclusive = false; break; default: - jj_la1[107] = jj_gen; + jj_la1[123] = jj_gen; jj_consume_token(-1); throw new ParseException(); } to = skipStatementUntilLeftBrace(); - label_73: + label_85: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[108] = jj_gen; - break label_73; + jj_la1[124] = jj_gen; + break label_85; } jj_consume_token(S); } @@ -2590,30 +2847,6 @@ boolean isPseudoElement = false; throw new Error("Missing return statement in function"); } - final public Node eachDirective() throws ParseException { - String var; - String list; - String body; - var = variableName(); - jj_consume_token(EACH_IN); - label_74: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case S: - ; - break; - default: - jj_la1[109] = jj_gen; - break label_74; - } - jj_consume_token(S); - } - list = skipStatementUntilLeftBrace(); - body = skipStatement(); - {if (true) return documentHandler.eachDirective(var, list, body);} - throw new Error("Missing return statement in function"); - } - final public Node whileDirective() throws ParseException { String condition; String body; @@ -2633,31 +2866,31 @@ boolean isPseudoElement = false; final public void extendDirective() throws ParseException { SelectorList list; jj_consume_token(EXTEND_SYM); - label_75: + label_86: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[110] = jj_gen; - break label_75; + jj_la1[125] = jj_gen; + break label_86; } jj_consume_token(S); } list = selectorList(); - label_76: + label_87: while (true) { jj_consume_token(SEMICOLON); - label_77: + label_88: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[111] = jj_gen; - break label_77; + jj_la1[126] = jj_gen; + break label_88; } jj_consume_token(S); } @@ -2666,8 +2899,8 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[112] = jj_gen; - break label_76; + jj_la1[127] = jj_gen; + break label_87; } } documentHandler.extendDirective(list); @@ -2694,28 +2927,28 @@ boolean isPseudoElement = false; LexicalUnit exp; name = property(); jj_consume_token(COLON); - label_78: + label_89: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[113] = jj_gen; - break label_78; + jj_la1[128] = jj_gen; + break label_89; } jj_consume_token(S); } jj_consume_token(LBRACE); - label_79: + label_90: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[114] = jj_gen; - break label_79; + jj_la1[129] = jj_gen; + break label_90; } jj_consume_token(S); } @@ -2725,29 +2958,29 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[115] = jj_gen; + jj_la1[130] = jj_gen; ; } - label_80: + label_91: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[116] = jj_gen; - break label_80; + jj_la1[131] = jj_gen; + break label_91; } jj_consume_token(SEMICOLON); - label_81: + label_92: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[117] = jj_gen; - break label_81; + jj_la1[132] = jj_gen; + break label_92; } jj_consume_token(S); } @@ -2756,21 +2989,21 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[118] = jj_gen; + jj_la1[133] = jj_gen; ; } } jj_consume_token(RBRACE); documentHandler.endNestedProperties(name); - label_82: + label_93: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[119] = jj_gen; - break label_82; + jj_la1[134] = jj_gen; + break label_93; } jj_consume_token(S); } @@ -2789,15 +3022,15 @@ LexicalUnit exp; name = property(); save = token; jj_consume_token(COLON); - label_83: + label_94: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[120] = jj_gen; - break label_83; + jj_la1[135] = jj_gen; + break label_94; } jj_consume_token(S); } @@ -2835,7 +3068,7 @@ LexicalUnit exp; important = prio(); break; default: - jj_la1[121] = jj_gen; + jj_la1[136] = jj_gen; ; } Token next = getToken(1); @@ -2853,15 +3086,15 @@ LexicalUnit exp; break; case LBRACE: jj_consume_token(LBRACE); - label_84: + label_95: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[122] = jj_gen; - break label_84; + jj_la1[137] = jj_gen; + break label_95; } jj_consume_token(S); } @@ -2871,29 +3104,29 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[123] = jj_gen; + jj_la1[138] = jj_gen; ; } - label_85: + label_96: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[124] = jj_gen; - break label_85; + jj_la1[139] = jj_gen; + break label_96; } jj_consume_token(SEMICOLON); - label_86: + label_97: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[125] = jj_gen; - break label_86; + jj_la1[140] = jj_gen; + break label_97; } jj_consume_token(S); } @@ -2902,27 +3135,27 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[126] = jj_gen; + jj_la1[141] = jj_gen; ; } } jj_consume_token(RBRACE); - label_87: + label_98: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[127] = jj_gen; - break label_87; + jj_la1[142] = jj_gen; + break label_98; } jj_consume_token(S); } documentHandler.endNestedProperties(name); break; default: - jj_la1[128] = jj_gen; + jj_la1[143] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2972,15 +3205,15 @@ LexicalUnit exp; name = property(); save = token; jj_consume_token(COLON); - label_88: + label_99: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[129] = jj_gen; - break label_88; + jj_la1[144] = jj_gen; + break label_99; } jj_consume_token(S); } @@ -2990,7 +3223,7 @@ LexicalUnit exp; important = prio(); break; default: - jj_la1[130] = jj_gen; + jj_la1[145] = jj_gen; ; } documentHandler.property(name, exp, important); @@ -3033,15 +3266,15 @@ LexicalUnit exp; */ final public boolean prio() throws ParseException { jj_consume_token(IMPORTANT_SYM); - label_89: + label_100: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[131] = jj_gen; - break label_89; + jj_la1[146] = jj_gen; + break label_100; } jj_consume_token(S); } @@ -3051,15 +3284,15 @@ LexicalUnit exp; final public boolean guarded() throws ParseException { jj_consume_token(GUARDED_SYM); - label_90: + label_101: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[132] = jj_gen; - break label_90; + jj_la1[147] = jj_gen; + break label_101; } jj_consume_token(S); } @@ -3075,15 +3308,15 @@ LexicalUnit exp; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case DIV: n = jj_consume_token(DIV); - label_91: + label_102: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[133] = jj_gen; - break label_91; + jj_la1[148] = jj_gen; + break label_102; } jj_consume_token(S); } @@ -3093,15 +3326,15 @@ LexicalUnit exp; break; case COMMA: n = jj_consume_token(COMMA); - label_92: + label_103: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[134] = jj_gen; - break label_92; + jj_la1[149] = jj_gen; + break label_103; } jj_consume_token(S); } @@ -3110,7 +3343,7 @@ LexicalUnit exp; prev);} break; default: - jj_la1[135] = jj_gen; + jj_la1[150] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3125,12 +3358,12 @@ LexicalUnit exp; char op; first = term(null); res = first; - label_93: + label_104: while (true) { - if (jj_2_4(2)) { + if (jj_2_5(2)) { ; } else { - break label_93; + break label_104; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: @@ -3138,7 +3371,7 @@ LexicalUnit exp; res = operator(res); break; default: - jj_la1[136] = jj_gen; + jj_la1[151] = jj_gen; ; } res = term(res); @@ -3161,7 +3394,7 @@ LexicalUnit exp; {if (true) return '+';} break; default: - jj_la1[137] = jj_gen; + jj_la1[152] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3231,7 +3464,7 @@ LexicalUnit exp; op = unaryOperator(); break; default: - jj_la1[138] = jj_gen; + jj_la1[153] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3336,7 +3569,7 @@ LexicalUnit exp; result = function(op, prev); break; default: - jj_la1[139] = jj_gen; + jj_la1[154] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3399,25 +3632,25 @@ LexicalUnit exp; result = unicode(prev); break; default: - jj_la1[140] = jj_gen; + jj_la1[155] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[141] = jj_gen; + jj_la1[156] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_94: + label_105: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[142] = jj_gen; - break label_94; + jj_la1[157] = jj_gen; + break label_105; } jj_consume_token(S); } @@ -3428,7 +3661,7 @@ LexicalUnit exp; prev, varName); break; default: - jj_la1[143] = jj_gen; + jj_la1[158] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3444,15 +3677,15 @@ LexicalUnit exp; Token n; LexicalUnit params = null; n = jj_consume_token(FUNCTION); - label_95: + label_106: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[144] = jj_gen; - break label_95; + jj_la1[159] = jj_gen; + break label_106; } jj_consume_token(S); } @@ -3493,7 +3726,7 @@ LexicalUnit exp; params = expr(); break; default: - jj_la1[145] = jj_gen; + jj_la1[160] = jj_gen; ; } jj_consume_token(RPARAN); @@ -3968,15 +4201,15 @@ LexicalUnit exp; */ final public void _parseRule() throws ParseException { String ret = null; - label_96: + label_107: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[146] = jj_gen; - break label_96; + jj_la1[161] = jj_gen; + break label_107; } jj_consume_token(S); } @@ -3989,6 +4222,7 @@ LexicalUnit exp; case PARENT: case DOT: case COLON: + case EACH_VAR: case IDENT: case HASH: styleRule(); @@ -4003,7 +4237,7 @@ LexicalUnit exp; fontFace(); break; default: - jj_la1[147] = jj_gen; + jj_la1[162] = jj_gen; ret = skipStatement(); if ((ret == null) || (ret.length() == 0)) { {if (true) return;} @@ -4018,15 +4252,15 @@ LexicalUnit exp; } final public void _parseImportRule() throws ParseException { - label_97: + label_108: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[148] = jj_gen; - break label_97; + jj_la1[163] = jj_gen; + break label_108; } jj_consume_token(S); } @@ -4034,15 +4268,15 @@ LexicalUnit exp; } final public void _parseMediaRule() throws ParseException { - label_98: + label_109: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[149] = jj_gen; - break label_98; + jj_la1[164] = jj_gen; + break label_109; } jj_consume_token(S); } @@ -4050,15 +4284,15 @@ LexicalUnit exp; } final public void _parseDeclarationBlock() throws ParseException { - label_99: + label_110: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[150] = jj_gen; - break label_99; + jj_la1[165] = jj_gen; + break label_110; } jj_consume_token(S); } @@ -4067,29 +4301,29 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[151] = jj_gen; + jj_la1[166] = jj_gen; ; } - label_100: + label_111: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[152] = jj_gen; - break label_100; + jj_la1[167] = jj_gen; + break label_111; } jj_consume_token(SEMICOLON); - label_101: + label_112: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[153] = jj_gen; - break label_101; + jj_la1[168] = jj_gen; + break label_112; } jj_consume_token(S); } @@ -4098,7 +4332,7 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[154] = jj_gen; + jj_la1[169] = jj_gen; ; } } @@ -4107,15 +4341,15 @@ LexicalUnit exp; final public SelectorList _parseSelectors() throws ParseException { SelectorList p = null; try { - label_102: + label_113: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[155] = jj_gen; - break label_102; + jj_la1[170] = jj_gen; + break label_113; } jj_consume_token(S); } @@ -4155,91 +4389,98 @@ LexicalUnit exp; finally { jj_save(3, xla); } } - private boolean jj_3R_129() { - if (jj_scan_token(DIV)) return true; + private boolean jj_2_5(int xla) { + jj_la = xla; jj_lastpos = jj_scanpos = token; + try { return !jj_3_5(); } + catch(LookaheadSuccess ls) { return true; } + finally { jj_save(4, xla); } + } + + private boolean jj_3R_180() { + if (jj_scan_token(UNICODERANGE)) return true; + return false; + } + + private boolean jj_3R_185() { + if (jj_3R_133()) return true; + return false; + } + + private boolean jj_3R_177() { + 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_185()) jj_scanpos = xsp; + if (jj_scan_token(RPARAN)) return true; return false; } - private boolean jj_3R_119() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_129()) { - jj_scanpos = xsp; - if (jj_3R_130()) return true; - } + private boolean jj_3R_132() { + if (jj_3R_144()) return true; return false; } - private boolean jj_3R_168() { - if (jj_scan_token(UNICODERANGE)) return true; + private boolean jj_3R_129() { + if (jj_3R_139()) return true; return false; } - private boolean jj_3R_171() { - if (jj_3R_122()) return true; + private boolean jj_3R_174() { + if (jj_3R_180()) return true; return false; } - private boolean jj_3R_118() { - if (jj_3R_128()) return true; + private boolean jj_3R_128() { + if (jj_3R_138()) return true; return false; } - private boolean jj_3R_117() { - if (jj_3R_127()) return true; + private boolean jj_3R_173() { + if (jj_3R_179()) return true; return false; } - private boolean jj_3R_116() { - if (jj_3R_126()) return true; + private boolean jj_3R_172() { + if (jj_3R_178()) return true; return false; } - private boolean jj_3R_165() { - 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_171()) jj_scanpos = xsp; - if (jj_scan_token(RPARAN)) return true; + private boolean jj_3R_127() { + if (jj_3R_137()) return true; return false; } - private boolean jj_3R_115() { - if (jj_3R_125()) return true; + private boolean jj_3R_126() { + if (jj_3R_136()) return true; return false; } - private boolean jj_3R_114() { - if (jj_3R_124()) return true; + private boolean jj_3R_125() { + if (jj_3R_135()) return true; return false; } - private boolean jj_3R_125() { + private boolean jj_3R_136() { if (jj_scan_token(HASH)) return true; return false; } - private boolean jj_3R_105() { + private boolean jj_3R_116() { Token xsp; xsp = jj_scanpos; - if (jj_3R_114()) { + if (jj_3R_125()) { jj_scanpos = xsp; - if (jj_3R_115()) { + if (jj_3R_126()) { jj_scanpos = xsp; - if (jj_3R_116()) { + if (jj_3R_127()) { jj_scanpos = xsp; - if (jj_3R_117()) { + if (jj_3R_128()) { jj_scanpos = xsp; - if (jj_3R_118()) return true; + if (jj_3R_129()) return true; } } } @@ -4247,69 +4488,43 @@ LexicalUnit exp; return false; } - private boolean jj_3R_121() { - if (jj_3R_133()) return true; - return false; - } - - private boolean jj_3R_163() { - if (jj_3R_168()) return true; - return false; - } - - private boolean jj_3R_162() { - if (jj_3R_167()) return true; - return false; - } - - private boolean jj_3R_161() { - if (jj_3R_166()) return true; - return false; - } - private boolean jj_3_1() { - if (jj_3R_103()) return true; + if (jj_3R_114()) return true; return false; } - private boolean jj_3_2() { - if (jj_3R_104()) return true; - if (jj_3R_105()) return true; - return false; - } - - private boolean jj_3R_160() { + private boolean jj_3R_171() { if (jj_scan_token(IDENT)) return true; return false; } - private boolean jj_3R_127() { - if (jj_scan_token(COLON)) return true; + private boolean jj_3_4() { + if (jj_3R_114()) return true; return false; } - private boolean jj_3R_159() { + private boolean jj_3R_170() { if (jj_scan_token(STRING)) return true; return false; } - private boolean jj_3R_158() { - if (jj_3R_165()) return true; + private boolean jj_3R_169() { + if (jj_3R_177()) return true; return false; } - private boolean jj_3R_132() { + private boolean jj_3R_143() { Token xsp; xsp = jj_scanpos; - if (jj_3R_159()) { + if (jj_3R_170()) { jj_scanpos = xsp; - if (jj_3R_160()) { + if (jj_3R_171()) { jj_scanpos = xsp; - if (jj_3R_161()) { + if (jj_3R_172()) { jj_scanpos = xsp; - if (jj_3R_162()) { + if (jj_3R_173()) { jj_scanpos = xsp; - if (jj_3R_163()) return true; + if (jj_3R_174()) return true; } } } @@ -4317,103 +4532,114 @@ LexicalUnit exp; return false; } - private boolean jj_3_3() { - if (jj_3R_103()) return true; + private boolean jj_3_2() { + if (jj_3R_115()) return true; + if (jj_3R_116()) return true; return false; } - private boolean jj_3R_157() { + private boolean jj_3R_138() { + if (jj_scan_token(COLON)) return true; + return false; + } + + private boolean jj_3R_168() { if (jj_scan_token(DIMEN)) return true; return false; } - private boolean jj_3R_156() { + private boolean jj_3R_167() { if (jj_scan_token(KHZ)) return true; return false; } - private boolean jj_3R_155() { + private boolean jj_3R_166() { if (jj_scan_token(HZ)) return true; return false; } - private boolean jj_3R_154() { + private boolean jj_3R_165() { if (jj_scan_token(MS)) return true; return false; } - private boolean jj_3R_153() { + private boolean jj_3R_164() { if (jj_scan_token(SECOND)) return true; return false; } - private boolean jj_3R_152() { + private boolean jj_3_3() { + if (jj_3R_114()) return true; + return false; + } + + private boolean jj_3R_163() { if (jj_scan_token(GRAD)) return true; return false; } - private boolean jj_3R_151() { + private boolean jj_3R_162() { if (jj_scan_token(RAD)) return true; return false; } - private boolean jj_3R_110() { + private boolean jj_3R_121() { if (jj_scan_token(LBRACE)) return true; return false; } - private boolean jj_3R_150() { + private boolean jj_3R_161() { if (jj_scan_token(DEG)) return true; return false; } - private boolean jj_3R_149() { + private boolean jj_3R_160() { if (jj_scan_token(EXS)) return true; return false; } - private boolean jj_3R_148() { + private boolean jj_3R_159() { if (jj_scan_token(EMS)) return true; return false; } - private boolean jj_3R_147() { + private boolean jj_3R_158() { if (jj_scan_token(PX)) return true; return false; } - private boolean jj_3R_146() { + private boolean jj_3R_157() { if (jj_scan_token(IN)) return true; return false; } - private boolean jj_3R_109() { - if (jj_3R_122()) return true; + private boolean jj_3R_120() { + if (jj_3R_133()) return true; return false; } - private boolean jj_3R_128() { - if (jj_scan_token(LBRACKET)) return true; + private boolean jj_3R_156() { + if (jj_scan_token(PC)) return true; return false; } - private boolean jj_3R_145() { - if (jj_scan_token(PC)) return true; + private boolean jj_3R_155() { + if (jj_scan_token(MM)) return true; return false; } - private boolean jj_3R_144() { - if (jj_scan_token(MM)) return true; + private boolean jj_3R_182() { + if (jj_scan_token(EACH_VAR)) return true; return false; } - private boolean jj_3R_143() { + private boolean jj_3R_154() { if (jj_scan_token(CM)) return true; return false; } - private boolean jj_3R_103() { - if (jj_3R_108()) return true; + private boolean jj_3R_114() { + if (jj_3R_119()) return true; if (jj_scan_token(COLON)) return true; Token xsp; while (true) { @@ -4421,95 +4647,80 @@ LexicalUnit exp; if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_109()) { + if (jj_3R_120()) { jj_scanpos = xsp; - if (jj_3R_110()) return true; + if (jj_3R_121()) return true; } return false; } - private boolean jj_3R_138() { - if (jj_scan_token(PARENT)) return true; - return false; - } - - private boolean jj_3R_142() { + private boolean jj_3R_153() { if (jj_scan_token(PT)) return true; return false; } - private boolean jj_3R_137() { - if (jj_scan_token(ANY)) return true; - return false; - } - - private boolean jj_3R_141() { + private boolean jj_3R_152() { if (jj_scan_token(PERCENTAGE)) return true; return false; } - private boolean jj_3R_133() { - if (jj_scan_token(VARIABLE)) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(1)) { jj_scanpos = xsp; break; } - } + private boolean jj_3R_150() { + if (jj_3R_176()) return true; return false; } private boolean jj_3R_139() { - if (jj_3R_164()) return true; + if (jj_scan_token(LBRACKET)) return true; return false; } - private boolean jj_3R_140() { + private boolean jj_3R_151() { if (jj_scan_token(NUMBER)) return true; return false; } - private boolean jj_3R_131() { + private boolean jj_3R_142() { Token xsp; xsp = jj_scanpos; - if (jj_3R_139()) jj_scanpos = xsp; + if (jj_3R_150()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_140()) { + if (jj_3R_151()) { jj_scanpos = xsp; - if (jj_3R_141()) { + if (jj_3R_152()) { jj_scanpos = xsp; - if (jj_3R_142()) { + if (jj_3R_153()) { jj_scanpos = xsp; - if (jj_3R_143()) { + if (jj_3R_154()) { jj_scanpos = xsp; - if (jj_3R_144()) { + if (jj_3R_155()) { jj_scanpos = xsp; - if (jj_3R_145()) { + if (jj_3R_156()) { jj_scanpos = xsp; - if (jj_3R_146()) { + if (jj_3R_157()) { jj_scanpos = xsp; - if (jj_3R_147()) { + if (jj_3R_158()) { jj_scanpos = xsp; - if (jj_3R_148()) { + if (jj_3R_159()) { jj_scanpos = xsp; - if (jj_3R_149()) { + if (jj_3R_160()) { jj_scanpos = xsp; - if (jj_3R_150()) { + if (jj_3R_161()) { jj_scanpos = xsp; - if (jj_3R_151()) { + if (jj_3R_162()) { jj_scanpos = xsp; - if (jj_3R_152()) { + if (jj_3R_163()) { jj_scanpos = xsp; - if (jj_3R_153()) { + if (jj_3R_164()) { jj_scanpos = xsp; - if (jj_3R_154()) { + if (jj_3R_165()) { jj_scanpos = xsp; - if (jj_3R_155()) { + if (jj_3R_166()) { jj_scanpos = xsp; - if (jj_3R_156()) { + if (jj_3R_167()) { jj_scanpos = xsp; - if (jj_3R_157()) { + if (jj_3R_168()) { jj_scanpos = xsp; - if (jj_3R_158()) return true; + if (jj_3R_169()) return true; } } } @@ -4531,25 +4742,51 @@ LexicalUnit exp; return false; } - private boolean jj_3R_124() { + private boolean jj_3R_131() { Token xsp; xsp = jj_scanpos; - if (jj_3R_136()) { - jj_scanpos = xsp; - if (jj_3R_137()) { + if (jj_3R_142()) { jj_scanpos = xsp; - if (jj_3R_138()) return true; + if (jj_3R_143()) return true; } + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_136() { - if (jj_scan_token(IDENT)) return true; + private boolean jj_3R_118() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_131()) { + jj_scanpos = xsp; + if (jj_3R_132()) return true; + } return false; } - private boolean jj_3R_108() { + private boolean jj_3R_149() { + if (jj_scan_token(PARENT)) return true; + return false; + } + + private boolean jj_3R_148() { + if (jj_scan_token(ANY)) return true; + return false; + } + + private boolean jj_3R_117() { + if (jj_3R_130()) return true; + return false; + } + + private boolean jj_3R_178() { + if (jj_scan_token(HASH)) return true; + return false; + } + + private boolean jj_3R_119() { if (jj_scan_token(IDENT)) return true; Token xsp; while (true) { @@ -4559,61 +4796,113 @@ LexicalUnit exp; return false; } - private boolean jj_3R_120() { + private boolean jj_3R_144() { + 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_181() { + if (jj_scan_token(IDENT)) return true; + return false; + } + + private boolean jj_3R_175() { Token xsp; xsp = jj_scanpos; - if (jj_3R_131()) { + if (jj_3R_181()) { jj_scanpos = xsp; - if (jj_3R_132()) return true; + if (jj_3R_182()) return true; + } + return false; + } + + private boolean jj_3R_184() { + if (jj_scan_token(PLUS)) return true; + return false; + } + + private boolean jj_3R_135() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_147()) { + jj_scanpos = xsp; + if (jj_3R_148()) { + jj_scanpos = xsp; + if (jj_3R_149()) return true; } + } + return false; + } + + private boolean jj_3R_147() { + Token xsp; + if (jj_3R_175()) return true; while (true) { xsp = jj_scanpos; - if (jj_scan_token(1)) { jj_scanpos = xsp; break; } + if (jj_3R_175()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_135() { - if (jj_scan_token(PRECEDES)) return true; + private boolean jj_3R_183() { + if (jj_scan_token(MINUS)) return true; return false; } - private boolean jj_3R_107() { + private boolean jj_3R_176() { Token xsp; xsp = jj_scanpos; - if (jj_3R_120()) { + if (jj_3R_183()) { jj_scanpos = xsp; - if (jj_3R_121()) return true; + if (jj_3R_184()) return true; } return false; } - private boolean jj_3R_134() { + private boolean jj_3R_146() { + if (jj_scan_token(PRECEDES)) return true; + return false; + } + + private boolean jj_3R_145() { if (jj_scan_token(PLUS)) return true; return false; } - private boolean jj_3R_123() { + private boolean jj_3_5() { Token xsp; xsp = jj_scanpos; - if (jj_3R_134()) { + if (jj_3R_117()) jj_scanpos = xsp; + if (jj_3R_118()) return true; + return false; + } + + private boolean jj_3R_134() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_145()) { jj_scanpos = xsp; - if (jj_3R_135()) return true; + if (jj_3R_146()) return true; } return false; } - private boolean jj_3R_106() { - if (jj_3R_119()) return true; + private boolean jj_3R_179() { + if (jj_scan_token(URL)) return true; return false; } - private boolean jj_3R_166() { - if (jj_scan_token(HASH)) return true; + private boolean jj_3R_133() { + if (jj_3R_118()) return true; return false; } - private boolean jj_3R_112() { + private boolean jj_3R_123() { if (jj_scan_token(PRECEDES)) return true; Token xsp; while (true) { @@ -4623,20 +4912,20 @@ LexicalUnit exp; return false; } - private boolean jj_3R_104() { + private boolean jj_3R_115() { Token xsp; xsp = jj_scanpos; - if (jj_3R_111()) { + if (jj_3R_122()) { jj_scanpos = xsp; - if (jj_3R_112()) { + if (jj_3R_123()) { jj_scanpos = xsp; - if (jj_3R_113()) return true; + if (jj_3R_124()) return true; } } return false; } - private boolean jj_3R_111() { + private boolean jj_3R_122() { if (jj_scan_token(PLUS)) return true; Token xsp; while (true) { @@ -4646,63 +4935,45 @@ LexicalUnit exp; return false; } - private boolean jj_3R_113() { + private boolean jj_3R_124() { if (jj_scan_token(S)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_123()) jj_scanpos = xsp; + if (jj_3R_134()) jj_scanpos = xsp; return false; } - private boolean jj_3R_170() { - if (jj_scan_token(PLUS)) return true; + private boolean jj_3R_137() { + if (jj_scan_token(DOT)) return true; return false; } - private boolean jj_3R_164() { + private boolean jj_3R_141() { + if (jj_scan_token(COMMA)) return true; Token xsp; - xsp = jj_scanpos; - if (jj_3R_169()) { - jj_scanpos = xsp; - if (jj_3R_170()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_169() { - if (jj_scan_token(MINUS)) return true; - return false; - } - - private boolean jj_3R_126() { - if (jj_scan_token(DOT)) return true; - return false; - } - - private boolean jj_3_4() { + private boolean jj_3R_140() { + if (jj_scan_token(DIV)) return true; Token xsp; - xsp = jj_scanpos; - if (jj_3R_106()) jj_scanpos = xsp; - if (jj_3R_107()) return true; - return false; - } - - private boolean jj_3R_167() { - if (jj_scan_token(URL)) return true; - return false; - } - - private boolean jj_3R_122() { - if (jj_3R_107()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(1)) { jj_scanpos = xsp; break; } + } return false; } private boolean jj_3R_130() { - if (jj_scan_token(COMMA)) return true; Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(1)) { jj_scanpos = xsp; break; } + xsp = jj_scanpos; + if (jj_3R_140()) { + jj_scanpos = xsp; + if (jj_3R_141()) return true; } return false; } @@ -4717,7 +4988,7 @@ LexicalUnit exp; private Token jj_scanpos, jj_lastpos; private int jj_la; private int jj_gen; - final private int[] jj_la1 = new int[156]; + final private int[] jj_la1 = new int[171]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -4729,18 +5000,18 @@ LexicalUnit exp; jj_la1_init_3(); } private static void jj_la1_init_0() { - jj_la1_0 = new int[] {0x0,0x6002,0x6002,0x0,0x6000,0x2,0x2,0x2,0x74000000,0x6000,0x2,0x6000,0x2,0x0,0x2,0x0,0x2,0x2,0x2,0x75f6a000,0x75f6a000,0x2,0x400000,0x2,0x2,0x2,0x2,0x0,0x0,0x2,0x0,0x800000,0x2,0x0,0x2,0x2,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,0x1f6a000,0x2,0x2,0x1100000,0x2,0x1100000,0x1100002,0x2,0x2,0x2,0x2,0x74000000,0x0,0x74000000,0x2,0x400000,0x2,0x2,0x44000000,0x44000000,0x44000000,0x44000000,0x44000000,0x44000000,0x44000000,0x44000000,0x44000000,0x44000000,0x74000000,0x30000000,0x2,0x2,0xe0000,0x2,0x0,0x2,0xe0000,0x0,0x2,0x2,0x0,0x2,0x0,0x2,0x800000,0x2,0x2,0x0,0x2,0x74000000,0x0,0x74000000,0x2,0x400000,0x2,0x2,0x0,0x400000,0x2,0x2,0x0,0x2,0x800000,0x2,0x0,0x2,0x2,0x2,0x2,0x800000,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,0x2,0x0,0x2,0x0,0x800000,0x2,0x0,0x2,0x308000,0x2,0x0,0x2,0x2,0x2,0x2,0x2400000,0x2400000,0x300000,0x300000,0x0,0x0,0x300000,0x2,0x300000,0x2,0x300000,0x2,0x74000000,0x2,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,}; + jj_la1_0 = new int[] {0x0,0xc02,0xc02,0x0,0xc00,0x2,0x2,0x2,0xce800000,0xc00,0x2,0xc00,0x2,0x0,0x2,0x0,0x2,0x2,0x2,0xcebed400,0xcebed400,0x2,0x80000,0x2,0x2,0x2,0x2,0x0,0x40000000,0x2,0x0,0x100000,0x2,0x0,0x2,0x2,0x2,0x2,0x0,0x100000,0x2,0x0,0x2,0x3ed400,0x2,0x2,0x220000,0x2,0x220000,0x220002,0x2,0x2,0x2,0x2,0xce800000,0x0,0xce800000,0x2,0x80000,0x2,0x2,0x48800000,0x48800000,0x48800000,0x48800000,0x48800000,0x48800000,0x48800000,0x48800000,0x48800000,0x48800000,0xce800000,0x80000000,0x80000000,0x80000000,0x80000000,0x86000000,0x2,0x2,0x1c000,0x2,0x0,0x2,0x1c000,0x40000000,0x2,0x2,0x0,0x2,0x0,0x2,0x100000,0x2,0x2,0x2,0x2,0xce800000,0x0,0xce800000,0x2,0x2,0x80000,0x2,0x2,0x2,0x2,0x0,0x2,0xce800000,0x0,0xce800000,0x2,0x80000,0x2,0x2,0x40000000,0x80000,0x2,0x2,0x0,0x2,0x100000,0x2,0x0,0x2,0x2,0x2,0x100000,0x2,0x2,0x0,0x100000,0x2,0x0,0x2,0x2,0x0,0x2,0x0,0x100000,0x2,0x0,0x2,0x61000,0x2,0x0,0x2,0x2,0x2,0x2,0x480000,0x480000,0x60000,0x60000,0x0,0x0,0x60000,0x2,0x60000,0x2,0x60000,0x2,0xce800000,0x2,0x2,0x2,0x0,0x100000,0x2,0x0,0x2,}; } private static void jj_la1_init_1() { - jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000c002,0x0,0x0,0x0,0x0,0x20000000,0x0,0x40000000,0x0,0x0,0x0,0xe0000006,0xe0000006,0x0,0x0,0x0,0x0,0x0,0x0,0x40000000,0x2,0x0,0x40000000,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x40000000,0x0,0x0,0x40000000,0x0,0xa0000004,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x42008002,0x2008000,0x40000002,0x0,0x0,0x0,0x0,0x2,0x2,0x2,0x2,0x2,0x2,0x2,0x2,0x2,0x2,0x40000002,0x40000000,0x0,0x0,0x0,0x0,0x60000000,0x0,0x0,0x2,0x0,0x0,0x40000000,0x0,0x10000000,0x0,0x0,0x0,0x0,0x40000000,0x0,0x42008002,0x2008000,0x40000002,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x1800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x40000000,0x0,0x0,0x40000000,0x0,0xe0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x60000000,0xe0000000,0x0,0xe0000000,0x0,0xe0000000,0x0,0x40000002,0x0,0x0,0x0,0x40000000,0x0,0x0,0x40000000,0x0,}; + jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10083000,0x0,0x0,0x0,0x0,0x88000000,0x0,0x10000000,0x0,0x0,0x0,0xb8000001,0xb8000001,0x0,0x0,0x0,0x0,0x0,0x0,0x10000000,0x0,0x0,0x10000000,0x0,0x0,0x10000000,0x0,0x0,0x0,0x0,0x10000000,0x0,0x0,0x10000000,0x0,0xa8000001,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10882000,0x882000,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x0,0x0,0x0,0x0,0x18000000,0x0,0x0,0x0,0x0,0x0,0x10000000,0x0,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x10802000,0x802000,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000000,0x0,0x10802000,0x802000,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000000,0x0,0x0,0x0,0x600,0x0,0x0,0x0,0x0,0x0,0x0,0x10000000,0x0,0x0,0x10000000,0x0,0x0,0x0,0x0,0x10000000,0x0,0x0,0x10000000,0x0,0xb8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x98000000,0xb8000000,0x0,0xb8000000,0x0,0xb8000000,0x0,0x10000000,0x0,0x0,0x0,0x10000000,0x0,0x0,0x10000000,0x0,}; } private static void jj_la1_init_2() { - jj_la1_2 = new int[] {0x800000,0x4000000,0x4000000,0x200000,0x4000000,0x0,0x0,0x0,0x3500004,0x4000000,0x0,0x4000000,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0xff0000a,0xff0000a,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfe0000a,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x500004,0x400004,0x100000,0x0,0x0,0x0,0x0,0x100000,0x100000,0x0,0x0,0x100000,0x100000,0x100000,0x100000,0x100000,0x100000,0x100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x500004,0x400004,0x100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x1ffffe,0x0,0x8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffff8,0x100002,0x1ffffa,0x0,0x1ffffe,0x0,0x1ffffe,0x0,0x3700000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_2 = new int[] {0x200000,0x1000000,0x1000000,0x80000,0x1000000,0x0,0x0,0x0,0xd40001,0x1000000,0x0,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fc0002,0x3fc0002,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3f80002,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x140001,0x100001,0x40000,0x0,0x0,0x0,0x0,0x40000,0x40000,0x0,0x0,0x40000,0x40000,0x40000,0x40000,0x40000,0x40000,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x140001,0x100001,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x140001,0x100001,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x7ffff,0x0,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fffe,0x40000,0x7fffe,0x0,0x7ffff,0x0,0x7ffff,0x0,0xdc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; } private static void jj_la1_init_3() { - jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe0,0xe0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x60,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x20,0x60,0x0,0x60,0x0,0x60,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x38,0x38,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x38,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x8,0x18,0x0,0x18,0x0,0x18,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; } - final private JJCalls[] jj_2_rtns = new JJCalls[4]; + final private JJCalls[] jj_2_rtns = new JJCalls[5]; private boolean jj_rescan = false; private int jj_gc = 0; @@ -4750,7 +5021,7 @@ LexicalUnit exp; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 156; i++) jj_la1[i] = -1; + for (int i = 0; i < 171; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -4760,7 +5031,7 @@ LexicalUnit exp; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 156; i++) jj_la1[i] = -1; + for (int i = 0; i < 171; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -4770,7 +5041,7 @@ LexicalUnit exp; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 156; i++) jj_la1[i] = -1; + for (int i = 0; i < 171; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -4780,7 +5051,7 @@ LexicalUnit exp; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 156; i++) jj_la1[i] = -1; + for (int i = 0; i < 171; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -4892,12 +5163,12 @@ LexicalUnit exp; /** Generate ParseException. */ public ParseException generateParseException() { jj_expentries.clear(); - boolean[] la1tokens = new boolean[104]; + boolean[] la1tokens = new boolean[102]; if (jj_kind >= 0) { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 156; i++) { + for (int i = 0; i < 171; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1<<j)) != 0) { @@ -4915,7 +5186,7 @@ LexicalUnit exp; } } } - for (int i = 0; i < 104; i++) { + for (int i = 0; i < 102; i++) { if (la1tokens[i]) { jj_expentry = new int[1]; jj_expentry[0] = i; @@ -4942,7 +5213,7 @@ LexicalUnit exp; private void jj_rescan_token() { jj_rescan = true; - for (int i = 0; i < 4; i++) { + for (int i = 0; i < 5; i++) { try { JJCalls p = jj_2_rtns[i]; do { @@ -4953,6 +5224,7 @@ LexicalUnit exp; case 1: jj_3_2(); break; case 2: jj_3_3(); break; case 3: jj_3_4(); break; + case 4: jj_3_5(); break; } } p = p.next; diff --git a/sass/src/com/vaadin/sass/parser/Parser.jj b/sass/src/com/vaadin/sass/parser/Parser.jj index c34dedc596..86c8a9150d 100644 --- a/sass/src/com/vaadin/sass/parser/Parser.jj +++ b/sass/src/com/vaadin/sass/parser/Parser.jj @@ -445,25 +445,7 @@ TOKEN : < S : ( [ " ", "\t" , "\n" , "\r", "\f" ] )+ > { image = Parser.SPACE; } } - -<DEFAULT> -MORE: -{ - "#{" : IN_INTERPOLATION -} - -<IN_INTERPOLATION> -MORE: -{ - < ~["}"]> : IN_INTERPOLATION -} - -<IN_INTERPOLATION> -SPECIAL_TOKEN: -{ - <INTERPOLATION: "}"> : DEFAULT -} - + <DEFAULT> MORE : { @@ -481,7 +463,6 @@ SKIP : { < "\n"|"\r"|"\r\n" > : DEFAULT } - <DEFAULT> MORE : @@ -539,6 +520,12 @@ TOKEN : < COLON : ":" > } +< DEFAULT > +TOKEN : +{ + < EACH_VAR : "#{"< VARIABLE > "}"> +} + <DEFAULT> TOKEN : /* basic tokens */ { @@ -733,7 +720,7 @@ void afterImportDeclaration() : } { ( - ( variable() | mixinDirective() | includeDirective() | styleRule() | media()| page() | fontFace() + ( variable() | mixinDirective()|eachDirective() | includeDirective() | styleRule() | media()| page() | fontFace() | { l = getLocator(); } ret=skipStatement() { if ((ret == null) || (ret.length() == 0)) { @@ -987,9 +974,10 @@ char connector = ' '; * @exception ParseException exception during the parse */ String property() : -{Token n; } +{Token n; +} { - n=<IDENT> ( <S> )* { return convertIdent(n.image); } + n=<IDENT> ( <S> )* { return convertIdent(n.image); } } String variableName() : @@ -1020,7 +1008,7 @@ void styleRule() : start = true; documentHandler.startSelector(l); } - ( includeDirective() | media() | extendDirective()| variable() | LOOKAHEAD(3) declarationOrNestedProperties() | styleRule())* + ( includeDirective() | media() | extendDirective()| eachDirective() | variable() | LOOKAHEAD(3) declarationOrNestedProperties() | styleRule())* <RBRACE> (<S>)* } catch (ThrowedParseException e) { if (errorHandler != null) { @@ -1160,13 +1148,14 @@ Selector simple_selector(Selector selector, char comb) : * @exception ParseException exception during the parse */ Condition _class(Condition pred) : -{Token n; +{Token t; +String s = ""; Condition c; } { - "." n=<IDENT> + "." (t = <IDENT>{s += t.image; }|t = < EACH_VAR >{ s += t.image; })+ { - c = conditionFactory.createClassCondition(null, n.image); + c = conditionFactory.createClassCondition(null, s); if (pred == null) { return c; } else { @@ -1179,11 +1168,11 @@ Condition c; * @exception ParseException exception during the parse */ SimpleSelector element_name() : -{Token n; } +{Token t; String s = "";} { - n=<IDENT> + (t = <IDENT>{s += t.image; }|t = < EACH_VAR >{ s += t.image; })+ { - return selectorFactory.createElementSelector(null, convertIdent(n.image)); + return selectorFactory.createElementSelector(null, s); } | "*" { return selectorFactory.createElementSelector(null, "*"); } @@ -1354,6 +1343,37 @@ void variable() : } } +void eachDirective() : +{ + Token var; + ArrayList<String> list; +} +{ + < EACH_SYM > + (< S >)* + var = < VARIABLE > (< S >)* < EACH_IN > (< S >)* + list = stringList() + < LBRACE >(< S >)* + { documentHandler.startEachDirective(var.image, list);} + ( includeDirective() | media() | extendDirective()| variable() | LOOKAHEAD(3) declarationOrNestedProperties() | styleRule())* + < RBRACE >(< S >)* + { documentHandler.endEachDirective();} +} + +ArrayList<String > stringList(): +{ + ArrayList<String > strings = new ArrayList<String >(); + Token input; +} +{ + (input = < IDENT > (< S >)*) + { strings.add(input.image); } + + (< COMMA >(< S >)* input = < IDENT > { strings.add(input.image); } (< S >)*)* + { return strings; } + +} + void mixinDirective() : { String name; @@ -1367,7 +1387,7 @@ void mixinDirective() : |(name = functionName() args = arglist()) <RPARAN> (<S>)*) <LBRACE> (<S>)* {documentHandler.startMixinDirective(name, args);} - ( includeDirective() | media() | extendDirective()| variable() | LOOKAHEAD(3) declarationOrNestedProperties() | styleRule())* + ( includeDirective() | media()| extendDirective()| variable() | LOOKAHEAD(3) declarationOrNestedProperties() | styleRule())* //(includeDirective() | media() | LOOKAHEAD(declaration()) declaration()";"(<S>)* | styleRule())* <RBRACE>(<S>)* {documentHandler.endMixinDirective(name, args);} @@ -1482,22 +1502,6 @@ Node forDirective() : {return documentHandler.forDirective(var, from, to, exclusive, body);} } -Node eachDirective() : -{ - String var; - String list; - String body; -} -{ - var = variableName() - <EACH_IN> (<S>)* - list = skipStatementUntilLeftBrace() - body = skipStatement() - { - return documentHandler.eachDirective(var, list, body); - } -} - Node whileDirective() : { String condition; @@ -2204,6 +2208,7 @@ String skipStatementUntil(int[] symbols){ return s.toString().trim(); } + JAVACODE String skipStatement() { StringBuffer s = new StringBuffer(); diff --git a/sass/src/com/vaadin/sass/parser/ParserConstants.java b/sass/src/com/vaadin/sass/parser/ParserConstants.java index 47ea52435d..41fb8ca030 100644 --- a/sass/src/com/vaadin/sass/parser/ParserConstants.java +++ b/sass/src/com/vaadin/sass/parser/ParserConstants.java @@ -13,220 +13,215 @@ public interface ParserConstants { /** RegularExpression Id. */ int S = 1; /** RegularExpression Id. */ - int INTERPOLATION = 4; + int FORMAL_COMMENT = 7; /** RegularExpression Id. */ - int FORMAL_COMMENT = 10; + int MULTI_LINE_COMMENT = 8; /** RegularExpression Id. */ - int MULTI_LINE_COMMENT = 11; + int CDO = 10; /** RegularExpression Id. */ - int CDO = 13; + int CDC = 11; /** RegularExpression Id. */ - int CDC = 14; + int LBRACE = 12; /** RegularExpression Id. */ - int LBRACE = 15; + int RBRACE = 13; /** RegularExpression Id. */ - int RBRACE = 16; + int DASHMATCH = 14; /** RegularExpression Id. */ - int DASHMATCH = 17; + int INCLUDES = 15; /** RegularExpression Id. */ - int INCLUDES = 18; + int EQ = 16; /** RegularExpression Id. */ - int EQ = 19; + int PLUS = 17; /** RegularExpression Id. */ - int PLUS = 20; + int MINUS = 18; /** RegularExpression Id. */ - int MINUS = 21; + int COMMA = 19; /** RegularExpression Id. */ - int COMMA = 22; + int SEMICOLON = 20; /** RegularExpression Id. */ - int SEMICOLON = 23; + int PRECEDES = 21; /** RegularExpression Id. */ - int PRECEDES = 24; + int DIV = 22; /** RegularExpression Id. */ - int DIV = 25; + int LBRACKET = 23; /** RegularExpression Id. */ - int LBRACKET = 26; + int RBRACKET = 24; /** RegularExpression Id. */ - int RBRACKET = 27; + int ANY = 25; /** RegularExpression Id. */ - int ANY = 28; + int PARENT = 26; /** RegularExpression Id. */ - int PARENT = 29; + int DOT = 27; /** RegularExpression Id. */ - int DOT = 30; + int LPARAN = 28; /** RegularExpression Id. */ - int LPARAN = 31; + int RPARAN = 29; /** RegularExpression Id. */ - int RPARAN = 32; + int COLON = 30; /** RegularExpression Id. */ - int COLON = 33; + int EACH_VAR = 31; /** RegularExpression Id. */ - int NONASCII = 34; + int NONASCII = 32; /** RegularExpression Id. */ - int H = 35; + int H = 33; /** RegularExpression Id. */ - int UNICODE = 36; + int UNICODE = 34; /** RegularExpression Id. */ - int ESCAPE = 37; + int ESCAPE = 35; /** RegularExpression Id. */ - int NMSTART = 38; + int NMSTART = 36; /** RegularExpression Id. */ - int NMCHAR = 39; + int NMCHAR = 37; /** RegularExpression Id. */ - int STRINGCHAR = 40; + int STRINGCHAR = 38; /** RegularExpression Id. */ - int D = 41; + int D = 39; /** RegularExpression Id. */ - int NAME = 42; + int NAME = 40; /** RegularExpression Id. */ - int TO = 43; + int TO = 41; /** RegularExpression Id. */ - int THROUGH = 44; + int THROUGH = 42; /** RegularExpression Id. */ - int EACH_IN = 45; + int EACH_IN = 43; /** RegularExpression Id. */ - int MIXIN_SYM = 46; + int MIXIN_SYM = 44; /** RegularExpression Id. */ - int INCLUDE_SYM = 47; + int INCLUDE_SYM = 45; /** RegularExpression Id. */ - int FUNCTION_SYM = 48; + int FUNCTION_SYM = 46; /** RegularExpression Id. */ - int RETURN_SYM = 49; + int RETURN_SYM = 47; /** RegularExpression Id. */ - int DEBUG_SYM = 50; + int DEBUG_SYM = 48; /** RegularExpression Id. */ - int WARN_SYM = 51; + int WARN_SYM = 49; /** RegularExpression Id. */ - int FOR_SYM = 52; + int FOR_SYM = 50; /** RegularExpression Id. */ - int EACH_SYM = 53; + int EACH_SYM = 51; /** RegularExpression Id. */ - int WHILE_SYM = 54; + int WHILE_SYM = 52; /** RegularExpression Id. */ - int IF_SYM = 55; + int IF_SYM = 53; /** RegularExpression Id. */ - int ELSE_SYM = 56; + int ELSE_SYM = 54; /** RegularExpression Id. */ - int EXTEND_SYM = 57; + int EXTEND_SYM = 55; /** RegularExpression Id. */ - int MOZ_DOCUMENT_SYM = 58; + int MOZ_DOCUMENT_SYM = 56; /** RegularExpression Id. */ - int SUPPORTS_SYM = 59; + int SUPPORTS_SYM = 57; /** RegularExpression Id. */ - int GUARDED_SYM = 60; + int GUARDED_SYM = 58; /** RegularExpression Id. */ - int STRING = 61; + int STRING = 59; /** RegularExpression Id. */ - int IDENT = 62; + int IDENT = 60; /** RegularExpression Id. */ - int NUMBER = 63; + int NUMBER = 61; /** RegularExpression Id. */ - int _URL = 64; + int _URL = 62; /** RegularExpression Id. */ - int URL = 65; + int URL = 63; /** RegularExpression Id. */ - int VARIABLE = 66; + int VARIABLE = 64; /** RegularExpression Id. */ - int PERCENTAGE = 67; + int PERCENTAGE = 65; /** RegularExpression Id. */ - int PT = 68; + int PT = 66; /** RegularExpression Id. */ - int MM = 69; + int MM = 67; /** RegularExpression Id. */ - int CM = 70; + int CM = 68; /** RegularExpression Id. */ - int PC = 71; + int PC = 69; /** RegularExpression Id. */ - int IN = 72; + int IN = 70; /** RegularExpression Id. */ - int PX = 73; + int PX = 71; /** RegularExpression Id. */ - int EMS = 74; + int EMS = 72; /** RegularExpression Id. */ - int EXS = 75; + int EXS = 73; /** RegularExpression Id. */ - int DEG = 76; + int DEG = 74; /** RegularExpression Id. */ - int RAD = 77; + int RAD = 75; /** RegularExpression Id. */ - int GRAD = 78; + int GRAD = 76; /** RegularExpression Id. */ - int MS = 79; + int MS = 77; /** RegularExpression Id. */ - int SECOND = 80; + int SECOND = 78; /** RegularExpression Id. */ - int HZ = 81; + int HZ = 79; /** RegularExpression Id. */ - int KHZ = 82; + int KHZ = 80; /** RegularExpression Id. */ - int DIMEN = 83; + int DIMEN = 81; /** RegularExpression Id. */ - int HASH = 84; + int HASH = 82; /** RegularExpression Id. */ - int IMPORT_SYM = 85; + int IMPORT_SYM = 83; /** RegularExpression Id. */ - int MEDIA_SYM = 86; + int MEDIA_SYM = 84; /** RegularExpression Id. */ - int CHARSET_SYM = 87; + int CHARSET_SYM = 85; /** RegularExpression Id. */ - int PAGE_SYM = 88; + int PAGE_SYM = 86; /** RegularExpression Id. */ - int FONT_FACE_SYM = 89; + int FONT_FACE_SYM = 87; /** RegularExpression Id. */ - int ATKEYWORD = 90; + int ATKEYWORD = 88; /** RegularExpression Id. */ - int IMPORTANT_SYM = 91; + int IMPORTANT_SYM = 89; /** RegularExpression Id. */ - int RANGE0 = 92; + int RANGE0 = 90; /** RegularExpression Id. */ - int RANGE1 = 93; + int RANGE1 = 91; /** RegularExpression Id. */ - int RANGE2 = 94; + int RANGE2 = 92; /** RegularExpression Id. */ - int RANGE3 = 95; + int RANGE3 = 93; /** RegularExpression Id. */ - int RANGE4 = 96; + int RANGE4 = 94; /** RegularExpression Id. */ - int RANGE5 = 97; + int RANGE5 = 95; /** RegularExpression Id. */ - int RANGE6 = 98; + int RANGE6 = 96; /** RegularExpression Id. */ - int RANGE = 99; + int RANGE = 97; /** RegularExpression Id. */ - int UNI = 100; + int UNI = 98; /** RegularExpression Id. */ - int UNICODERANGE = 101; + int UNICODERANGE = 99; /** RegularExpression Id. */ - int FUNCTION = 102; + int FUNCTION = 100; /** RegularExpression Id. */ - int UNKNOWN = 103; + int UNKNOWN = 101; /** Lexical state. */ int DEFAULT = 0; /** Lexical state. */ - int IN_INTERPOLATION = 1; + int IN_SINGLE_LINE_COMMENT = 1; /** Lexical state. */ - int IN_SINGLE_LINE_COMMENT = 2; + int IN_FORMAL_COMMENT = 2; /** Lexical state. */ - int IN_FORMAL_COMMENT = 3; - /** Lexical state. */ - int IN_MULTI_LINE_COMMENT = 4; + int IN_MULTI_LINE_COMMENT = 3; /** Literal token values. */ String[] tokenImage = { "<EOF>", "<S>", - "\"#{\"", - "<token of kind 3>", - "\"}\"", "\"//\"", - "<token of kind 6>", - "<token of kind 7>", - "<token of kind 8>", + "<token of kind 3>", + "<token of kind 4>", + "<token of kind 5>", "\"/*\"", "\"*/\"", "\"*/\"", - "<token of kind 12>", + "<token of kind 9>", "\"<!--\"", "\"-->\"", "\"{\"", @@ -248,6 +243,7 @@ public interface ParserConstants { "\"(\"", "\")\"", "\":\"", + "<EACH_VAR>", "<NONASCII>", "<H>", "<UNICODE>", diff --git a/sass/src/com/vaadin/sass/parser/ParserTokenManager.java b/sass/src/com/vaadin/sass/parser/ParserTokenManager.java index b527a99748..d91727a37c 100644 --- a/sass/src/com/vaadin/sass/parser/ParserTokenManager.java +++ b/sass/src/com/vaadin/sass/parser/ParserTokenManager.java @@ -37,170 +37,168 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1) switch (pos) { case 0: - if ((active0 & 0x380000000000L) != 0L) + if ((active0 & 0x8000000L) != 0L) + return 399; + if ((active0 & 0x40800L) != 0L) + return 158; + if ((active0 & 0x3fff00000000000L) != 0L || (active1 & 0xf80000L) != 0L) + return 96; + if ((active0 & 0xe0000000000L) != 0L) { - jjmatchedKind = 62; - return 375; + jjmatchedKind = 60; + return 400; } - if ((active0 & 0x204000L) != 0L) - return 134; - if ((active0 & 0x40000000L) != 0L) - return 376; - if ((active0 & 0x2000220L) != 0L) + if ((active0 & 0x400044L) != 0L) return 3; - if ((active0 & 0xfffc00000000000L) != 0L || (active1 & 0x3e00000L) != 0L) - return 72; - if ((active0 & 0x4L) != 0L) - return 377; return -1; case 1: - if ((active0 & 0x400000000000000L) != 0L) - return 73; - if ((active0 & 0xbffc00000000000L) != 0L || (active1 & 0x3e00000L) != 0L) + if ((active0 & 0x100000000000000L) != 0L) + return 97; + if ((active0 & 0x40000000000L) != 0L) { - jjmatchedKind = 90; + jjmatchedKind = 60; jjmatchedPos = 1; - return 378; + return 400; } - if ((active0 & 0x100000000000L) != 0L) + if ((active0 & 0xa0000000000L) != 0L) + return 400; + if ((active0 & 0x40L) != 0L) + return 1; + if ((active0 & 0x2fff00000000000L) != 0L || (active1 & 0xf80000L) != 0L) { - jjmatchedKind = 62; + jjmatchedKind = 88; jjmatchedPos = 1; - return 375; + return 401; } - if ((active0 & 0x200L) != 0L) - return 1; - if ((active0 & 0x280000000000L) != 0L) - return 375; return -1; case 2: - if ((active0 & 0x80000000000000L) != 0L) - return 378; - if ((active0 & 0x100000000000L) != 0L) + if ((active0 & 0x20000000000000L) != 0L) + return 401; + if ((active0 & 0x3dff00000000000L) != 0L || (active1 & 0xf80000L) != 0L) { - jjmatchedKind = 62; + jjmatchedKind = 88; jjmatchedPos = 2; - return 375; + return 401; } - if ((active0 & 0xf7fc00000000000L) != 0L || (active1 & 0x3e00000L) != 0L) + if ((active0 & 0x40000000000L) != 0L) { - jjmatchedKind = 90; + jjmatchedKind = 60; jjmatchedPos = 2; - return 378; + return 400; } return -1; case 3: - if ((active0 & 0x10000000000000L) != 0L) - return 378; - if ((active0 & 0xf6fc00000000000L) != 0L || (active1 & 0x3e00000L) != 0L) + if ((active0 & 0x4000000000000L) != 0L) + return 401; + if ((active0 & 0x3dbf00000000000L) != 0L || (active1 & 0xf80000L) != 0L) { - jjmatchedKind = 90; + jjmatchedKind = 88; jjmatchedPos = 3; - return 378; + return 401; } - if ((active0 & 0x100000000000L) != 0L) + if ((active0 & 0x40000000000L) != 0L) { - jjmatchedKind = 62; + jjmatchedKind = 60; jjmatchedPos = 3; - return 375; + return 400; } return -1; case 4: - if ((active0 & 0xe47c00000000000L) != 0L || (active1 & 0x2e00000L) != 0L) + if ((active0 & 0x4a000000000000L) != 0L || (active1 & 0x400000L) != 0L) + return 401; + if ((active0 & 0x40000000000L) != 0L) { - jjmatchedKind = 90; + jjmatchedKind = 60; jjmatchedPos = 4; - return 378; + return 400; } - if ((active0 & 0x128000000000000L) != 0L || (active1 & 0x1000000L) != 0L) - return 378; - if ((active0 & 0x100000000000L) != 0L) + if ((active0 & 0x391f00000000000L) != 0L || (active1 & 0xb80000L) != 0L) { - jjmatchedKind = 62; + jjmatchedKind = 88; jjmatchedPos = 4; - return 375; + return 401; } return -1; case 5: - if ((active0 & 0x100000000000L) != 0L) + if ((active0 & 0x11100000000000L) != 0L || (active1 & 0x100000L) != 0L) + return 401; + if ((active0 & 0x380e00000000000L) != 0L || (active1 & 0xa80000L) != 0L) { - jjmatchedKind = 62; + jjmatchedKind = 88; jjmatchedPos = 5; - return 375; + return 401; } - if ((active0 & 0x44400000000000L) != 0L || (active1 & 0x400000L) != 0L) - return 378; - if ((active0 & 0xe03800000000000L) != 0L || (active1 & 0x2a00000L) != 0L) + if ((active0 & 0x40000000000L) != 0L) { - jjmatchedKind = 90; + jjmatchedKind = 60; jjmatchedPos = 5; - return 378; + return 400; } return -1; case 6: - if ((active0 & 0x202000000000000L) != 0L || (active1 & 0x200000L) != 0L) - return 378; - if ((active0 & 0xc01800000000000L) != 0L || (active1 & 0x2800000L) != 0L) + if ((active0 & 0x80800000000000L) != 0L || (active1 & 0x80000L) != 0L) + return 401; + if ((active0 & 0x300600000000000L) != 0L || (active1 & 0xa00000L) != 0L) { - jjmatchedKind = 90; + jjmatchedKind = 88; jjmatchedPos = 6; - return 378; + return 401; } - if ((active0 & 0x100000000000L) != 0L) - return 375; + if ((active0 & 0x40000000000L) != 0L) + return 400; return -1; case 7: - if ((active0 & 0xc01000000000000L) != 0L || (active1 & 0x2000000L) != 0L) + if ((active0 & 0x200000000000L) != 0L || (active1 & 0x200000L) != 0L) + return 401; + if ((active0 & 0x300400000000000L) != 0L || (active1 & 0x800000L) != 0L) { - jjmatchedKind = 90; + jjmatchedKind = 88; jjmatchedPos = 7; - return 378; + return 401; } - if ((active0 & 0x800000000000L) != 0L || (active1 & 0x800000L) != 0L) - return 378; return -1; case 8: - if ((active0 & 0x801000000000000L) != 0L) - return 378; - if ((active0 & 0x400000000000000L) != 0L || (active1 & 0x2000000L) != 0L) + if ((active0 & 0x200400000000000L) != 0L) + return 401; + if ((active0 & 0x100000000000000L) != 0L || (active1 & 0x800000L) != 0L) { - jjmatchedKind = 90; + jjmatchedKind = 88; jjmatchedPos = 8; - return 378; + return 401; } return -1; case 9: - if ((active1 & 0x2000000L) != 0L) - return 378; - if ((active0 & 0x400000000000000L) != 0L) + if ((active1 & 0x800000L) != 0L) + return 401; + if ((active0 & 0x100000000000000L) != 0L) { - jjmatchedKind = 90; + jjmatchedKind = 88; jjmatchedPos = 9; - return 378; + return 401; } return -1; case 10: - if ((active0 & 0x400000000000000L) != 0L) + if ((active0 & 0x100000000000000L) != 0L) { - jjmatchedKind = 90; + jjmatchedKind = 88; jjmatchedPos = 10; - return 378; + return 401; } return -1; case 11: - if ((active0 & 0x400000000000000L) != 0L) + if ((active0 & 0x100000000000000L) != 0L) { - jjmatchedKind = 90; + jjmatchedKind = 88; jjmatchedPos = 11; - return 378; + return 401; } return -1; case 12: - if ((active0 & 0x400000000000000L) != 0L) + if ((active0 & 0x100000000000000L) != 0L) { - jjmatchedKind = 90; + jjmatchedKind = 88; jjmatchedPos = 12; - return 378; + return 401; } return -1; default : @@ -221,58 +219,56 @@ private int jjMoveStringLiteralDfa0_0() { switch(curChar) { - case 35: - return jjMoveStringLiteralDfa1_0(0x4L, 0x0L); case 38: - return jjStopAtPos(0, 29); + return jjStopAtPos(0, 26); case 40: - return jjStopAtPos(0, 31); + return jjStopAtPos(0, 28); case 41: - return jjStopAtPos(0, 32); + return jjStopAtPos(0, 29); case 42: - return jjStopAtPos(0, 28); + return jjStopAtPos(0, 25); case 43: - return jjStopAtPos(0, 20); + return jjStopAtPos(0, 17); case 44: - return jjStopAtPos(0, 22); + return jjStopAtPos(0, 19); case 45: - jjmatchedKind = 21; - return jjMoveStringLiteralDfa1_0(0x4000L, 0x0L); + jjmatchedKind = 18; + return jjMoveStringLiteralDfa1_0(0x800L, 0x0L); case 46: - return jjStartNfaWithStates_0(0, 30, 376); + return jjStartNfaWithStates_0(0, 27, 399); case 47: - jjmatchedKind = 25; - return jjMoveStringLiteralDfa1_0(0x220L, 0x0L); + jjmatchedKind = 22; + return jjMoveStringLiteralDfa1_0(0x44L, 0x0L); case 58: - return jjStopAtPos(0, 33); + return jjStopAtPos(0, 30); case 59: - return jjStopAtPos(0, 23); + return jjStopAtPos(0, 20); case 60: - return jjMoveStringLiteralDfa1_0(0x2000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x400L, 0x0L); case 61: - return jjStopAtPos(0, 19); + return jjStopAtPos(0, 16); case 62: - return jjStopAtPos(0, 24); + return jjStopAtPos(0, 21); case 64: - return jjMoveStringLiteralDfa1_0(0xfffc00000000000L, 0x3e00000L); + return jjMoveStringLiteralDfa1_0(0x3fff00000000000L, 0xf80000L); case 91: - return jjStopAtPos(0, 26); + return jjStopAtPos(0, 23); case 93: - return jjStopAtPos(0, 27); + return jjStopAtPos(0, 24); case 73: case 105: - return jjMoveStringLiteralDfa1_0(0x200000000000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x80000000000L, 0x0L); case 84: case 116: - return jjMoveStringLiteralDfa1_0(0x180000000000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x60000000000L, 0x0L); case 123: - return jjStopAtPos(0, 15); + return jjStopAtPos(0, 12); case 124: - return jjMoveStringLiteralDfa1_0(0x20000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x4000L, 0x0L); case 125: - return jjStopAtPos(0, 16); + return jjStopAtPos(0, 13); case 126: - return jjMoveStringLiteralDfa1_0(0x40000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x8000L, 0x0L); default : return jjMoveNfa_0(4, 0); } @@ -287,70 +283,66 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1) switch(curChar) { case 33: - return jjMoveStringLiteralDfa2_0(active0, 0x2000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x400L, active1, 0L); case 42: - if ((active0 & 0x200L) != 0L) - return jjStartNfaWithStates_0(1, 9, 1); + if ((active0 & 0x40L) != 0L) + return jjStartNfaWithStates_0(1, 6, 1); break; case 45: - return jjMoveStringLiteralDfa2_0(active0, 0x400000000004000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x100000000000800L, active1, 0L); case 47: - if ((active0 & 0x20L) != 0L) - return jjStopAtPos(1, 5); + if ((active0 & 0x4L) != 0L) + return jjStopAtPos(1, 2); break; case 61: - if ((active0 & 0x20000L) != 0L) - return jjStopAtPos(1, 17); - else if ((active0 & 0x40000L) != 0L) - return jjStopAtPos(1, 18); + if ((active0 & 0x4000L) != 0L) + return jjStopAtPos(1, 14); + else if ((active0 & 0x8000L) != 0L) + return jjStopAtPos(1, 15); break; case 67: case 99: - return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x800000L); + return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x200000L); case 68: case 100: - return jjMoveStringLiteralDfa2_0(active0, 0x4000000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x1000000000000L, active1, 0L); case 69: case 101: - return jjMoveStringLiteralDfa2_0(active0, 0x320000000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0xc8000000000000L, active1, 0L); case 70: case 102: - return jjMoveStringLiteralDfa2_0(active0, 0x11000000000000L, active1, 0x2000000L); + return jjMoveStringLiteralDfa2_0(active0, 0x4400000000000L, active1, 0x800000L); case 72: case 104: - return jjMoveStringLiteralDfa2_0(active0, 0x100000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x40000000000L, active1, 0L); case 73: case 105: - return jjMoveStringLiteralDfa2_0(active0, 0x80800000000000L, active1, 0x200000L); + return jjMoveStringLiteralDfa2_0(active0, 0x20200000000000L, active1, 0x80000L); case 77: case 109: - return jjMoveStringLiteralDfa2_0(active0, 0x400000000000L, active1, 0x400000L); + return jjMoveStringLiteralDfa2_0(active0, 0x100000000000L, active1, 0x100000L); case 78: case 110: - if ((active0 & 0x200000000000L) != 0L) - return jjStartNfaWithStates_0(1, 45, 375); + if ((active0 & 0x80000000000L) != 0L) + return jjStartNfaWithStates_0(1, 43, 400); break; case 79: case 111: - if ((active0 & 0x80000000000L) != 0L) - return jjStartNfaWithStates_0(1, 43, 375); + if ((active0 & 0x20000000000L) != 0L) + return jjStartNfaWithStates_0(1, 41, 400); break; case 80: case 112: - return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1000000L); + return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x400000L); case 82: case 114: - return jjMoveStringLiteralDfa2_0(active0, 0x2000000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x800000000000L, active1, 0L); case 83: case 115: - return jjMoveStringLiteralDfa2_0(active0, 0x800000000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0L); case 87: case 119: - return jjMoveStringLiteralDfa2_0(active0, 0x48000000000000L, active1, 0L); - case 123: - if ((active0 & 0x4L) != 0L) - return jjStopAtPos(1, 2); - break; + return jjMoveStringLiteralDfa2_0(active0, 0x12000000000000L, active1, 0L); default : break; } @@ -368,49 +360,49 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a switch(curChar) { case 45: - return jjMoveStringLiteralDfa3_0(active0, 0x2000L, active1, 0L); + return jjMoveStringLiteralDfa3_0(active0, 0x400L, active1, 0L); case 62: - if ((active0 & 0x4000L) != 0L) - return jjStopAtPos(2, 14); + if ((active0 & 0x800L) != 0L) + return jjStopAtPos(2, 11); break; case 65: case 97: - return jjMoveStringLiteralDfa3_0(active0, 0x28000000000000L, active1, 0x1000000L); + return jjMoveStringLiteralDfa3_0(active0, 0xa000000000000L, active1, 0x400000L); case 69: case 101: - return jjMoveStringLiteralDfa3_0(active0, 0x6000000000000L, active1, 0x400000L); + return jjMoveStringLiteralDfa3_0(active0, 0x1800000000000L, active1, 0x100000L); case 70: case 102: - if ((active0 & 0x80000000000000L) != 0L) - return jjStartNfaWithStates_0(2, 55, 378); + if ((active0 & 0x20000000000000L) != 0L) + return jjStartNfaWithStates_0(2, 53, 401); break; case 72: case 104: - return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 0x800000L); + return jjMoveStringLiteralDfa3_0(active0, 0x10000000000000L, active1, 0x200000L); case 73: case 105: - return jjMoveStringLiteralDfa3_0(active0, 0x400000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_0(active0, 0x100000000000L, active1, 0L); case 76: case 108: - return jjMoveStringLiteralDfa3_0(active0, 0x100000000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 0L); case 77: case 109: - return jjMoveStringLiteralDfa3_0(active0, 0x400000000000000L, active1, 0x200000L); + return jjMoveStringLiteralDfa3_0(active0, 0x100000000000000L, active1, 0x80000L); case 78: case 110: - return jjMoveStringLiteralDfa3_0(active0, 0x800000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_0(active0, 0x200000000000L, active1, 0L); case 79: case 111: - return jjMoveStringLiteralDfa3_0(active0, 0x10000000000000L, active1, 0x2000000L); + return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000L, active1, 0x800000L); case 82: case 114: - return jjMoveStringLiteralDfa3_0(active0, 0x100000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_0(active0, 0x40000000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa3_0(active0, 0x801000000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_0(active0, 0x200400000000000L, active1, 0L); case 88: case 120: - return jjMoveStringLiteralDfa3_0(active0, 0x200000000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_0(active0, 0x80000000000000L, active1, 0L); default : break; } @@ -428,50 +420,50 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a switch(curChar) { case 45: - if ((active0 & 0x2000L) != 0L) - return jjStopAtPos(3, 13); + if ((active0 & 0x400L) != 0L) + return jjStopAtPos(3, 10); break; case 65: case 97: - return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x800000L); + return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x200000L); case 66: case 98: - return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0x1000000000000L, active1, 0L); case 67: case 99: - return jjMoveStringLiteralDfa4_0(active0, 0x20800000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0x8200000000000L, active1, 0L); case 68: case 100: - return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x400000L); + return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000L); case 71: case 103: - return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1000000L); + return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x400000L); case 73: case 105: - return jjMoveStringLiteralDfa4_0(active0, 0x40000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0x10000000000000L, active1, 0L); case 78: case 110: - return jjMoveStringLiteralDfa4_0(active0, 0x1000000000000L, active1, 0x2000000L); + return jjMoveStringLiteralDfa4_0(active0, 0x400000000000L, active1, 0x800000L); case 79: case 111: - return jjMoveStringLiteralDfa4_0(active0, 0x400100000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0x100040000000000L, active1, 0L); case 80: case 112: - return jjMoveStringLiteralDfa4_0(active0, 0x800000000000000L, active1, 0x200000L); + return jjMoveStringLiteralDfa4_0(active0, 0x200000000000000L, active1, 0x80000L); case 82: case 114: - if ((active0 & 0x10000000000000L) != 0L) - return jjStartNfaWithStates_0(3, 52, 378); - return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000L, active1, 0L); + if ((active0 & 0x4000000000000L) != 0L) + return jjStartNfaWithStates_0(3, 50, 401); + return jjMoveStringLiteralDfa4_0(active0, 0x2000000000000L, active1, 0L); case 83: case 115: - return jjMoveStringLiteralDfa4_0(active0, 0x100000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0x40000000000000L, active1, 0L); case 84: case 116: - return jjMoveStringLiteralDfa4_0(active0, 0x202000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0x80800000000000L, active1, 0L); case 88: case 120: - return jjMoveStringLiteralDfa4_0(active0, 0x400000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0x100000000000L, active1, 0L); default : break; } @@ -490,48 +482,48 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a { case 67: case 99: - return jjMoveStringLiteralDfa5_0(active0, 0x1000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_0(active0, 0x400000000000L, active1, 0L); case 69: case 101: - if ((active0 & 0x100000000000000L) != 0L) - return jjStartNfaWithStates_0(4, 56, 378); - else if ((active1 & 0x1000000L) != 0L) - return jjStartNfaWithStates_0(4, 88, 378); - return jjMoveStringLiteralDfa5_0(active0, 0x200000000000000L, active1, 0L); + if ((active0 & 0x40000000000000L) != 0L) + return jjStartNfaWithStates_0(4, 54, 401); + else if ((active1 & 0x400000L) != 0L) + return jjStartNfaWithStates_0(4, 86, 401); + return jjMoveStringLiteralDfa5_0(active0, 0x80000000000000L, active1, 0L); case 72: case 104: - if ((active0 & 0x20000000000000L) != 0L) - return jjStartNfaWithStates_0(4, 53, 378); + if ((active0 & 0x8000000000000L) != 0L) + return jjStartNfaWithStates_0(4, 51, 401); break; case 73: case 105: - return jjMoveStringLiteralDfa5_0(active0, 0x400000000000L, active1, 0x400000L); + return jjMoveStringLiteralDfa5_0(active0, 0x100000000000L, active1, 0x100000L); case 76: case 108: - return jjMoveStringLiteralDfa5_0(active0, 0x40800000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_0(active0, 0x10200000000000L, active1, 0L); case 78: case 110: - if ((active0 & 0x8000000000000L) != 0L) - return jjStartNfaWithStates_0(4, 51, 378); + if ((active0 & 0x2000000000000L) != 0L) + return jjStartNfaWithStates_0(4, 49, 401); break; case 79: case 111: - return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x200000L); + return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x80000L); case 80: case 112: - return jjMoveStringLiteralDfa5_0(active0, 0x800000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_0(active0, 0x200000000000000L, active1, 0L); case 82: case 114: - return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x800000L); + return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x200000L); case 84: case 116: - return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2000000L); + return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x800000L); case 85: case 117: - return jjMoveStringLiteralDfa5_0(active0, 0x6100000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_0(active0, 0x1840000000000L, active1, 0L); case 90: case 122: - return jjMoveStringLiteralDfa5_0(active0, 0x400000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_0(active0, 0x100000000000000L, active1, 0L); default : break; } @@ -549,42 +541,42 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a switch(curChar) { case 45: - return jjMoveStringLiteralDfa6_0(active0, 0x400000000000000L, active1, 0x2000000L); + return jjMoveStringLiteralDfa6_0(active0, 0x100000000000000L, active1, 0x800000L); case 65: case 97: - if ((active1 & 0x400000L) != 0L) - return jjStartNfaWithStates_0(5, 86, 378); + if ((active1 & 0x100000L) != 0L) + return jjStartNfaWithStates_0(5, 84, 401); break; case 69: case 101: - if ((active0 & 0x40000000000000L) != 0L) - return jjStartNfaWithStates_0(5, 54, 378); + if ((active0 & 0x10000000000000L) != 0L) + return jjStartNfaWithStates_0(5, 52, 401); break; case 71: case 103: - if ((active0 & 0x4000000000000L) != 0L) - return jjStartNfaWithStates_0(5, 50, 378); - return jjMoveStringLiteralDfa6_0(active0, 0x100000000000L, active1, 0L); + if ((active0 & 0x1000000000000L) != 0L) + return jjStartNfaWithStates_0(5, 48, 401); + return jjMoveStringLiteralDfa6_0(active0, 0x40000000000L, active1, 0L); case 78: case 110: - if ((active0 & 0x400000000000L) != 0L) - return jjStartNfaWithStates_0(5, 46, 378); - return jjMoveStringLiteralDfa6_0(active0, 0x200000000000000L, active1, 0L); + if ((active0 & 0x100000000000L) != 0L) + return jjStartNfaWithStates_0(5, 44, 401); + return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L, active1, 0L); case 79: case 111: - return jjMoveStringLiteralDfa6_0(active0, 0x800000000000000L, active1, 0L); + return jjMoveStringLiteralDfa6_0(active0, 0x200000000000000L, active1, 0L); case 82: case 114: - return jjMoveStringLiteralDfa6_0(active0, 0x2000000000000L, active1, 0x200000L); + return jjMoveStringLiteralDfa6_0(active0, 0x800000000000L, active1, 0x80000L); case 83: case 115: - return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x800000L); + return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x200000L); case 84: case 116: - return jjMoveStringLiteralDfa6_0(active0, 0x1000000000000L, active1, 0L); + return jjMoveStringLiteralDfa6_0(active0, 0x400000000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa6_0(active0, 0x800000000000L, active1, 0L); + return jjMoveStringLiteralDfa6_0(active0, 0x200000000000L, active1, 0L); default : break; } @@ -603,35 +595,35 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long a { case 68: case 100: - if ((active0 & 0x200000000000000L) != 0L) - return jjStartNfaWithStates_0(6, 57, 378); - return jjMoveStringLiteralDfa7_0(active0, 0x400800000000000L, active1, 0L); + if ((active0 & 0x80000000000000L) != 0L) + return jjStartNfaWithStates_0(6, 55, 401); + return jjMoveStringLiteralDfa7_0(active0, 0x100200000000000L, active1, 0L); case 69: case 101: - return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x800000L); + return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x200000L); case 70: case 102: - return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x2000000L); + return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x800000L); case 72: case 104: - if ((active0 & 0x100000000000L) != 0L) - return jjStartNfaWithStates_0(6, 44, 375); + if ((active0 & 0x40000000000L) != 0L) + return jjStartNfaWithStates_0(6, 42, 400); break; case 73: case 105: - return jjMoveStringLiteralDfa7_0(active0, 0x1000000000000L, active1, 0L); + return jjMoveStringLiteralDfa7_0(active0, 0x400000000000L, active1, 0L); case 78: case 110: - if ((active0 & 0x2000000000000L) != 0L) - return jjStartNfaWithStates_0(6, 49, 378); + if ((active0 & 0x800000000000L) != 0L) + return jjStartNfaWithStates_0(6, 47, 401); break; case 82: case 114: - return jjMoveStringLiteralDfa7_0(active0, 0x800000000000000L, active1, 0L); + return jjMoveStringLiteralDfa7_0(active0, 0x200000000000000L, active1, 0L); case 84: case 116: - if ((active1 & 0x200000L) != 0L) - return jjStartNfaWithStates_0(6, 85, 378); + if ((active1 & 0x80000L) != 0L) + return jjStartNfaWithStates_0(6, 83, 401); break; default : break; @@ -651,20 +643,20 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long a { case 65: case 97: - return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x2000000L); + return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x800000L); case 69: case 101: - if ((active0 & 0x800000000000L) != 0L) - return jjStartNfaWithStates_0(7, 47, 378); + if ((active0 & 0x200000000000L) != 0L) + return jjStartNfaWithStates_0(7, 45, 401); break; case 79: case 111: - return jjMoveStringLiteralDfa8_0(active0, 0x401000000000000L, active1, 0L); + return jjMoveStringLiteralDfa8_0(active0, 0x100400000000000L, active1, 0L); case 84: case 116: - if ((active1 & 0x800000L) != 0L) - return jjStartNfaWithStates_0(7, 87, 378); - return jjMoveStringLiteralDfa8_0(active0, 0x800000000000000L, active1, 0L); + if ((active1 & 0x200000L) != 0L) + return jjStartNfaWithStates_0(7, 85, 401); + return jjMoveStringLiteralDfa8_0(active0, 0x200000000000000L, active1, 0L); default : break; } @@ -683,16 +675,16 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long a { case 67: case 99: - return jjMoveStringLiteralDfa9_0(active0, 0x400000000000000L, active1, 0x2000000L); + return jjMoveStringLiteralDfa9_0(active0, 0x100000000000000L, active1, 0x800000L); case 78: case 110: - if ((active0 & 0x1000000000000L) != 0L) - return jjStartNfaWithStates_0(8, 48, 378); + if ((active0 & 0x400000000000L) != 0L) + return jjStartNfaWithStates_0(8, 46, 401); break; case 83: case 115: - if ((active0 & 0x800000000000000L) != 0L) - return jjStartNfaWithStates_0(8, 59, 378); + if ((active0 & 0x200000000000000L) != 0L) + return jjStartNfaWithStates_0(8, 57, 401); break; default : break; @@ -712,12 +704,12 @@ private int jjMoveStringLiteralDfa9_0(long old0, long active0, long old1, long a { case 69: case 101: - if ((active1 & 0x2000000L) != 0L) - return jjStartNfaWithStates_0(9, 89, 378); + if ((active1 & 0x800000L) != 0L) + return jjStartNfaWithStates_0(9, 87, 401); break; case 85: case 117: - return jjMoveStringLiteralDfa10_0(active0, 0x400000000000000L, active1, 0L); + return jjMoveStringLiteralDfa10_0(active0, 0x100000000000000L, active1, 0L); default : break; } @@ -736,7 +728,7 @@ private int jjMoveStringLiteralDfa10_0(long old0, long active0, long old1, long { case 77: case 109: - return jjMoveStringLiteralDfa11_0(active0, 0x400000000000000L); + return jjMoveStringLiteralDfa11_0(active0, 0x100000000000000L); default : break; } @@ -755,7 +747,7 @@ private int jjMoveStringLiteralDfa11_0(long old0, long active0) { case 69: case 101: - return jjMoveStringLiteralDfa12_0(active0, 0x400000000000000L); + return jjMoveStringLiteralDfa12_0(active0, 0x100000000000000L); default : break; } @@ -774,7 +766,7 @@ private int jjMoveStringLiteralDfa12_0(long old0, long active0) { case 78: case 110: - return jjMoveStringLiteralDfa13_0(active0, 0x400000000000000L); + return jjMoveStringLiteralDfa13_0(active0, 0x100000000000000L); default : break; } @@ -793,8 +785,8 @@ private int jjMoveStringLiteralDfa13_0(long old0, long active0) { case 84: case 116: - if ((active0 & 0x400000000000000L) != 0L) - return jjStartNfaWithStates_0(13, 58, 378); + if ((active0 & 0x100000000000000L) != 0L) + return jjStartNfaWithStates_0(13, 56, 401); break; default : break; @@ -815,7 +807,7 @@ static final long[] jjbitVec0 = { private int jjMoveNfa_0(int startState, int curPos) { int startsAt = 0; - jjnewStateCnt = 375; + jjnewStateCnt = 399; int i = 1; jjstateSet[0] = startState; int kind = 0x7fffffff; @@ -830,66 +822,81 @@ private int jjMoveNfa_0(int startState, int curPos) { switch(jjstateSet[--i]) { - case 376: + case 400: + if ((0x3ff200000000000L & l) != 0L) + jjCheckNAddStates(0, 2); + else if (curChar == 40) + { + if (kind > 100) + kind = 100; + } + if ((0x3ff200000000000L & l) != 0L) + { + if (kind > 60) + kind = 60; + jjCheckNAddTwoStates(117, 118); + } + break; + case 96: + if (curChar == 45) + jjstateSet[jjnewStateCnt++] = 97; + break; + case 401: + case 98: + if ((0x3ff200000000000L & l) == 0L) + break; + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(98, 99); + break; + case 399: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(0, 4); + jjCheckNAddStates(3, 7); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(186, 189); + jjCheckNAddTwoStates(210, 213); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(183, 185); + jjCheckNAddTwoStates(207, 209); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(181, 182); + jjCheckNAddTwoStates(205, 206); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(178, 180); + jjCheckNAddTwoStates(202, 204); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(173, 177); + jjCheckNAddTwoStates(197, 201); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(169, 172); + jjCheckNAddTwoStates(193, 196); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(165, 168); + jjCheckNAddTwoStates(189, 192); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(162, 164); + jjCheckNAddTwoStates(186, 188); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(159, 161); + jjCheckNAddTwoStates(183, 185); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(156, 158); + jjCheckNAddTwoStates(180, 182); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(153, 155); + jjCheckNAddTwoStates(177, 179); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(150, 152); + jjCheckNAddTwoStates(174, 176); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(147, 149); + jjCheckNAddTwoStates(171, 173); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(144, 146); + jjCheckNAddTwoStates(168, 170); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(141, 143); + jjCheckNAddTwoStates(165, 167); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(139, 140); + jjCheckNAddTwoStates(163, 164); if ((0x3ff000000000000L & l) != 0L) { - if (kind > 63) - kind = 63; - jjCheckNAdd(138); + if (kind > 61) + kind = 61; + jjCheckNAdd(162); } break; - case 377: - case 61: - if ((0x3ff200000000000L & l) == 0L) - break; - if (kind > 84) - kind = 84; - jjCheckNAddTwoStates(61, 62); - break; - case 72: - if (curChar == 45) - jjstateSet[jjnewStateCnt++] = 73; - break; case 4: if ((0x3ff000000000000L & l) != 0L) { - if (kind > 63) - kind = 63; - jjCheckNAddStates(5, 78); + if (kind > 61) + kind = 61; + jjCheckNAddStates(8, 81); } else if ((0x100003600L & l) != 0L) { @@ -898,44 +905,23 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAdd(0); } else if (curChar == 46) - jjCheckNAddStates(79, 96); + jjCheckNAddStates(82, 99); else if (curChar == 45) - jjAddStates(97, 98); + jjAddStates(100, 101); else if (curChar == 33) - jjCheckNAddStates(99, 102); + jjCheckNAddStates(102, 105); else if (curChar == 35) - jjCheckNAddTwoStates(61, 62); + jjCheckNAddTwoStates(85, 86); else if (curChar == 36) - jjCheckNAddStates(103, 106); + jjCheckNAddStates(106, 109); else if (curChar == 39) - jjCheckNAddStates(107, 110); + jjCheckNAddStates(110, 113); else if (curChar == 34) - jjCheckNAddStates(111, 114); + jjCheckNAddStates(114, 117); else if (curChar == 47) jjstateSet[jjnewStateCnt++] = 3; - break; - case 378: - case 74: - if ((0x3ff200000000000L & l) == 0L) - break; - if (kind > 90) - kind = 90; - jjCheckNAddTwoStates(74, 75); - break; - case 375: - if ((0x3ff200000000000L & l) != 0L) - jjCheckNAddStates(115, 117); - else if (curChar == 40) - { - if (kind > 102) - kind = 102; - } - if ((0x3ff200000000000L & l) != 0L) - { - if (kind > 62) - kind = 62; - jjCheckNAddTwoStates(93, 94); - } + if (curChar == 35) + jjstateSet[jjnewStateCnt++] = 5; break; case 0: if ((0x100003600L & l) == 0L) @@ -949,1409 +935,1488 @@ private int jjMoveNfa_0(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 2; break; case 2: - if ((0xffff7fffffffffffL & l) != 0L && kind > 8) - kind = 8; + if ((0xffff7fffffffffffL & l) != 0L && kind > 5) + kind = 5; break; case 3: if (curChar == 42) jjstateSet[jjnewStateCnt++] = 1; break; - case 5: - if (curChar == 34) - jjCheckNAddStates(111, 114); - break; case 6: - if ((0xfffffffb00000200L & l) != 0L) - jjCheckNAddStates(111, 114); + if (curChar == 36) + jjCheckNAddStates(118, 121); break; case 7: - if (curChar == 34 && kind > 61) - kind = 61; + if (curChar == 45) + jjCheckNAdd(8); break; case 9: - if (curChar == 12) - jjCheckNAddStates(111, 114); - break; - case 11: - if ((0xffffffff00000000L & l) != 0L) - jjCheckNAddStates(111, 114); + if ((0x3ff200000000000L & l) != 0L) + jjCheckNAddStates(122, 124); break; case 12: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(118, 123); + if ((0xffffffff00000000L & l) != 0L) + jjCheckNAddStates(122, 124); break; case 13: - if ((0x100003600L & l) != 0L) - jjCheckNAddStates(111, 114); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(125, 129); break; case 14: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(124, 132); + if ((0x100003600L & l) != 0L) + jjCheckNAddStates(122, 124); break; case 15: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(133, 137); + jjCheckNAddStates(130, 137); break; case 16: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(138, 143); + jjCheckNAddStates(138, 141); break; case 17: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(144, 150); + jjCheckNAddStates(142, 146); break; case 18: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(151, 158); + jjCheckNAddStates(147, 152); break; case 19: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(153, 159); + break; + case 22: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(160, 164); + break; + case 23: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(165, 172); + break; + case 24: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(173, 176); + break; + case 25: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(177, 181); + break; + case 26: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(182, 187); + break; + case 27: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(188, 194); + break; + case 28: + if (curChar == 35) + jjstateSet[jjnewStateCnt++] = 5; + break; + case 29: + if (curChar == 34) + jjCheckNAddStates(114, 117); + break; + case 30: + if ((0xfffffffb00000200L & l) != 0L) + jjCheckNAddStates(114, 117); + break; + case 31: + if (curChar == 34 && kind > 59) + kind = 59; + break; + case 33: + if (curChar == 12) + jjCheckNAddStates(114, 117); + break; + case 35: + if ((0xffffffff00000000L & l) != 0L) + jjCheckNAddStates(114, 117); + break; + case 36: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(195, 200); + break; + case 37: + if ((0x100003600L & l) != 0L) + jjCheckNAddStates(114, 117); + break; + case 38: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(201, 209); + break; + case 39: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(210, 214); + break; + case 40: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(215, 220); + break; + case 41: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(221, 227); + break; + case 42: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(228, 235); + break; + case 43: if (curChar == 13) - jjCheckNAddStates(111, 114); + jjCheckNAddStates(114, 117); break; - case 20: + case 44: if (curChar == 10) - jjCheckNAddStates(111, 114); + jjCheckNAddStates(114, 117); break; - case 21: + case 45: if (curChar == 13) - jjstateSet[jjnewStateCnt++] = 20; + jjstateSet[jjnewStateCnt++] = 44; break; - case 22: + case 46: if (curChar == 39) - jjCheckNAddStates(107, 110); + jjCheckNAddStates(110, 113); break; - case 23: + case 47: if ((0xffffff7f00000200L & l) != 0L) - jjCheckNAddStates(107, 110); + jjCheckNAddStates(110, 113); break; - case 24: - if (curChar == 39 && kind > 61) - kind = 61; + case 48: + if (curChar == 39 && kind > 59) + kind = 59; break; - case 26: + case 50: if (curChar == 12) - jjCheckNAddStates(107, 110); + jjCheckNAddStates(110, 113); break; - case 28: + case 52: if ((0xffffffff00000000L & l) != 0L) - jjCheckNAddStates(107, 110); + jjCheckNAddStates(110, 113); break; - case 29: + case 53: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(159, 164); + jjCheckNAddStates(236, 241); break; - case 30: + case 54: if ((0x100003600L & l) != 0L) - jjCheckNAddStates(107, 110); + jjCheckNAddStates(110, 113); break; - case 31: + case 55: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(165, 173); + jjCheckNAddStates(242, 250); break; - case 32: + case 56: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(174, 178); + jjCheckNAddStates(251, 255); break; - case 33: + case 57: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(179, 184); + jjCheckNAddStates(256, 261); break; - case 34: + case 58: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(185, 191); + jjCheckNAddStates(262, 268); break; - case 35: + case 59: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(192, 199); + jjCheckNAddStates(269, 276); break; - case 36: + case 60: if (curChar == 13) - jjCheckNAddStates(107, 110); + jjCheckNAddStates(110, 113); break; - case 37: + case 61: if (curChar == 10) - jjCheckNAddStates(107, 110); + jjCheckNAddStates(110, 113); break; - case 38: + case 62: if (curChar == 13) - jjstateSet[jjnewStateCnt++] = 37; + jjstateSet[jjnewStateCnt++] = 61; break; - case 39: + case 63: if (curChar == 36) - jjCheckNAddStates(103, 106); + jjCheckNAddStates(106, 109); break; - case 40: + case 64: if (curChar == 45) - jjCheckNAdd(41); + jjCheckNAdd(65); break; - case 42: + case 66: if ((0x3ff200000000000L & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddTwoStates(42, 43); + if (kind > 64) + kind = 64; + jjCheckNAddTwoStates(66, 67); break; - case 44: + case 68: if ((0xffffffff00000000L & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddTwoStates(42, 43); + if (kind > 64) + kind = 64; + jjCheckNAddTwoStates(66, 67); break; - case 45: + case 69: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(200, 203); + if (kind > 64) + kind = 64; + jjCheckNAddStates(277, 280); break; - case 46: + case 70: if ((0x100003600L & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddTwoStates(42, 43); + if (kind > 64) + kind = 64; + jjCheckNAddTwoStates(66, 67); break; - case 47: + case 71: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(204, 210); + if (kind > 64) + kind = 64; + jjCheckNAddStates(281, 287); break; - case 48: + case 72: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(211, 213); + if (kind > 64) + kind = 64; + jjCheckNAddStates(288, 290); break; - case 49: + case 73: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(214, 217); + if (kind > 64) + kind = 64; + jjCheckNAddStates(291, 294); break; - case 50: + case 74: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(218, 222); + if (kind > 64) + kind = 64; + jjCheckNAddStates(295, 299); break; - case 51: + case 75: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(223, 228); + if (kind > 64) + kind = 64; + jjCheckNAddStates(300, 305); break; - case 54: + case 78: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(229, 232); + if (kind > 64) + kind = 64; + jjCheckNAddStates(306, 309); break; - case 55: + case 79: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(233, 239); + if (kind > 64) + kind = 64; + jjCheckNAddStates(310, 316); break; - case 56: + case 80: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(240, 242); + if (kind > 64) + kind = 64; + jjCheckNAddStates(317, 319); break; - case 57: + case 81: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(243, 246); + if (kind > 64) + kind = 64; + jjCheckNAddStates(320, 323); break; - case 58: + case 82: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(247, 251); + if (kind > 64) + kind = 64; + jjCheckNAddStates(324, 328); break; - case 59: + case 83: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(252, 257); + if (kind > 64) + kind = 64; + jjCheckNAddStates(329, 334); break; - case 60: + case 84: if (curChar == 35) - jjCheckNAddTwoStates(61, 62); + jjCheckNAddTwoStates(85, 86); break; - case 63: + case 85: + if ((0x3ff200000000000L & l) == 0L) + break; + if (kind > 82) + kind = 82; + jjCheckNAddTwoStates(85, 86); + break; + case 87: if ((0xffffffff00000000L & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddTwoStates(61, 62); + if (kind > 82) + kind = 82; + jjCheckNAddTwoStates(85, 86); break; - case 64: + case 88: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddStates(258, 261); + if (kind > 82) + kind = 82; + jjCheckNAddStates(335, 338); break; - case 65: + case 89: if ((0x100003600L & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddTwoStates(61, 62); + if (kind > 82) + kind = 82; + jjCheckNAddTwoStates(85, 86); break; - case 66: + case 90: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddStates(262, 268); + if (kind > 82) + kind = 82; + jjCheckNAddStates(339, 345); break; - case 67: + case 91: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddStates(269, 271); + if (kind > 82) + kind = 82; + jjCheckNAddStates(346, 348); break; - case 68: + case 92: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddStates(272, 275); + if (kind > 82) + kind = 82; + jjCheckNAddStates(349, 352); break; - case 69: + case 93: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddStates(276, 280); + if (kind > 82) + kind = 82; + jjCheckNAddStates(353, 357); break; - case 70: + case 94: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddStates(281, 286); + if (kind > 82) + kind = 82; + jjCheckNAddStates(358, 363); break; - case 76: + case 100: if ((0xffffffff00000000L & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddTwoStates(74, 75); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(98, 99); break; - case 77: + case 101: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(287, 290); + if (kind > 88) + kind = 88; + jjCheckNAddStates(364, 367); break; - case 78: + case 102: if ((0x100003600L & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddTwoStates(74, 75); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(98, 99); break; - case 79: + case 103: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(291, 297); + if (kind > 88) + kind = 88; + jjCheckNAddStates(368, 374); break; - case 80: + case 104: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(298, 300); + if (kind > 88) + kind = 88; + jjCheckNAddStates(375, 377); break; - case 81: + case 105: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(301, 304); + if (kind > 88) + kind = 88; + jjCheckNAddStates(378, 381); break; - case 82: + case 106: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(305, 309); + if (kind > 88) + kind = 88; + jjCheckNAddStates(382, 386); break; - case 83: + case 107: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(310, 315); + if (kind > 88) + kind = 88; + jjCheckNAddStates(387, 392); break; - case 86: + case 110: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(316, 319); + if (kind > 88) + kind = 88; + jjCheckNAddStates(393, 396); break; - case 87: + case 111: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(320, 326); + if (kind > 88) + kind = 88; + jjCheckNAddStates(397, 403); break; - case 88: + case 112: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(327, 329); + if (kind > 88) + kind = 88; + jjCheckNAddStates(404, 406); break; - case 89: + case 113: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(330, 333); + if (kind > 88) + kind = 88; + jjCheckNAddStates(407, 410); break; - case 90: + case 114: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(334, 338); + if (kind > 88) + kind = 88; + jjCheckNAddStates(411, 415); break; - case 91: + case 115: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(339, 344); + if (kind > 88) + kind = 88; + jjCheckNAddStates(416, 421); break; - case 93: + case 117: if ((0x3ff200000000000L & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddTwoStates(93, 94); + if (kind > 60) + kind = 60; + jjCheckNAddTwoStates(117, 118); break; - case 95: + case 119: if ((0xffffffff00000000L & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddTwoStates(93, 94); + if (kind > 60) + kind = 60; + jjCheckNAddTwoStates(117, 118); break; - case 96: + case 120: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(345, 348); + if (kind > 60) + kind = 60; + jjCheckNAddStates(422, 425); break; - case 97: + case 121: if ((0x100003600L & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddTwoStates(93, 94); + if (kind > 60) + kind = 60; + jjCheckNAddTwoStates(117, 118); break; - case 98: + case 122: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(349, 355); + if (kind > 60) + kind = 60; + jjCheckNAddStates(426, 432); break; - case 99: + case 123: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(356, 358); + if (kind > 60) + kind = 60; + jjCheckNAddStates(433, 435); break; - case 100: + case 124: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(359, 362); + if (kind > 60) + kind = 60; + jjCheckNAddStates(436, 439); break; - case 101: + case 125: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(363, 367); + if (kind > 60) + kind = 60; + jjCheckNAddStates(440, 444); break; - case 102: + case 126: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(368, 373); + if (kind > 60) + kind = 60; + jjCheckNAddStates(445, 450); break; - case 103: + case 127: if ((0x3ff200000000000L & l) != 0L) - jjCheckNAddStates(115, 117); + jjCheckNAddStates(0, 2); break; - case 104: - if (curChar == 40 && kind > 102) - kind = 102; + case 128: + if (curChar == 40 && kind > 100) + kind = 100; break; - case 106: + case 130: if ((0xffffffff00000000L & l) != 0L) - jjCheckNAddStates(115, 117); + jjCheckNAddStates(0, 2); break; - case 107: + case 131: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(374, 378); + jjCheckNAddStates(451, 455); break; - case 108: + case 132: if ((0x100003600L & l) != 0L) - jjCheckNAddStates(115, 117); + jjCheckNAddStates(0, 2); break; - case 109: + case 133: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(379, 386); + jjCheckNAddStates(456, 463); break; - case 110: + case 134: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(387, 390); + jjCheckNAddStates(464, 467); break; - case 111: + case 135: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(391, 395); + jjCheckNAddStates(468, 472); break; - case 112: + case 136: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(396, 401); + jjCheckNAddStates(473, 478); break; - case 113: + case 137: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(402, 408); + jjCheckNAddStates(479, 485); break; - case 114: + case 138: if (curChar == 33) - jjCheckNAddStates(99, 102); + jjCheckNAddStates(102, 105); break; - case 115: + case 139: if ((0x100003600L & l) != 0L) - jjCheckNAddTwoStates(115, 122); + jjCheckNAddTwoStates(139, 146); break; - case 123: + case 147: if ((0x100003600L & l) != 0L) - jjCheckNAddTwoStates(123, 132); + jjCheckNAddTwoStates(147, 156); break; - case 133: + case 157: if (curChar == 45) - jjAddStates(97, 98); + jjAddStates(100, 101); break; - case 137: + case 161: if (curChar == 46) - jjCheckNAddStates(79, 96); + jjCheckNAddStates(82, 99); break; - case 138: + case 162: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 63) - kind = 63; - jjCheckNAdd(138); + if (kind > 61) + kind = 61; + jjCheckNAdd(162); break; - case 139: + case 163: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(139, 140); + jjCheckNAddTwoStates(163, 164); break; - case 140: - if (curChar == 37 && kind > 67) - kind = 67; + case 164: + if (curChar == 37 && kind > 65) + kind = 65; break; - case 141: + case 165: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(141, 143); + jjCheckNAddTwoStates(165, 167); break; - case 144: + case 168: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(144, 146); + jjCheckNAddTwoStates(168, 170); break; - case 147: + case 171: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(147, 149); + jjCheckNAddTwoStates(171, 173); break; - case 150: + case 174: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(150, 152); + jjCheckNAddTwoStates(174, 176); break; - case 153: + case 177: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(153, 155); + jjCheckNAddTwoStates(177, 179); break; - case 156: + case 180: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(156, 158); + jjCheckNAddTwoStates(180, 182); break; - case 159: + case 183: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(159, 161); + jjCheckNAddTwoStates(183, 185); break; - case 162: + case 186: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(162, 164); + jjCheckNAddTwoStates(186, 188); break; - case 165: + case 189: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(165, 168); + jjCheckNAddTwoStates(189, 192); break; - case 169: + case 193: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(169, 172); + jjCheckNAddTwoStates(193, 196); break; - case 173: + case 197: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(173, 177); + jjCheckNAddTwoStates(197, 201); break; - case 178: + case 202: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(178, 180); + jjCheckNAddTwoStates(202, 204); break; - case 181: + case 205: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(181, 182); + jjCheckNAddTwoStates(205, 206); break; - case 183: + case 207: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(183, 185); + jjCheckNAddTwoStates(207, 209); break; - case 186: + case 210: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(186, 189); + jjCheckNAddTwoStates(210, 213); break; - case 190: + case 214: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(0, 4); + jjCheckNAddStates(3, 7); break; - case 191: + case 215: if (curChar == 45) - jjCheckNAdd(192); + jjCheckNAdd(216); break; - case 193: + case 217: if ((0x3ff200000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddTwoStates(193, 194); + if (kind > 81) + kind = 81; + jjCheckNAddTwoStates(217, 218); break; - case 195: + case 219: if ((0xffffffff00000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddTwoStates(193, 194); + if (kind > 81) + kind = 81; + jjCheckNAddTwoStates(217, 218); break; - case 196: + case 220: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(409, 412); + if (kind > 81) + kind = 81; + jjCheckNAddStates(486, 489); break; - case 197: + case 221: if ((0x100003600L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddTwoStates(193, 194); + if (kind > 81) + kind = 81; + jjCheckNAddTwoStates(217, 218); break; - case 198: + case 222: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(413, 419); + if (kind > 81) + kind = 81; + jjCheckNAddStates(490, 496); break; - case 199: + case 223: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(420, 422); + if (kind > 81) + kind = 81; + jjCheckNAddStates(497, 499); break; - case 200: + case 224: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(423, 426); + if (kind > 81) + kind = 81; + jjCheckNAddStates(500, 503); break; - case 201: + case 225: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(427, 431); + if (kind > 81) + kind = 81; + jjCheckNAddStates(504, 508); break; - case 202: + case 226: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(432, 437); + if (kind > 81) + kind = 81; + jjCheckNAddStates(509, 514); break; - case 205: + case 229: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(438, 441); + if (kind > 81) + kind = 81; + jjCheckNAddStates(515, 518); break; - case 206: + case 230: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(442, 448); + if (kind > 81) + kind = 81; + jjCheckNAddStates(519, 525); break; - case 207: + case 231: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(449, 451); + if (kind > 81) + kind = 81; + jjCheckNAddStates(526, 528); break; - case 208: + case 232: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(452, 455); + if (kind > 81) + kind = 81; + jjCheckNAddStates(529, 532); break; - case 209: + case 233: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(456, 460); + if (kind > 81) + kind = 81; + jjCheckNAddStates(533, 537); break; - case 210: + case 234: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(461, 466); + if (kind > 81) + kind = 81; + jjCheckNAddStates(538, 543); break; - case 212: + case 236: if (curChar == 40) - jjCheckNAddStates(467, 472); + jjCheckNAddStates(544, 549); break; - case 213: + case 237: if ((0xfffffc7a00000000L & l) != 0L) - jjCheckNAddStates(473, 476); + jjCheckNAddStates(550, 553); break; - case 214: + case 238: if ((0x100003600L & l) != 0L) - jjCheckNAddTwoStates(214, 215); + jjCheckNAddTwoStates(238, 239); break; - case 215: - if (curChar == 41 && kind > 65) - kind = 65; + case 239: + if (curChar == 41 && kind > 63) + kind = 63; break; - case 217: + case 241: if ((0xffffffff00000000L & l) != 0L) - jjCheckNAddStates(473, 476); + jjCheckNAddStates(550, 553); break; - case 218: + case 242: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(477, 481); + jjCheckNAddStates(554, 558); break; - case 219: + case 243: if ((0x100003600L & l) != 0L) - jjCheckNAddStates(473, 476); + jjCheckNAddStates(550, 553); break; - case 220: + case 244: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(482, 489); + jjCheckNAddStates(559, 566); break; - case 221: + case 245: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(490, 493); + jjCheckNAddStates(567, 570); break; - case 222: + case 246: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(494, 498); + jjCheckNAddStates(571, 575); break; - case 223: + case 247: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(499, 504); + jjCheckNAddStates(576, 581); break; - case 224: + case 248: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(505, 511); + jjCheckNAddStates(582, 588); break; - case 225: + case 249: if (curChar == 39) - jjCheckNAddStates(512, 515); + jjCheckNAddStates(589, 592); break; - case 226: + case 250: if ((0xffffff7f00000200L & l) != 0L) - jjCheckNAddStates(512, 515); + jjCheckNAddStates(589, 592); break; - case 227: + case 251: if (curChar == 39) - jjCheckNAddTwoStates(214, 215); + jjCheckNAddTwoStates(238, 239); break; - case 229: + case 253: if (curChar == 12) - jjCheckNAddStates(512, 515); + jjCheckNAddStates(589, 592); break; - case 231: + case 255: if ((0xffffffff00000000L & l) != 0L) - jjCheckNAddStates(512, 515); + jjCheckNAddStates(589, 592); break; - case 232: + case 256: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(516, 521); + jjCheckNAddStates(593, 598); break; - case 233: + case 257: if ((0x100003600L & l) != 0L) - jjCheckNAddStates(512, 515); + jjCheckNAddStates(589, 592); break; - case 234: + case 258: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(522, 530); + jjCheckNAddStates(599, 607); break; - case 235: + case 259: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(531, 535); + jjCheckNAddStates(608, 612); break; - case 236: + case 260: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(536, 541); + jjCheckNAddStates(613, 618); break; - case 237: + case 261: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(542, 548); + jjCheckNAddStates(619, 625); break; - case 238: + case 262: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(549, 556); + jjCheckNAddStates(626, 633); break; - case 239: + case 263: if (curChar == 13) - jjCheckNAddStates(512, 515); + jjCheckNAddStates(589, 592); break; - case 240: + case 264: if (curChar == 10) - jjCheckNAddStates(512, 515); + jjCheckNAddStates(589, 592); break; - case 241: + case 265: if (curChar == 13) - jjstateSet[jjnewStateCnt++] = 240; + jjstateSet[jjnewStateCnt++] = 264; break; - case 242: + case 266: if (curChar == 34) - jjCheckNAddStates(557, 560); + jjCheckNAddStates(634, 637); break; - case 243: + case 267: if ((0xfffffffb00000200L & l) != 0L) - jjCheckNAddStates(557, 560); + jjCheckNAddStates(634, 637); break; - case 244: + case 268: if (curChar == 34) - jjCheckNAddTwoStates(214, 215); + jjCheckNAddTwoStates(238, 239); break; - case 246: + case 270: if (curChar == 12) - jjCheckNAddStates(557, 560); + jjCheckNAddStates(634, 637); break; - case 248: + case 272: if ((0xffffffff00000000L & l) != 0L) - jjCheckNAddStates(557, 560); + jjCheckNAddStates(634, 637); break; - case 249: + case 273: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(561, 566); + jjCheckNAddStates(638, 643); break; - case 250: + case 274: if ((0x100003600L & l) != 0L) - jjCheckNAddStates(557, 560); + jjCheckNAddStates(634, 637); break; - case 251: + case 275: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(567, 575); + jjCheckNAddStates(644, 652); break; - case 252: + case 276: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(576, 580); + jjCheckNAddStates(653, 657); break; - case 253: + case 277: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(581, 586); + jjCheckNAddStates(658, 663); break; - case 254: + case 278: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(587, 593); + jjCheckNAddStates(664, 670); break; - case 255: + case 279: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(594, 601); + jjCheckNAddStates(671, 678); break; - case 256: + case 280: if (curChar == 13) - jjCheckNAddStates(557, 560); + jjCheckNAddStates(634, 637); break; - case 257: + case 281: if (curChar == 10) - jjCheckNAddStates(557, 560); + jjCheckNAddStates(634, 637); break; - case 258: + case 282: if (curChar == 13) - jjstateSet[jjnewStateCnt++] = 257; + jjstateSet[jjnewStateCnt++] = 281; break; - case 259: + case 283: if ((0x100003600L & l) != 0L) - jjCheckNAddStates(602, 608); + jjCheckNAddStates(679, 685); break; - case 262: + case 286: if (curChar == 43) - jjAddStates(609, 610); + jjAddStates(686, 687); break; - case 263: + case 287: if (curChar != 63) break; - if (kind > 101) - kind = 101; - jjstateSet[jjnewStateCnt++] = 264; + if (kind > 99) + kind = 99; + jjstateSet[jjnewStateCnt++] = 288; break; - case 264: + case 288: if (curChar != 63) break; - if (kind > 101) - kind = 101; - jjCheckNAddStates(611, 614); + if (kind > 99) + kind = 99; + jjCheckNAddStates(688, 691); break; - case 265: - if (curChar == 63 && kind > 101) - kind = 101; + case 289: + if (curChar == 63 && kind > 99) + kind = 99; break; - case 266: - case 281: - case 285: - case 288: - case 291: + case 290: + case 305: + case 309: + case 312: + case 315: if (curChar != 63) break; - if (kind > 101) - kind = 101; - jjCheckNAdd(265); + if (kind > 99) + kind = 99; + jjCheckNAdd(289); break; - case 267: + case 291: if (curChar != 63) break; - if (kind > 101) - kind = 101; - jjCheckNAddTwoStates(265, 266); + if (kind > 99) + kind = 99; + jjCheckNAddTwoStates(289, 290); break; - case 268: + case 292: if (curChar != 63) break; - if (kind > 101) - kind = 101; - jjCheckNAddStates(615, 617); + if (kind > 99) + kind = 99; + jjCheckNAddStates(692, 694); break; - case 269: + case 293: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 101) - kind = 101; - jjAddStates(618, 623); + if (kind > 99) + kind = 99; + jjAddStates(695, 700); break; - case 270: + case 294: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 271; + jjstateSet[jjnewStateCnt++] = 295; break; - case 271: + case 295: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 272; + jjstateSet[jjnewStateCnt++] = 296; break; - case 272: + case 296: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAdd(273); + jjCheckNAdd(297); break; - case 273: - if ((0x3ff000000000000L & l) != 0L && kind > 101) - kind = 101; + case 297: + if ((0x3ff000000000000L & l) != 0L && kind > 99) + kind = 99; break; - case 274: + case 298: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 275; + jjstateSet[jjnewStateCnt++] = 299; break; - case 275: + case 299: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 276; + jjstateSet[jjnewStateCnt++] = 300; break; - case 276: + case 300: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 277; + jjstateSet[jjnewStateCnt++] = 301; break; - case 277: + case 301: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 101) - kind = 101; - jjCheckNAdd(265); + if (kind > 99) + kind = 99; + jjCheckNAdd(289); break; - case 278: + case 302: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 279; + jjstateSet[jjnewStateCnt++] = 303; break; - case 279: + case 303: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 280; + jjstateSet[jjnewStateCnt++] = 304; break; - case 280: + case 304: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 101) - kind = 101; - jjstateSet[jjnewStateCnt++] = 281; + if (kind > 99) + kind = 99; + jjstateSet[jjnewStateCnt++] = 305; break; - case 282: + case 306: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 283; + jjstateSet[jjnewStateCnt++] = 307; break; - case 283: + case 307: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 101) - kind = 101; - jjstateSet[jjnewStateCnt++] = 284; + if (kind > 99) + kind = 99; + jjstateSet[jjnewStateCnt++] = 308; break; - case 284: + case 308: if (curChar != 63) break; - if (kind > 101) - kind = 101; - jjCheckNAddTwoStates(265, 285); + if (kind > 99) + kind = 99; + jjCheckNAddTwoStates(289, 309); break; - case 286: + case 310: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 101) - kind = 101; - jjstateSet[jjnewStateCnt++] = 287; + if (kind > 99) + kind = 99; + jjstateSet[jjnewStateCnt++] = 311; break; - case 287: + case 311: if (curChar != 63) break; - if (kind > 101) - kind = 101; - jjCheckNAddStates(624, 626); + if (kind > 99) + kind = 99; + jjCheckNAddStates(701, 703); break; - case 289: + case 313: if (curChar != 63) break; - if (kind > 101) - kind = 101; - jjCheckNAddTwoStates(265, 288); + if (kind > 99) + kind = 99; + jjCheckNAddTwoStates(289, 312); break; - case 290: + case 314: if (curChar != 63) break; - if (kind > 101) - kind = 101; - jjCheckNAddStates(627, 630); + if (kind > 99) + kind = 99; + jjCheckNAddStates(704, 707); break; - case 292: + case 316: if (curChar != 63) break; - if (kind > 101) - kind = 101; - jjCheckNAddTwoStates(265, 291); + if (kind > 99) + kind = 99; + jjCheckNAddTwoStates(289, 315); break; - case 293: + case 317: if (curChar != 63) break; - if (kind > 101) - kind = 101; - jjCheckNAddStates(631, 633); + if (kind > 99) + kind = 99; + jjCheckNAddStates(708, 710); break; - case 294: + case 318: if (curChar == 43) - jjstateSet[jjnewStateCnt++] = 295; + jjstateSet[jjnewStateCnt++] = 319; break; - case 295: + case 319: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(296, 302); + jjCheckNAddTwoStates(320, 326); break; - case 296: + case 320: if (curChar == 45) - jjstateSet[jjnewStateCnt++] = 297; + jjstateSet[jjnewStateCnt++] = 321; break; - case 297: + case 321: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 101) - kind = 101; - jjstateSet[jjnewStateCnt++] = 298; + if (kind > 99) + kind = 99; + jjstateSet[jjnewStateCnt++] = 322; break; - case 298: + case 322: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 101) - kind = 101; - jjCheckNAddStates(634, 637); + if (kind > 99) + kind = 99; + jjCheckNAddStates(711, 714); break; - case 299: + case 323: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 101) - kind = 101; - jjCheckNAdd(273); + if (kind > 99) + kind = 99; + jjCheckNAdd(297); break; - case 300: + case 324: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 101) - kind = 101; - jjCheckNAddTwoStates(273, 299); + if (kind > 99) + kind = 99; + jjCheckNAddTwoStates(297, 323); break; - case 301: + case 325: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 101) - kind = 101; - jjCheckNAddStates(638, 640); + if (kind > 99) + kind = 99; + jjCheckNAddStates(715, 717); break; - case 302: + case 326: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(641, 645); + jjCheckNAddStates(718, 722); break; - case 303: + case 327: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAdd(296); + jjCheckNAdd(320); break; - case 304: + case 328: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(303, 296); + jjCheckNAddTwoStates(327, 320); break; - case 305: + case 329: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(646, 648); + jjCheckNAddStates(723, 725); break; - case 306: + case 330: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(649, 652); + jjCheckNAddStates(726, 729); break; - case 308: + case 332: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(653, 656); + if (kind > 60) + kind = 60; + jjCheckNAddStates(730, 733); break; - case 309: + case 333: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(657, 663); + if (kind > 60) + kind = 60; + jjCheckNAddStates(734, 740); break; - case 310: + case 334: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(664, 666); + if (kind > 60) + kind = 60; + jjCheckNAddStates(741, 743); break; - case 311: + case 335: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(667, 670); + if (kind > 60) + kind = 60; + jjCheckNAddStates(744, 747); break; - case 312: + case 336: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(671, 675); + if (kind > 60) + kind = 60; + jjCheckNAddStates(748, 752); break; - case 313: + case 337: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(676, 681); + if (kind > 60) + kind = 60; + jjCheckNAddStates(753, 758); break; - case 314: + case 338: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(682, 686); + jjCheckNAddStates(759, 763); break; - case 315: + case 339: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(687, 694); + jjCheckNAddStates(764, 771); break; - case 316: + case 340: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(695, 698); + jjCheckNAddStates(772, 775); break; - case 317: + case 341: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(699, 703); + jjCheckNAddStates(776, 780); break; - case 318: + case 342: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(704, 709); + jjCheckNAddStates(781, 786); break; - case 319: + case 343: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(710, 716); + jjCheckNAddStates(787, 793); break; - case 320: + case 344: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 63) - kind = 63; - jjCheckNAddStates(5, 78); + if (kind > 61) + kind = 61; + jjCheckNAddStates(8, 81); break; - case 321: + case 345: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 63) - kind = 63; - jjCheckNAdd(321); + if (kind > 61) + kind = 61; + jjCheckNAdd(345); break; - case 322: + case 346: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(322, 323); + jjCheckNAddTwoStates(346, 347); break; - case 323: + case 347: if (curChar == 46) - jjCheckNAdd(138); + jjCheckNAdd(162); break; - case 324: + case 348: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(324, 140); + jjCheckNAddTwoStates(348, 164); break; - case 325: + case 349: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(325, 326); + jjCheckNAddTwoStates(349, 350); break; - case 326: + case 350: if (curChar == 46) - jjCheckNAdd(139); + jjCheckNAdd(163); break; - case 327: + case 351: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(327, 143); + jjCheckNAddTwoStates(351, 167); break; - case 328: + case 352: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(328, 329); + jjCheckNAddTwoStates(352, 353); break; - case 329: + case 353: if (curChar == 46) - jjCheckNAdd(141); + jjCheckNAdd(165); break; - case 330: + case 354: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(330, 146); + jjCheckNAddTwoStates(354, 170); break; - case 331: + case 355: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(331, 332); + jjCheckNAddTwoStates(355, 356); break; - case 332: + case 356: if (curChar == 46) - jjCheckNAdd(144); + jjCheckNAdd(168); break; - case 333: + case 357: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(333, 149); + jjCheckNAddTwoStates(357, 173); break; - case 334: + case 358: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(334, 335); + jjCheckNAddTwoStates(358, 359); break; - case 335: + case 359: if (curChar == 46) - jjCheckNAdd(147); + jjCheckNAdd(171); break; - case 336: + case 360: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(336, 152); + jjCheckNAddTwoStates(360, 176); break; - case 337: + case 361: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(337, 338); + jjCheckNAddTwoStates(361, 362); break; - case 338: + case 362: if (curChar == 46) - jjCheckNAdd(150); + jjCheckNAdd(174); break; - case 339: + case 363: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(339, 155); + jjCheckNAddTwoStates(363, 179); break; - case 340: + case 364: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(340, 341); + jjCheckNAddTwoStates(364, 365); break; - case 341: + case 365: if (curChar == 46) - jjCheckNAdd(153); + jjCheckNAdd(177); break; - case 342: + case 366: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(342, 158); + jjCheckNAddTwoStates(366, 182); break; - case 343: + case 367: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(343, 344); + jjCheckNAddTwoStates(367, 368); break; - case 344: + case 368: if (curChar == 46) - jjCheckNAdd(156); + jjCheckNAdd(180); break; - case 345: + case 369: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(345, 161); + jjCheckNAddTwoStates(369, 185); break; - case 346: + case 370: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(346, 347); + jjCheckNAddTwoStates(370, 371); break; - case 347: + case 371: if (curChar == 46) - jjCheckNAdd(159); + jjCheckNAdd(183); break; - case 348: + case 372: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(348, 164); + jjCheckNAddTwoStates(372, 188); break; - case 349: + case 373: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(349, 350); + jjCheckNAddTwoStates(373, 374); break; - case 350: + case 374: if (curChar == 46) - jjCheckNAdd(162); + jjCheckNAdd(186); break; - case 351: + case 375: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(351, 168); + jjCheckNAddTwoStates(375, 192); break; - case 352: + case 376: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(352, 353); + jjCheckNAddTwoStates(376, 377); break; - case 353: + case 377: if (curChar == 46) - jjCheckNAdd(165); + jjCheckNAdd(189); break; - case 354: + case 378: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(354, 172); + jjCheckNAddTwoStates(378, 196); break; - case 355: + case 379: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(355, 356); + jjCheckNAddTwoStates(379, 380); break; - case 356: + case 380: if (curChar == 46) - jjCheckNAdd(169); + jjCheckNAdd(193); break; - case 357: + case 381: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(357, 177); + jjCheckNAddTwoStates(381, 201); break; - case 358: + case 382: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(358, 359); + jjCheckNAddTwoStates(382, 383); break; - case 359: + case 383: if (curChar == 46) - jjCheckNAdd(173); + jjCheckNAdd(197); break; - case 360: + case 384: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(360, 180); + jjCheckNAddTwoStates(384, 204); break; - case 361: + case 385: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(361, 362); + jjCheckNAddTwoStates(385, 386); break; - case 362: + case 386: if (curChar == 46) - jjCheckNAdd(178); + jjCheckNAdd(202); break; - case 363: + case 387: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(363, 182); + jjCheckNAddTwoStates(387, 206); break; - case 364: + case 388: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(364, 365); + jjCheckNAddTwoStates(388, 389); break; - case 365: + case 389: if (curChar == 46) - jjCheckNAdd(181); + jjCheckNAdd(205); break; - case 366: + case 390: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(366, 185); + jjCheckNAddTwoStates(390, 209); break; - case 367: + case 391: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(367, 368); + jjCheckNAddTwoStates(391, 392); break; - case 368: + case 392: if (curChar == 46) - jjCheckNAdd(183); + jjCheckNAdd(207); break; - case 369: + case 393: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(369, 189); + jjCheckNAddTwoStates(393, 213); break; - case 370: + case 394: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(370, 371); + jjCheckNAddTwoStates(394, 395); break; - case 371: + case 395: if (curChar == 46) - jjCheckNAdd(186); + jjCheckNAdd(210); break; - case 372: + case 396: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(717, 721); + jjCheckNAddStates(794, 798); break; - case 373: + case 397: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(373, 374); + jjCheckNAddTwoStates(397, 398); break; - case 374: + case 398: if (curChar == 46) - jjCheckNAdd(190); + jjCheckNAdd(214); break; default : break; } @@ -2364,1184 +2429,1250 @@ private int jjMoveNfa_0(int startState, int curPos) { switch(jjstateSet[--i]) { - case 377: + case 400: if ((0x7fffffe87fffffeL & l) != 0L) - { - if (kind > 84) - kind = 84; - jjCheckNAddTwoStates(61, 62); - } + jjCheckNAddStates(0, 2); else if (curChar == 92) - jjAddStates(722, 723); - break; - case 134: - if ((0x7fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(115, 117); - if ((0x7fffffe07fffffeL & l) != 0L) + jjCheckNAddTwoStates(119, 120); + if ((0x7fffffe87fffffeL & l) != 0L) { - if (kind > 62) - kind = 62; - jjCheckNAddTwoStates(93, 94); + if (kind > 60) + kind = 60; + jjCheckNAddTwoStates(117, 118); } + else if (curChar == 92) + jjCheckNAddTwoStates(130, 131); break; - case 72: + case 96: if ((0x7fffffe07fffffeL & l) != 0L) { - if (kind > 90) - kind = 90; - jjCheckNAddTwoStates(74, 75); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(98, 99); } else if (curChar == 92) - jjCheckNAddTwoStates(76, 86); + jjCheckNAddTwoStates(100, 110); break; - case 4: + case 158: + if ((0x7fffffe07fffffeL & l) != 0L) + jjCheckNAddStates(0, 2); if ((0x7fffffe07fffffeL & l) != 0L) { - if (kind > 62) - kind = 62; - jjCheckNAddStates(724, 728); + if (kind > 60) + kind = 60; + jjCheckNAddTwoStates(117, 118); } - else if (curChar == 92) - jjCheckNAddStates(729, 732); - else if (curChar == 64) - jjAddStates(733, 736); - if ((0x20000000200000L & l) != 0L) - jjAddStates(737, 739); break; - case 378: + case 401: if ((0x7fffffe87fffffeL & l) != 0L) { - if (kind > 90) - kind = 90; - jjCheckNAddTwoStates(74, 75); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(98, 99); } else if (curChar == 92) - jjCheckNAddTwoStates(76, 77); + jjCheckNAddTwoStates(100, 101); break; - case 375: - if ((0x7fffffe87fffffeL & l) != 0L) - jjCheckNAddStates(115, 117); - else if (curChar == 92) - jjCheckNAddTwoStates(95, 96); - if ((0x7fffffe87fffffeL & l) != 0L) + case 4: + if ((0x7fffffe07fffffeL & l) != 0L) { - if (kind > 62) - kind = 62; - jjCheckNAddTwoStates(93, 94); + if (kind > 60) + kind = 60; + jjCheckNAddStates(799, 803); } else if (curChar == 92) - jjCheckNAddTwoStates(106, 107); + jjCheckNAddStates(804, 807); + else if (curChar == 64) + jjAddStates(808, 811); + if ((0x20000000200000L & l) != 0L) + jjAddStates(812, 814); break; case 2: - if (kind > 8) - kind = 8; + if (kind > 5) + kind = 5; break; - case 6: - case 11: - if ((0x7fffffffffffffffL & l) != 0L) - jjCheckNAddStates(111, 114); + case 5: + if (curChar == 123) + jjstateSet[jjnewStateCnt++] = 6; break; case 8: - if (curChar == 92) - jjAddStates(740, 743); + if ((0x7fffffe07fffffeL & l) != 0L) + jjCheckNAddStates(122, 124); + break; + case 9: + if ((0x7fffffe87fffffeL & l) != 0L) + jjCheckNAddStates(122, 124); break; case 10: + if (curChar == 125 && kind > 31) + kind = 31; + break; + case 11: if (curChar == 92) - jjAddStates(744, 745); + jjCheckNAddTwoStates(12, 13); break; case 12: - if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(118, 123); + if ((0x7fffffffffffffffL & l) != 0L) + jjCheckNAddStates(122, 124); break; - case 14: + case 13: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(124, 132); + jjCheckNAddStates(125, 129); break; case 15: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(133, 137); + jjCheckNAddStates(130, 137); break; case 16: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(138, 143); + jjCheckNAddStates(138, 141); break; case 17: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(144, 150); + jjCheckNAddStates(142, 146); break; case 18: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(151, 158); + jjCheckNAddStates(147, 152); + break; + case 19: + if ((0x7e0000007eL & l) != 0L) + jjCheckNAddStates(153, 159); + break; + case 21: + if (curChar == 92) + jjCheckNAddTwoStates(12, 22); + break; + case 22: + if ((0x7e0000007eL & l) != 0L) + jjCheckNAddStates(160, 164); break; case 23: - case 28: - if ((0x7fffffffffffffffL & l) != 0L) - jjCheckNAddStates(107, 110); + if ((0x7e0000007eL & l) != 0L) + jjCheckNAddStates(165, 172); + break; + case 24: + if ((0x7e0000007eL & l) != 0L) + jjCheckNAddStates(173, 176); break; case 25: - if (curChar == 92) - jjAddStates(746, 749); + if ((0x7e0000007eL & l) != 0L) + jjCheckNAddStates(177, 181); + break; + case 26: + if ((0x7e0000007eL & l) != 0L) + jjCheckNAddStates(182, 187); break; case 27: + if ((0x7e0000007eL & l) != 0L) + jjCheckNAddStates(188, 194); + break; + case 30: + case 35: + if ((0x7fffffffffffffffL & l) != 0L) + jjCheckNAddStates(114, 117); + break; + case 32: if (curChar == 92) - jjAddStates(750, 751); + jjAddStates(815, 818); break; - case 29: + case 34: + if (curChar == 92) + jjAddStates(819, 820); + break; + case 36: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(159, 164); + jjCheckNAddStates(195, 200); break; - case 31: + case 38: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(165, 173); + jjCheckNAddStates(201, 209); break; - case 32: + case 39: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(174, 178); + jjCheckNAddStates(210, 214); break; - case 33: + case 40: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(179, 184); + jjCheckNAddStates(215, 220); break; - case 34: + case 41: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(185, 191); + jjCheckNAddStates(221, 227); break; - case 35: + case 42: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(192, 199); + jjCheckNAddStates(228, 235); break; - case 41: + case 47: + case 52: + if ((0x7fffffffffffffffL & l) != 0L) + jjCheckNAddStates(110, 113); + break; + case 49: + if (curChar == 92) + jjAddStates(821, 824); + break; + case 51: + if (curChar == 92) + jjAddStates(825, 826); + break; + case 53: + if ((0x7e0000007eL & l) != 0L) + jjCheckNAddStates(236, 241); + break; + case 55: + if ((0x7e0000007eL & l) != 0L) + jjCheckNAddStates(242, 250); + break; + case 56: + if ((0x7e0000007eL & l) != 0L) + jjCheckNAddStates(251, 255); + break; + case 57: + if ((0x7e0000007eL & l) != 0L) + jjCheckNAddStates(256, 261); + break; + case 58: + if ((0x7e0000007eL & l) != 0L) + jjCheckNAddStates(262, 268); + break; + case 59: + if ((0x7e0000007eL & l) != 0L) + jjCheckNAddStates(269, 276); + break; + case 65: if ((0x7fffffe07fffffeL & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddTwoStates(42, 43); + if (kind > 64) + kind = 64; + jjCheckNAddTwoStates(66, 67); break; - case 42: + case 66: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddTwoStates(42, 43); + if (kind > 64) + kind = 64; + jjCheckNAddTwoStates(66, 67); break; - case 43: + case 67: if (curChar == 92) - jjCheckNAddTwoStates(44, 45); + jjCheckNAddTwoStates(68, 69); break; - case 44: + case 68: if ((0x7fffffffffffffffL & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddTwoStates(42, 43); + if (kind > 64) + kind = 64; + jjCheckNAddTwoStates(66, 67); break; - case 45: + case 69: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(200, 203); + if (kind > 64) + kind = 64; + jjCheckNAddStates(277, 280); break; - case 47: + case 71: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(204, 210); + if (kind > 64) + kind = 64; + jjCheckNAddStates(281, 287); break; - case 48: + case 72: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(211, 213); + if (kind > 64) + kind = 64; + jjCheckNAddStates(288, 290); break; - case 49: + case 73: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(214, 217); + if (kind > 64) + kind = 64; + jjCheckNAddStates(291, 294); break; - case 50: + case 74: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(218, 222); + if (kind > 64) + kind = 64; + jjCheckNAddStates(295, 299); break; - case 51: + case 75: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(223, 228); + if (kind > 64) + kind = 64; + jjCheckNAddStates(300, 305); break; - case 53: + case 77: if (curChar == 92) - jjCheckNAddTwoStates(44, 54); + jjCheckNAddTwoStates(68, 78); break; - case 54: + case 78: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(229, 232); + if (kind > 64) + kind = 64; + jjCheckNAddStates(306, 309); break; - case 55: + case 79: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(233, 239); + if (kind > 64) + kind = 64; + jjCheckNAddStates(310, 316); break; - case 56: + case 80: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(240, 242); + if (kind > 64) + kind = 64; + jjCheckNAddStates(317, 319); break; - case 57: + case 81: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(243, 246); + if (kind > 64) + kind = 64; + jjCheckNAddStates(320, 323); break; - case 58: + case 82: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(247, 251); + if (kind > 64) + kind = 64; + jjCheckNAddStates(324, 328); break; - case 59: + case 83: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddStates(252, 257); + if (kind > 64) + kind = 64; + jjCheckNAddStates(329, 334); break; - case 61: + case 85: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddTwoStates(61, 62); + if (kind > 82) + kind = 82; + jjCheckNAddTwoStates(85, 86); break; - case 62: + case 86: if (curChar == 92) - jjAddStates(722, 723); + jjAddStates(827, 828); break; - case 63: + case 87: if ((0x7fffffffffffffffL & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddTwoStates(61, 62); + if (kind > 82) + kind = 82; + jjCheckNAddTwoStates(85, 86); break; - case 64: + case 88: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddStates(258, 261); + if (kind > 82) + kind = 82; + jjCheckNAddStates(335, 338); break; - case 66: + case 90: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddStates(262, 268); + if (kind > 82) + kind = 82; + jjCheckNAddStates(339, 345); break; - case 67: + case 91: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddStates(269, 271); + if (kind > 82) + kind = 82; + jjCheckNAddStates(346, 348); break; - case 68: + case 92: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddStates(272, 275); + if (kind > 82) + kind = 82; + jjCheckNAddStates(349, 352); break; - case 69: + case 93: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddStates(276, 280); + if (kind > 82) + kind = 82; + jjCheckNAddStates(353, 357); break; - case 70: + case 94: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 84) - kind = 84; - jjCheckNAddStates(281, 286); + if (kind > 82) + kind = 82; + jjCheckNAddStates(358, 363); break; - case 71: + case 95: if (curChar == 64) - jjAddStates(733, 736); + jjAddStates(808, 811); break; - case 73: + case 97: if ((0x7fffffe07fffffeL & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddTwoStates(74, 75); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(98, 99); break; - case 74: + case 98: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddTwoStates(74, 75); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(98, 99); break; - case 75: + case 99: if (curChar == 92) - jjCheckNAddTwoStates(76, 77); + jjCheckNAddTwoStates(100, 101); break; - case 76: + case 100: if ((0x7fffffffffffffffL & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddTwoStates(74, 75); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(98, 99); break; - case 77: + case 101: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(287, 290); + if (kind > 88) + kind = 88; + jjCheckNAddStates(364, 367); break; - case 79: + case 103: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(291, 297); + if (kind > 88) + kind = 88; + jjCheckNAddStates(368, 374); break; - case 80: + case 104: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(298, 300); + if (kind > 88) + kind = 88; + jjCheckNAddStates(375, 377); break; - case 81: + case 105: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(301, 304); + if (kind > 88) + kind = 88; + jjCheckNAddStates(378, 381); break; - case 82: + case 106: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(305, 309); + if (kind > 88) + kind = 88; + jjCheckNAddStates(382, 386); break; - case 83: + case 107: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(310, 315); + if (kind > 88) + kind = 88; + jjCheckNAddStates(387, 392); break; - case 85: + case 109: if (curChar == 92) - jjCheckNAddTwoStates(76, 86); + jjCheckNAddTwoStates(100, 110); break; - case 86: + case 110: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(316, 319); + if (kind > 88) + kind = 88; + jjCheckNAddStates(393, 396); break; - case 87: + case 111: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(320, 326); + if (kind > 88) + kind = 88; + jjCheckNAddStates(397, 403); break; - case 88: + case 112: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(327, 329); + if (kind > 88) + kind = 88; + jjCheckNAddStates(404, 406); break; - case 89: + case 113: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(330, 333); + if (kind > 88) + kind = 88; + jjCheckNAddStates(407, 410); break; - case 90: + case 114: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(334, 338); + if (kind > 88) + kind = 88; + jjCheckNAddStates(411, 415); break; - case 91: + case 115: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddStates(339, 344); + if (kind > 88) + kind = 88; + jjCheckNAddStates(416, 421); break; - case 93: + case 117: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddTwoStates(93, 94); + if (kind > 60) + kind = 60; + jjCheckNAddTwoStates(117, 118); break; - case 94: + case 118: if (curChar == 92) - jjCheckNAddTwoStates(95, 96); + jjCheckNAddTwoStates(119, 120); break; - case 95: + case 119: if ((0x7fffffffffffffffL & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddTwoStates(93, 94); + if (kind > 60) + kind = 60; + jjCheckNAddTwoStates(117, 118); break; - case 96: + case 120: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(345, 348); + if (kind > 60) + kind = 60; + jjCheckNAddStates(422, 425); break; - case 98: + case 122: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(349, 355); + if (kind > 60) + kind = 60; + jjCheckNAddStates(426, 432); break; - case 99: + case 123: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(356, 358); + if (kind > 60) + kind = 60; + jjCheckNAddStates(433, 435); break; - case 100: + case 124: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(359, 362); + if (kind > 60) + kind = 60; + jjCheckNAddStates(436, 439); break; - case 101: + case 125: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(363, 367); + if (kind > 60) + kind = 60; + jjCheckNAddStates(440, 444); break; - case 102: + case 126: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(368, 373); + if (kind > 60) + kind = 60; + jjCheckNAddStates(445, 450); break; - case 103: + case 127: if ((0x7fffffe87fffffeL & l) != 0L) - jjCheckNAddStates(115, 117); + jjCheckNAddStates(0, 2); break; - case 105: + case 129: if (curChar == 92) - jjCheckNAddTwoStates(106, 107); + jjCheckNAddTwoStates(130, 131); break; - case 106: + case 130: if ((0x7fffffffffffffffL & l) != 0L) - jjCheckNAddStates(115, 117); + jjCheckNAddStates(0, 2); break; - case 107: + case 131: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(374, 378); + jjCheckNAddStates(451, 455); break; - case 109: + case 133: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(379, 386); + jjCheckNAddStates(456, 463); break; - case 110: + case 134: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(387, 390); + jjCheckNAddStates(464, 467); break; - case 111: + case 135: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(391, 395); + jjCheckNAddStates(468, 472); break; - case 112: + case 136: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(396, 401); + jjCheckNAddStates(473, 478); break; - case 113: + case 137: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(402, 408); + jjCheckNAddStates(479, 485); break; - case 116: - if ((0x10000000100000L & l) != 0L && kind > 60) - kind = 60; + case 140: + if ((0x10000000100000L & l) != 0L && kind > 58) + kind = 58; break; - case 117: + case 141: if ((0x100000001000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 116; + jjstateSet[jjnewStateCnt++] = 140; break; - case 118: + case 142: if ((0x20000000200000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 117; + jjstateSet[jjnewStateCnt++] = 141; break; - case 119: + case 143: if ((0x200000002L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 118; + jjstateSet[jjnewStateCnt++] = 142; break; - case 120: + case 144: if ((0x4000000040L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 119; + jjstateSet[jjnewStateCnt++] = 143; break; - case 121: + case 145: if ((0x2000000020L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 120; + jjstateSet[jjnewStateCnt++] = 144; break; - case 122: + case 146: if ((0x1000000010L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 121; + jjstateSet[jjnewStateCnt++] = 145; break; - case 124: - if ((0x10000000100000L & l) != 0L && kind > 91) - kind = 91; + case 148: + if ((0x10000000100000L & l) != 0L && kind > 89) + kind = 89; break; - case 125: + case 149: if ((0x400000004000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 124; + jjstateSet[jjnewStateCnt++] = 148; break; - case 126: + case 150: if ((0x200000002L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 125; + jjstateSet[jjnewStateCnt++] = 149; break; - case 127: + case 151: if ((0x10000000100000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 126; + jjstateSet[jjnewStateCnt++] = 150; break; - case 128: + case 152: if ((0x4000000040000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 127; + jjstateSet[jjnewStateCnt++] = 151; break; - case 129: + case 153: if ((0x800000008000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 128; + jjstateSet[jjnewStateCnt++] = 152; break; - case 130: + case 154: if ((0x1000000010000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 129; + jjstateSet[jjnewStateCnt++] = 153; break; - case 131: + case 155: if ((0x200000002000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 130; + jjstateSet[jjnewStateCnt++] = 154; break; - case 132: + case 156: if ((0x20000000200L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 131; + jjstateSet[jjnewStateCnt++] = 155; break; - case 135: + case 159: if ((0x7fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(115, 117); + jjCheckNAddStates(0, 2); break; - case 136: + case 160: if ((0x7fffffe07fffffeL & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(724, 728); + if (kind > 60) + kind = 60; + jjCheckNAddStates(799, 803); break; - case 142: - if ((0x10000000100000L & l) != 0L && kind > 68) - kind = 68; + case 166: + if ((0x10000000100000L & l) != 0L && kind > 66) + kind = 66; break; - case 143: + case 167: if ((0x1000000010000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 142; + jjstateSet[jjnewStateCnt++] = 166; break; - case 145: - if ((0x200000002000L & l) != 0L && kind > 69) - kind = 69; + case 169: + if ((0x200000002000L & l) != 0L && kind > 67) + kind = 67; break; - case 146: + case 170: if ((0x200000002000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 145; + jjstateSet[jjnewStateCnt++] = 169; break; - case 148: - if ((0x200000002000L & l) != 0L && kind > 70) - kind = 70; + case 172: + if ((0x200000002000L & l) != 0L && kind > 68) + kind = 68; break; - case 149: + case 173: if ((0x800000008L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 148; + jjstateSet[jjnewStateCnt++] = 172; break; - case 151: - if ((0x800000008L & l) != 0L && kind > 71) - kind = 71; + case 175: + if ((0x800000008L & l) != 0L && kind > 69) + kind = 69; break; - case 152: + case 176: if ((0x1000000010000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 151; + jjstateSet[jjnewStateCnt++] = 175; break; - case 154: - if ((0x400000004000L & l) != 0L && kind > 72) - kind = 72; + case 178: + if ((0x400000004000L & l) != 0L && kind > 70) + kind = 70; break; - case 155: + case 179: if ((0x20000000200L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 154; + jjstateSet[jjnewStateCnt++] = 178; break; - case 157: - if ((0x100000001000000L & l) != 0L && kind > 73) - kind = 73; + case 181: + if ((0x100000001000000L & l) != 0L && kind > 71) + kind = 71; break; - case 158: + case 182: if ((0x1000000010000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 157; + jjstateSet[jjnewStateCnt++] = 181; break; - case 160: - if ((0x200000002000L & l) != 0L && kind > 74) - kind = 74; + case 184: + if ((0x200000002000L & l) != 0L && kind > 72) + kind = 72; break; - case 161: + case 185: if ((0x2000000020L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 160; + jjstateSet[jjnewStateCnt++] = 184; break; - case 163: - if ((0x100000001000000L & l) != 0L && kind > 75) - kind = 75; + case 187: + if ((0x100000001000000L & l) != 0L && kind > 73) + kind = 73; break; - case 164: + case 188: if ((0x2000000020L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 163; + jjstateSet[jjnewStateCnt++] = 187; break; - case 166: - if ((0x8000000080L & l) != 0L && kind > 76) - kind = 76; + case 190: + if ((0x8000000080L & l) != 0L && kind > 74) + kind = 74; break; - case 167: + case 191: if ((0x2000000020L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 166; + jjstateSet[jjnewStateCnt++] = 190; break; - case 168: + case 192: if ((0x1000000010L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 167; + jjstateSet[jjnewStateCnt++] = 191; break; - case 170: - if ((0x1000000010L & l) != 0L && kind > 77) - kind = 77; + case 194: + if ((0x1000000010L & l) != 0L && kind > 75) + kind = 75; break; - case 171: + case 195: if ((0x200000002L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 170; + jjstateSet[jjnewStateCnt++] = 194; break; - case 172: + case 196: if ((0x4000000040000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 171; + jjstateSet[jjnewStateCnt++] = 195; break; - case 174: - if ((0x1000000010L & l) != 0L && kind > 78) - kind = 78; + case 198: + if ((0x1000000010L & l) != 0L && kind > 76) + kind = 76; break; - case 175: + case 199: if ((0x200000002L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 174; + jjstateSet[jjnewStateCnt++] = 198; break; - case 176: + case 200: if ((0x4000000040000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 175; + jjstateSet[jjnewStateCnt++] = 199; break; - case 177: + case 201: if ((0x8000000080L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 176; + jjstateSet[jjnewStateCnt++] = 200; break; - case 179: - if ((0x8000000080000L & l) != 0L && kind > 79) - kind = 79; + case 203: + if ((0x8000000080000L & l) != 0L && kind > 77) + kind = 77; break; - case 180: + case 204: if ((0x200000002000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 179; + jjstateSet[jjnewStateCnt++] = 203; break; - case 182: - if ((0x8000000080000L & l) != 0L && kind > 80) - kind = 80; + case 206: + if ((0x8000000080000L & l) != 0L && kind > 78) + kind = 78; break; - case 184: - if ((0x400000004000000L & l) != 0L && kind > 81) - kind = 81; + case 208: + if ((0x400000004000000L & l) != 0L && kind > 79) + kind = 79; break; - case 185: + case 209: if ((0x10000000100L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 184; + jjstateSet[jjnewStateCnt++] = 208; break; - case 187: - if ((0x400000004000000L & l) != 0L && kind > 82) - kind = 82; + case 211: + if ((0x400000004000000L & l) != 0L && kind > 80) + kind = 80; break; - case 188: + case 212: if ((0x10000000100L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 187; + jjstateSet[jjnewStateCnt++] = 211; break; - case 189: + case 213: if ((0x80000000800L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 188; + jjstateSet[jjnewStateCnt++] = 212; break; - case 192: + case 216: if ((0x7fffffe07fffffeL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddTwoStates(193, 194); + if (kind > 81) + kind = 81; + jjCheckNAddTwoStates(217, 218); break; - case 193: + case 217: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddTwoStates(193, 194); + if (kind > 81) + kind = 81; + jjCheckNAddTwoStates(217, 218); break; - case 194: + case 218: if (curChar == 92) - jjCheckNAddTwoStates(195, 196); + jjCheckNAddTwoStates(219, 220); break; - case 195: + case 219: if ((0x7fffffffffffffffL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddTwoStates(193, 194); + if (kind > 81) + kind = 81; + jjCheckNAddTwoStates(217, 218); break; - case 196: + case 220: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(409, 412); + if (kind > 81) + kind = 81; + jjCheckNAddStates(486, 489); break; - case 198: + case 222: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(413, 419); + if (kind > 81) + kind = 81; + jjCheckNAddStates(490, 496); break; - case 199: + case 223: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(420, 422); + if (kind > 81) + kind = 81; + jjCheckNAddStates(497, 499); break; - case 200: + case 224: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(423, 426); + if (kind > 81) + kind = 81; + jjCheckNAddStates(500, 503); break; - case 201: + case 225: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(427, 431); + if (kind > 81) + kind = 81; + jjCheckNAddStates(504, 508); break; - case 202: + case 226: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(432, 437); + if (kind > 81) + kind = 81; + jjCheckNAddStates(509, 514); break; - case 204: + case 228: if (curChar == 92) - jjCheckNAddTwoStates(195, 205); + jjCheckNAddTwoStates(219, 229); break; - case 205: + case 229: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(438, 441); + if (kind > 81) + kind = 81; + jjCheckNAddStates(515, 518); break; - case 206: + case 230: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(442, 448); + if (kind > 81) + kind = 81; + jjCheckNAddStates(519, 525); break; - case 207: + case 231: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(449, 451); + if (kind > 81) + kind = 81; + jjCheckNAddStates(526, 528); break; - case 208: + case 232: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(452, 455); + if (kind > 81) + kind = 81; + jjCheckNAddStates(529, 532); break; - case 209: + case 233: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(456, 460); + if (kind > 81) + kind = 81; + jjCheckNAddStates(533, 537); break; - case 210: + case 234: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddStates(461, 466); + if (kind > 81) + kind = 81; + jjCheckNAddStates(538, 543); break; - case 211: + case 235: if ((0x20000000200000L & l) != 0L) - jjAddStates(737, 739); + jjAddStates(812, 814); break; - case 213: - case 217: + case 237: + case 241: if ((0x7fffffffffffffffL & l) != 0L) - jjCheckNAddStates(473, 476); + jjCheckNAddStates(550, 553); break; - case 216: + case 240: if (curChar == 92) - jjAddStates(752, 753); + jjAddStates(829, 830); break; - case 218: + case 242: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(477, 481); + jjCheckNAddStates(554, 558); break; - case 220: + case 244: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(482, 489); + jjCheckNAddStates(559, 566); break; - case 221: + case 245: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(490, 493); + jjCheckNAddStates(567, 570); break; - case 222: + case 246: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(494, 498); + jjCheckNAddStates(571, 575); break; - case 223: + case 247: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(499, 504); + jjCheckNAddStates(576, 581); break; - case 224: + case 248: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(505, 511); + jjCheckNAddStates(582, 588); break; - case 226: - case 231: + case 250: + case 255: if ((0x7fffffffffffffffL & l) != 0L) - jjCheckNAddStates(512, 515); + jjCheckNAddStates(589, 592); break; - case 228: + case 252: if (curChar == 92) - jjAddStates(754, 757); + jjAddStates(831, 834); break; - case 230: + case 254: if (curChar == 92) - jjAddStates(758, 759); + jjAddStates(835, 836); break; - case 232: + case 256: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(516, 521); + jjCheckNAddStates(593, 598); break; - case 234: + case 258: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(522, 530); + jjCheckNAddStates(599, 607); break; - case 235: + case 259: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(531, 535); + jjCheckNAddStates(608, 612); break; - case 236: + case 260: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(536, 541); + jjCheckNAddStates(613, 618); break; - case 237: + case 261: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(542, 548); + jjCheckNAddStates(619, 625); break; - case 238: + case 262: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(549, 556); + jjCheckNAddStates(626, 633); break; - case 243: - case 248: + case 267: + case 272: if ((0x7fffffffffffffffL & l) != 0L) - jjCheckNAddStates(557, 560); + jjCheckNAddStates(634, 637); break; - case 245: + case 269: if (curChar == 92) - jjAddStates(760, 763); + jjAddStates(837, 840); break; - case 247: + case 271: if (curChar == 92) - jjAddStates(764, 765); + jjAddStates(841, 842); break; - case 249: + case 273: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(561, 566); + jjCheckNAddStates(638, 643); break; - case 251: + case 275: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(567, 575); + jjCheckNAddStates(644, 652); break; - case 252: + case 276: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(576, 580); + jjCheckNAddStates(653, 657); break; - case 253: + case 277: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(581, 586); + jjCheckNAddStates(658, 663); break; - case 254: + case 278: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(587, 593); + jjCheckNAddStates(664, 670); break; - case 255: + case 279: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(594, 601); + jjCheckNAddStates(671, 678); break; - case 260: + case 284: if ((0x100000001000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 212; + jjstateSet[jjnewStateCnt++] = 236; break; - case 261: + case 285: if ((0x4000000040000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 260; + jjstateSet[jjnewStateCnt++] = 284; break; - case 269: + case 293: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 101) - kind = 101; - jjAddStates(618, 623); + if (kind > 99) + kind = 99; + jjAddStates(695, 700); break; - case 270: + case 294: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 271; + jjstateSet[jjnewStateCnt++] = 295; break; - case 271: + case 295: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 272; + jjstateSet[jjnewStateCnt++] = 296; break; - case 272: + case 296: if ((0x7e0000007eL & l) != 0L) - jjCheckNAdd(273); + jjCheckNAdd(297); break; - case 273: - if ((0x7e0000007eL & l) != 0L && kind > 101) - kind = 101; + case 297: + if ((0x7e0000007eL & l) != 0L && kind > 99) + kind = 99; break; - case 274: + case 298: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 275; + jjstateSet[jjnewStateCnt++] = 299; break; - case 275: + case 299: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 276; + jjstateSet[jjnewStateCnt++] = 300; break; - case 276: + case 300: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 277; + jjstateSet[jjnewStateCnt++] = 301; break; - case 277: + case 301: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 101) - kind = 101; - jjstateSet[jjnewStateCnt++] = 265; + if (kind > 99) + kind = 99; + jjstateSet[jjnewStateCnt++] = 289; break; - case 278: + case 302: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 279; + jjstateSet[jjnewStateCnt++] = 303; break; - case 279: + case 303: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 280; + jjstateSet[jjnewStateCnt++] = 304; break; - case 280: + case 304: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 101) - kind = 101; - jjstateSet[jjnewStateCnt++] = 281; + if (kind > 99) + kind = 99; + jjstateSet[jjnewStateCnt++] = 305; break; - case 282: + case 306: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 283; + jjstateSet[jjnewStateCnt++] = 307; break; - case 283: + case 307: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 101) - kind = 101; - jjstateSet[jjnewStateCnt++] = 284; + if (kind > 99) + kind = 99; + jjstateSet[jjnewStateCnt++] = 308; break; - case 286: + case 310: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 101) - kind = 101; - jjstateSet[jjnewStateCnt++] = 287; + if (kind > 99) + kind = 99; + jjstateSet[jjnewStateCnt++] = 311; break; - case 295: + case 319: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddTwoStates(296, 302); + jjCheckNAddTwoStates(320, 326); break; - case 297: + case 321: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 101) - kind = 101; - jjstateSet[jjnewStateCnt++] = 298; + if (kind > 99) + kind = 99; + jjstateSet[jjnewStateCnt++] = 322; break; - case 298: + case 322: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 101) - kind = 101; - jjCheckNAddStates(634, 637); + if (kind > 99) + kind = 99; + jjCheckNAddStates(711, 714); break; - case 299: + case 323: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 101) - kind = 101; - jjCheckNAdd(273); + if (kind > 99) + kind = 99; + jjCheckNAdd(297); break; - case 300: + case 324: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 101) - kind = 101; - jjCheckNAddTwoStates(273, 299); + if (kind > 99) + kind = 99; + jjCheckNAddTwoStates(297, 323); break; - case 301: + case 325: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 101) - kind = 101; - jjCheckNAddStates(638, 640); + if (kind > 99) + kind = 99; + jjCheckNAddStates(715, 717); break; - case 302: + case 326: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(641, 645); + jjCheckNAddStates(718, 722); break; - case 303: + case 327: if ((0x7e0000007eL & l) != 0L) - jjCheckNAdd(296); + jjCheckNAdd(320); break; - case 304: + case 328: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddTwoStates(303, 296); + jjCheckNAddTwoStates(327, 320); break; - case 305: + case 329: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(646, 648); + jjCheckNAddStates(723, 725); break; - case 306: + case 330: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(649, 652); + jjCheckNAddStates(726, 729); break; - case 307: + case 331: if (curChar == 92) - jjCheckNAddStates(729, 732); + jjCheckNAddStates(804, 807); break; - case 308: + case 332: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(653, 656); + if (kind > 60) + kind = 60; + jjCheckNAddStates(730, 733); break; - case 309: + case 333: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(657, 663); + if (kind > 60) + kind = 60; + jjCheckNAddStates(734, 740); break; - case 310: + case 334: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(664, 666); + if (kind > 60) + kind = 60; + jjCheckNAddStates(741, 743); break; - case 311: + case 335: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(667, 670); + if (kind > 60) + kind = 60; + jjCheckNAddStates(744, 747); break; - case 312: + case 336: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(671, 675); + if (kind > 60) + kind = 60; + jjCheckNAddStates(748, 752); break; - case 313: + case 337: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddStates(676, 681); + if (kind > 60) + kind = 60; + jjCheckNAddStates(753, 758); break; - case 314: + case 338: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(682, 686); + jjCheckNAddStates(759, 763); break; - case 315: + case 339: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(687, 694); + jjCheckNAddStates(764, 771); break; - case 316: + case 340: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(695, 698); + jjCheckNAddStates(772, 775); break; - case 317: + case 341: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(699, 703); + jjCheckNAddStates(776, 780); break; - case 318: + case 342: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(704, 709); + jjCheckNAddStates(781, 786); break; - case 319: + case 343: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(710, 716); + jjCheckNAddStates(787, 793); break; default : break; } @@ -3555,107 +3686,112 @@ private int jjMoveNfa_0(int startState, int curPos) { switch(jjstateSet[--i]) { - case 377: - case 61: - case 63: - if ((jjbitVec0[i2] & l2) == 0L) - break; - if (kind > 84) - kind = 84; - jjCheckNAddTwoStates(61, 62); + case 400: + if ((jjbitVec0[i2] & l2) != 0L) + { + if (kind > 60) + kind = 60; + jjCheckNAddTwoStates(117, 118); + } + if ((jjbitVec0[i2] & l2) != 0L) + jjCheckNAddStates(0, 2); break; - case 72: - case 76: + case 96: + case 100: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddTwoStates(74, 75); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(98, 99); break; - case 4: + case 401: + case 98: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 34) - kind = 34; - jjCheckNAddStates(724, 728); + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(98, 99); break; - case 378: - case 74: + case 4: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 90) - kind = 90; - jjCheckNAddTwoStates(74, 75); - break; - case 375: - if ((jjbitVec0[i2] & l2) != 0L) - { - if (kind > 62) - kind = 62; - jjCheckNAddTwoStates(93, 94); - } - if ((jjbitVec0[i2] & l2) != 0L) - jjCheckNAddStates(115, 117); + if (kind > 32) + kind = 32; + jjCheckNAddStates(799, 803); break; case 2: - if ((jjbitVec0[i2] & l2) != 0L && kind > 8) - kind = 8; + if ((jjbitVec0[i2] & l2) != 0L && kind > 5) + kind = 5; break; - case 6: - case 11: + case 9: + case 12: + case 20: if ((jjbitVec0[i2] & l2) != 0L) - jjCheckNAddStates(111, 114); + jjCheckNAddStates(122, 124); break; - case 23: - case 28: + case 30: + case 35: if ((jjbitVec0[i2] & l2) != 0L) - jjCheckNAddStates(107, 110); + jjCheckNAddStates(114, 117); break; - case 42: - case 44: + case 47: case 52: + if ((jjbitVec0[i2] & l2) != 0L) + jjCheckNAddStates(110, 113); + break; + case 66: + case 68: + case 76: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 66) - kind = 66; - jjCheckNAddTwoStates(42, 43); + if (kind > 64) + kind = 64; + jjCheckNAddTwoStates(66, 67); break; - case 93: - case 95: + case 85: + case 87: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 62) - kind = 62; - jjCheckNAddTwoStates(93, 94); + if (kind > 82) + kind = 82; + jjCheckNAddTwoStates(85, 86); break; - case 103: - case 106: + case 117: + case 119: + if ((jjbitVec0[i2] & l2) == 0L) + break; + if (kind > 60) + kind = 60; + jjCheckNAddTwoStates(117, 118); + break; + case 127: + case 130: if ((jjbitVec0[i2] & l2) != 0L) - jjCheckNAddStates(115, 117); + jjCheckNAddStates(0, 2); break; - case 193: - case 195: - case 203: + case 217: + case 219: + case 227: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 83) - kind = 83; - jjCheckNAddTwoStates(193, 194); + if (kind > 81) + kind = 81; + jjCheckNAddTwoStates(217, 218); break; - case 213: - case 217: + case 237: + case 241: if ((jjbitVec0[i2] & l2) != 0L) - jjCheckNAddStates(473, 476); + jjCheckNAddStates(550, 553); break; - case 226: - case 231: + case 250: + case 255: if ((jjbitVec0[i2] & l2) != 0L) - jjCheckNAddStates(512, 515); + jjCheckNAddStates(589, 592); break; - case 243: - case 248: + case 267: + case 272: if ((jjbitVec0[i2] & l2) != 0L) - jjCheckNAddStates(557, 560); + jjCheckNAddStates(634, 637); break; default : break; } @@ -3668,23 +3804,23 @@ private int jjMoveNfa_0(int startState, int curPos) kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 375 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 399 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } } } -private int jjMoveStringLiteralDfa0_4() +private int jjMoveStringLiteralDfa0_3() { switch(curChar) { case 42: - return jjMoveStringLiteralDfa1_4(0x800L); + return jjMoveStringLiteralDfa1_3(0x100L); default : return 1; } } -private int jjMoveStringLiteralDfa1_4(long active0) +private int jjMoveStringLiteralDfa1_3(long active0) { try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { @@ -3693,19 +3829,19 @@ private int jjMoveStringLiteralDfa1_4(long active0) switch(curChar) { case 47: - if ((active0 & 0x800L) != 0L) - return jjStopAtPos(1, 11); + if ((active0 & 0x100L) != 0L) + return jjStopAtPos(1, 8); break; default : return 2; } return 2; } -private int jjMoveStringLiteralDfa0_2() +private int jjMoveStringLiteralDfa0_1() { - return jjMoveNfa_2(0, 0); + return jjMoveNfa_1(0, 0); } -private int jjMoveNfa_2(int startState, int curPos) +private int jjMoveNfa_1(int startState, int curPos) { int startsAt = 0; jjnewStateCnt = 4; @@ -3726,24 +3862,24 @@ private int jjMoveNfa_2(int startState, int curPos) case 0: if ((0xffffffffffffdbffL & l) != 0L) { - if (kind > 6) - kind = 6; + if (kind > 3) + kind = 3; } else if ((0x2400L & l) != 0L) { - if (kind > 7) - kind = 7; + if (kind > 4) + kind = 4; } if (curChar == 13) jjstateSet[jjnewStateCnt++] = 2; break; case 1: - if ((0x2400L & l) != 0L && kind > 7) - kind = 7; + if ((0x2400L & l) != 0L && kind > 4) + kind = 4; break; case 2: - if (curChar == 10 && kind > 7) - kind = 7; + if (curChar == 10 && kind > 4) + kind = 4; break; case 3: if (curChar == 13) @@ -3761,7 +3897,7 @@ private int jjMoveNfa_2(int startState, int curPos) switch(jjstateSet[--i]) { case 0: - kind = 6; + kind = 3; break; default : break; } @@ -3776,8 +3912,8 @@ private int jjMoveNfa_2(int startState, int curPos) switch(jjstateSet[--i]) { case 0: - if ((jjbitVec0[i2] & l2) != 0L && kind > 6) - kind = 6; + if ((jjbitVec0[i2] & l2) != 0L && kind > 3) + kind = 3; break; default : break; } @@ -3796,17 +3932,17 @@ private int jjMoveNfa_2(int startState, int curPos) catch(java.io.IOException e) { return curPos; } } } -private int jjMoveStringLiteralDfa0_3() +private int jjMoveStringLiteralDfa0_2() { switch(curChar) { case 42: - return jjMoveStringLiteralDfa1_3(0x400L); + return jjMoveStringLiteralDfa1_2(0x80L); default : return 1; } } -private int jjMoveStringLiteralDfa1_3(long active0) +private int jjMoveStringLiteralDfa1_2(long active0) { try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { @@ -3815,161 +3951,75 @@ private int jjMoveStringLiteralDfa1_3(long active0) switch(curChar) { case 47: - if ((active0 & 0x400L) != 0L) - return jjStopAtPos(1, 10); + if ((active0 & 0x80L) != 0L) + return jjStopAtPos(1, 7); break; default : return 2; } return 2; } -private final int jjStopStringLiteralDfa_1(int pos, long active0) -{ - switch (pos) - { - default : - return -1; - } -} -private final int jjStartNfa_1(int pos, long active0) -{ - return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0), pos + 1); -} -private int jjMoveStringLiteralDfa0_1() -{ - switch(curChar) - { - case 125: - return jjStopAtPos(0, 4); - default : - return jjMoveNfa_1(0, 0); - } -} -private int jjMoveNfa_1(int startState, int curPos) -{ - int startsAt = 0; - jjnewStateCnt = 1; - int i = 1; - jjstateSet[0] = startState; - int kind = 0x7fffffff; - for (;;) - { - if (++jjround == 0x7fffffff) - ReInitRounds(); - if (curChar < 64) - { - long l = 1L << curChar; - do - { - switch(jjstateSet[--i]) - { - case 0: - kind = 3; - break; - default : break; - } - } while(i != startsAt); - } - else if (curChar < 128) - { - long l = 1L << (curChar & 077); - do - { - switch(jjstateSet[--i]) - { - case 0: - if ((0xdfffffffffffffffL & l) != 0L) - kind = 3; - break; - default : break; - } - } while(i != startsAt); - } - else - { - int i2 = (curChar & 0xff) >> 6; - long l2 = 1L << (curChar & 077); - do - { - switch(jjstateSet[--i]) - { - case 0: - if ((jjbitVec0[i2] & l2) != 0L && kind > 3) - kind = 3; - break; - default : break; - } - } while(i != startsAt); - } - if (kind != 0x7fffffff) - { - jjmatchedKind = kind; - jjmatchedPos = curPos; - kind = 0x7fffffff; - } - ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 1 - (jjnewStateCnt = startsAt))) - return curPos; - try { curChar = input_stream.readChar(); } - catch(java.io.IOException e) { return curPos; } - } -} static final int[] jjnextStates = { - 190, 191, 192, 203, 204, 321, 322, 323, 324, 325, 326, 140, 327, 328, 329, 143, - 330, 331, 332, 146, 333, 334, 335, 149, 336, 337, 338, 152, 339, 340, 341, 155, - 342, 343, 344, 158, 345, 346, 347, 161, 348, 349, 350, 164, 351, 352, 353, 168, - 354, 355, 356, 172, 357, 358, 359, 177, 360, 361, 362, 180, 363, 364, 365, 182, - 366, 367, 368, 185, 369, 370, 371, 189, 372, 373, 374, 191, 192, 203, 204, 138, - 139, 141, 144, 147, 150, 153, 156, 159, 162, 165, 169, 173, 178, 181, 183, 186, - 190, 134, 135, 115, 122, 123, 132, 40, 41, 52, 53, 23, 24, 25, 27, 6, - 7, 8, 10, 103, 104, 105, 6, 13, 7, 8, 10, 14, 6, 15, 13, 7, - 8, 10, 16, 17, 18, 6, 13, 7, 8, 10, 6, 15, 13, 7, 8, 10, - 6, 15, 13, 7, 8, 10, 16, 6, 15, 13, 7, 8, 10, 16, 17, 23, - 30, 24, 25, 27, 31, 23, 32, 30, 24, 25, 27, 33, 34, 35, 23, 30, - 24, 25, 27, 23, 32, 30, 24, 25, 27, 23, 32, 30, 24, 25, 27, 33, - 23, 32, 30, 24, 25, 27, 33, 34, 42, 46, 43, 47, 42, 48, 46, 43, - 49, 50, 51, 42, 46, 43, 42, 48, 46, 43, 42, 48, 46, 43, 49, 42, - 48, 46, 43, 49, 50, 46, 42, 43, 55, 56, 46, 42, 43, 57, 58, 59, - 46, 42, 43, 56, 46, 42, 43, 56, 46, 42, 43, 57, 56, 46, 42, 43, - 57, 58, 61, 65, 62, 66, 61, 67, 65, 62, 68, 69, 70, 61, 65, 62, - 61, 67, 65, 62, 61, 67, 65, 62, 68, 61, 67, 65, 62, 68, 69, 74, - 78, 75, 79, 74, 80, 78, 75, 81, 82, 83, 74, 78, 75, 74, 80, 78, - 75, 74, 80, 78, 75, 81, 74, 80, 78, 75, 81, 82, 78, 74, 75, 87, - 88, 78, 74, 75, 89, 90, 91, 78, 74, 75, 88, 78, 74, 75, 88, 78, - 74, 75, 89, 88, 78, 74, 75, 89, 90, 93, 97, 94, 98, 93, 99, 97, - 94, 100, 101, 102, 93, 97, 94, 93, 99, 97, 94, 93, 99, 97, 94, 100, - 93, 99, 97, 94, 100, 101, 103, 108, 104, 105, 109, 103, 110, 108, 104, 105, - 111, 112, 113, 103, 108, 104, 105, 103, 110, 108, 104, 105, 103, 110, 108, 104, - 105, 111, 103, 110, 108, 104, 105, 111, 112, 193, 197, 194, 198, 193, 199, 197, - 194, 200, 201, 202, 193, 197, 194, 193, 199, 197, 194, 193, 199, 197, 194, 200, - 193, 199, 197, 194, 200, 201, 197, 193, 194, 206, 207, 197, 193, 194, 208, 209, - 210, 197, 193, 194, 207, 197, 193, 194, 207, 197, 193, 194, 208, 207, 197, 193, - 194, 208, 209, 213, 225, 242, 215, 216, 259, 213, 214, 215, 216, 213, 215, 216, - 219, 220, 213, 221, 215, 216, 219, 222, 223, 224, 213, 215, 216, 219, 213, 221, - 215, 216, 219, 213, 221, 215, 216, 219, 222, 213, 221, 215, 216, 219, 222, 223, - 226, 227, 228, 230, 226, 233, 227, 228, 230, 234, 226, 235, 233, 227, 228, 230, - 236, 237, 238, 226, 233, 227, 228, 230, 226, 235, 233, 227, 228, 230, 226, 235, - 233, 227, 228, 230, 236, 226, 235, 233, 227, 228, 230, 236, 237, 243, 244, 245, - 247, 243, 250, 244, 245, 247, 251, 243, 252, 250, 244, 245, 247, 253, 254, 255, - 243, 250, 244, 245, 247, 243, 252, 250, 244, 245, 247, 243, 252, 250, 244, 245, - 247, 253, 243, 252, 250, 244, 245, 247, 253, 254, 213, 225, 242, 214, 215, 216, - 259, 263, 269, 265, 266, 267, 268, 265, 266, 267, 270, 274, 278, 282, 286, 290, - 265, 288, 289, 265, 291, 292, 293, 265, 291, 292, 273, 299, 300, 301, 273, 299, - 300, 303, 296, 304, 305, 306, 303, 296, 304, 303, 296, 304, 305, 97, 93, 94, - 309, 310, 97, 93, 94, 311, 312, 313, 97, 93, 94, 310, 97, 93, 94, 310, - 97, 93, 94, 311, 310, 97, 93, 94, 311, 312, 108, 103, 104, 105, 315, 316, - 108, 103, 104, 105, 317, 318, 319, 108, 103, 104, 105, 316, 108, 103, 104, 105, - 316, 108, 103, 104, 105, 317, 316, 108, 103, 104, 105, 317, 318, 372, 191, 192, - 203, 204, 63, 64, 93, 103, 104, 105, 94, 95, 308, 106, 314, 72, 73, 84, - 85, 261, 262, 294, 9, 19, 21, 20, 11, 12, 26, 36, 38, 37, 28, 29, - 217, 218, 229, 239, 241, 240, 231, 232, 246, 256, 258, 257, 248, 249, + 127, 128, 129, 214, 215, 216, 227, 228, 345, 346, 347, 348, 349, 350, 164, 351, + 352, 353, 167, 354, 355, 356, 170, 357, 358, 359, 173, 360, 361, 362, 176, 363, + 364, 365, 179, 366, 367, 368, 182, 369, 370, 371, 185, 372, 373, 374, 188, 375, + 376, 377, 192, 378, 379, 380, 196, 381, 382, 383, 201, 384, 385, 386, 204, 387, + 388, 389, 206, 390, 391, 392, 209, 393, 394, 395, 213, 396, 397, 398, 215, 216, + 227, 228, 162, 163, 165, 168, 171, 174, 177, 180, 183, 186, 189, 193, 197, 202, + 205, 207, 210, 214, 158, 159, 139, 146, 147, 156, 64, 65, 76, 77, 47, 48, + 49, 51, 30, 31, 32, 34, 7, 8, 20, 21, 9, 10, 11, 9, 14, 10, + 11, 15, 9, 16, 14, 10, 11, 17, 18, 19, 9, 14, 10, 11, 9, 16, + 14, 10, 11, 9, 16, 14, 10, 11, 17, 9, 16, 14, 10, 11, 17, 18, + 14, 9, 10, 11, 23, 24, 14, 9, 10, 11, 25, 26, 27, 14, 9, 10, + 11, 24, 14, 9, 10, 11, 24, 14, 9, 10, 11, 25, 24, 14, 9, 10, + 11, 25, 26, 30, 37, 31, 32, 34, 38, 30, 39, 37, 31, 32, 34, 40, + 41, 42, 30, 37, 31, 32, 34, 30, 39, 37, 31, 32, 34, 30, 39, 37, + 31, 32, 34, 40, 30, 39, 37, 31, 32, 34, 40, 41, 47, 54, 48, 49, + 51, 55, 47, 56, 54, 48, 49, 51, 57, 58, 59, 47, 54, 48, 49, 51, + 47, 56, 54, 48, 49, 51, 47, 56, 54, 48, 49, 51, 57, 47, 56, 54, + 48, 49, 51, 57, 58, 66, 70, 67, 71, 66, 72, 70, 67, 73, 74, 75, + 66, 70, 67, 66, 72, 70, 67, 66, 72, 70, 67, 73, 66, 72, 70, 67, + 73, 74, 70, 66, 67, 79, 80, 70, 66, 67, 81, 82, 83, 70, 66, 67, + 80, 70, 66, 67, 80, 70, 66, 67, 81, 80, 70, 66, 67, 81, 82, 85, + 89, 86, 90, 85, 91, 89, 86, 92, 93, 94, 85, 89, 86, 85, 91, 89, + 86, 85, 91, 89, 86, 92, 85, 91, 89, 86, 92, 93, 98, 102, 99, 103, + 98, 104, 102, 99, 105, 106, 107, 98, 102, 99, 98, 104, 102, 99, 98, 104, + 102, 99, 105, 98, 104, 102, 99, 105, 106, 102, 98, 99, 111, 112, 102, 98, + 99, 113, 114, 115, 102, 98, 99, 112, 102, 98, 99, 112, 102, 98, 99, 113, + 112, 102, 98, 99, 113, 114, 117, 121, 118, 122, 117, 123, 121, 118, 124, 125, + 126, 117, 121, 118, 117, 123, 121, 118, 117, 123, 121, 118, 124, 117, 123, 121, + 118, 124, 125, 127, 132, 128, 129, 133, 127, 134, 132, 128, 129, 135, 136, 137, + 127, 132, 128, 129, 127, 134, 132, 128, 129, 127, 134, 132, 128, 129, 135, 127, + 134, 132, 128, 129, 135, 136, 217, 221, 218, 222, 217, 223, 221, 218, 224, 225, + 226, 217, 221, 218, 217, 223, 221, 218, 217, 223, 221, 218, 224, 217, 223, 221, + 218, 224, 225, 221, 217, 218, 230, 231, 221, 217, 218, 232, 233, 234, 221, 217, + 218, 231, 221, 217, 218, 231, 221, 217, 218, 232, 231, 221, 217, 218, 232, 233, + 237, 249, 266, 239, 240, 283, 237, 238, 239, 240, 237, 239, 240, 243, 244, 237, + 245, 239, 240, 243, 246, 247, 248, 237, 239, 240, 243, 237, 245, 239, 240, 243, + 237, 245, 239, 240, 243, 246, 237, 245, 239, 240, 243, 246, 247, 250, 251, 252, + 254, 250, 257, 251, 252, 254, 258, 250, 259, 257, 251, 252, 254, 260, 261, 262, + 250, 257, 251, 252, 254, 250, 259, 257, 251, 252, 254, 250, 259, 257, 251, 252, + 254, 260, 250, 259, 257, 251, 252, 254, 260, 261, 267, 268, 269, 271, 267, 274, + 268, 269, 271, 275, 267, 276, 274, 268, 269, 271, 277, 278, 279, 267, 274, 268, + 269, 271, 267, 276, 274, 268, 269, 271, 267, 276, 274, 268, 269, 271, 277, 267, + 276, 274, 268, 269, 271, 277, 278, 237, 249, 266, 238, 239, 240, 283, 287, 293, + 289, 290, 291, 292, 289, 290, 291, 294, 298, 302, 306, 310, 314, 289, 312, 313, + 289, 315, 316, 317, 289, 315, 316, 297, 323, 324, 325, 297, 323, 324, 327, 320, + 328, 329, 330, 327, 320, 328, 327, 320, 328, 329, 121, 117, 118, 333, 334, 121, + 117, 118, 335, 336, 337, 121, 117, 118, 334, 121, 117, 118, 334, 121, 117, 118, + 335, 334, 121, 117, 118, 335, 336, 132, 127, 128, 129, 339, 340, 132, 127, 128, + 129, 341, 342, 343, 132, 127, 128, 129, 340, 132, 127, 128, 129, 340, 132, 127, + 128, 129, 341, 340, 132, 127, 128, 129, 341, 342, 396, 215, 216, 227, 228, 117, + 127, 128, 129, 118, 119, 332, 130, 338, 96, 97, 108, 109, 285, 286, 318, 33, + 43, 45, 44, 35, 36, 50, 60, 62, 61, 52, 53, 87, 88, 241, 242, 253, + 263, 265, 264, 255, 256, 270, 280, 282, 281, 272, 273, }; /** Token literal values. */ public static final String[] jjstrLiteralImages = { -"", null, null, null, null, null, null, null, null, null, null, null, null, -"\74\41\55\55", "\55\55\76", "\173", "\175", "\174\75", "\176\75", "\75", "\53", "\55", "\54", -"\73", "\76", "\57", "\133", "\135", "\52", "\46", "\56", "\50", "\51", "\72", null, +"", null, null, null, null, null, null, null, null, null, "\74\41\55\55", +"\55\55\76", "\173", "\175", "\174\75", "\176\75", "\75", "\53", "\55", "\54", "\73", +"\76", "\57", "\133", "\135", "\52", "\46", "\56", "\50", "\51", "\72", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, @@ -3979,7 +4029,6 @@ null, null, null, null, null, null, null, null, null, null, null, null, null, }; /** Lexer state names. */ public static final String[] lexStateNames = { "DEFAULT", - "IN_INTERPOLATION", "IN_SINGLE_LINE_COMMENT", "IN_FORMAL_COMMENT", "IN_MULTI_LINE_COMMENT", @@ -3987,27 +4036,27 @@ public static final String[] lexStateNames = { /** Lex State array. */ public static final int[] jjnewLexState = { - -1, -1, 1, -1, 0, 2, -1, 0, 3, 4, 0, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 1, -1, 0, 2, 3, 0, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, + -1, -1, }; static final long[] jjtoToken = { - 0xfffff807ffffe003L, 0xe00ffffffeL, + 0xbffffe01fffffc03L, 0x3803ffffffL, }; static final long[] jjtoSkip = { - 0xc90L, 0x0L, + 0x190L, 0x0L, }; static final long[] jjtoSpecial = { - 0x410L, 0x0L, + 0x80L, 0x0L, }; static final long[] jjtoMore = { - 0x136cL, 0x0L, + 0x26cL, 0x0L, }; protected CharStream input_stream; -private final int[] jjrounds = new int[375]; -private final int[] jjstateSet = new int[750]; +private final int[] jjrounds = new int[399]; +private final int[] jjstateSet = new int[798]; private final StringBuilder jjimage = new StringBuilder(); private StringBuilder image = jjimage; private int jjimageLen; @@ -4036,7 +4085,7 @@ private void ReInitRounds() { int i; jjround = 0x80000001; - for (i = 375; i-- > 0;) + for (i = 399; i-- > 0;) jjrounds[i] = 0x80000000; } @@ -4050,7 +4099,7 @@ public void ReInit(CharStream stream, int lexState) /** Switch to specified lex state. */ public void SwitchTo(int lexState) { - if (lexState >= 5 || lexState < 0) + if (lexState >= 4 || lexState < 0) throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE); else curLexState = lexState; @@ -4120,9 +4169,9 @@ public Token getNextToken() jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_0(); - if (jjmatchedPos == 0 && jjmatchedKind > 103) + if (jjmatchedPos == 0 && jjmatchedKind > 101) { - jjmatchedKind = 103; + jjmatchedKind = 101; } break; case 1: @@ -4134,23 +4183,18 @@ public Token getNextToken() jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_2(); - break; - case 3: - jjmatchedKind = 0x7fffffff; - jjmatchedPos = 0; - curPos = jjMoveStringLiteralDfa0_3(); - if (jjmatchedPos == 0 && jjmatchedKind > 12) + if (jjmatchedPos == 0 && jjmatchedKind > 9) { - jjmatchedKind = 12; + jjmatchedKind = 9; } break; - case 4: + case 3: jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; - curPos = jjMoveStringLiteralDfa0_4(); - if (jjmatchedPos == 0 && jjmatchedKind > 12) + curPos = jjMoveStringLiteralDfa0_3(); + if (jjmatchedPos == 0 && jjmatchedKind > 9) { - jjmatchedKind = 12; + jjmatchedKind = 9; } break; } @@ -4235,7 +4279,7 @@ void MoreLexicalActions() jjimageLen += (lengthOfMatch = jjmatchedPos + 1); switch(jjmatchedKind) { - case 8 : + case 5 : image.append(input_stream.GetSuffix(jjimageLen)); jjimageLen = 0; input_stream.backup(1); diff --git a/sass/src/com/vaadin/sass/tree/SimpleNode.java b/sass/src/com/vaadin/sass/tree/SimpleNode.java new file mode 100644 index 0000000000..39a5d17b48 --- /dev/null +++ b/sass/src/com/vaadin/sass/tree/SimpleNode.java @@ -0,0 +1,24 @@ +package com.vaadin.sass.tree; + +/** + * A simple BlockNode where input text equals output. <b>Note : </b> ignores any + * possible children so only use it when you are sure no child nodes will be + * applied. + * + * @author Sebastian Nyholm @ Vaadin Ltd + * + */ +public class SimpleNode extends Node { + + private final String text; + + public SimpleNode(String text) { + this.text = text; + + } + + @Override + public String toString() { + return text; + } +} diff --git a/sass/src/com/vaadin/sass/tree/controldirective/ControlChildNode.java b/sass/src/com/vaadin/sass/tree/controldirective/ControlChildNode.java new file mode 100644 index 0000000000..a6df1e744b --- /dev/null +++ b/sass/src/com/vaadin/sass/tree/controldirective/ControlChildNode.java @@ -0,0 +1,6 @@ +package com.vaadin.sass.tree.controldirective; + + +public interface ControlChildNode extends ControlNode { + +} diff --git a/sass/src/com/vaadin/sass/tree/controldirective/ControlDefNode.java b/sass/src/com/vaadin/sass/tree/controldirective/ControlDefNode.java new file mode 100644 index 0000000000..4ead42eb0a --- /dev/null +++ b/sass/src/com/vaadin/sass/tree/controldirective/ControlDefNode.java @@ -0,0 +1,6 @@ +package com.vaadin.sass.tree.controldirective; + + +public interface ControlDefNode extends ControlNode { + +} diff --git a/sass/src/com/vaadin/sass/tree/controldirective/ControlNode.java b/sass/src/com/vaadin/sass/tree/controldirective/ControlNode.java new file mode 100644 index 0000000000..453593d4d2 --- /dev/null +++ b/sass/src/com/vaadin/sass/tree/controldirective/ControlNode.java @@ -0,0 +1,5 @@ +package com.vaadin.sass.tree.controldirective; + +public interface ControlNode { + +} diff --git a/sass/src/com/vaadin/sass/tree/EachNode.java b/sass/src/com/vaadin/sass/tree/controldirective/EachDefNode.java index f7a90c2f02..1dfa5892d9 100644 --- a/sass/src/com/vaadin/sass/tree/EachNode.java +++ b/sass/src/com/vaadin/sass/tree/controldirective/EachDefNode.java @@ -14,25 +14,36 @@ * the License. */ -package com.vaadin.sass.tree; +package com.vaadin.sass.tree.controldirective; -public class EachNode extends Node { +import java.util.ArrayList; +import java.util.List; + +import com.vaadin.sass.tree.Node; + +public class EachDefNode extends Node implements ControlDefNode { private static final long serialVersionUID = 7943948981204906221L; private String var; - private String list; - private String body; + private ArrayList<String> list; - public EachNode(String var, String list, String body) { + public EachDefNode(String var, ArrayList<String> list) { super(); this.var = var; this.list = list; - this.body = body; + } + + public List<String> getVariables() { + return list; + } + + public String getVariableName() { + return var; } @Override public String toString() { - return "Each Node: {variable: " + var + ", list: " + list + ", body: " - + body + "}"; + return "Each Definition Node: {variable : " + var + ", " + + "children : " + list.size() + "}"; } } diff --git a/sass/src/com/vaadin/sass/visitor/ControlVisitor.java b/sass/src/com/vaadin/sass/visitor/ControlVisitor.java new file mode 100644 index 0000000000..cc736b307f --- /dev/null +++ b/sass/src/com/vaadin/sass/visitor/ControlVisitor.java @@ -0,0 +1,57 @@ +package com.vaadin.sass.visitor; + +import java.util.HashSet; +import java.util.regex.Pattern; + +import com.vaadin.sass.tree.BlockNode; +import com.vaadin.sass.tree.Node; +import com.vaadin.sass.tree.SimpleNode; +import com.vaadin.sass.tree.controldirective.ControlDefNode; +import com.vaadin.sass.tree.controldirective.EachDefNode; + +public class ControlVisitor implements Visitor { + + HashSet<Node> controlDefs = new HashSet<Node>(); + private Node rootNode; + + @Override + public void traverse(Node node) throws Exception { + this.rootNode = node; + for (Node child : node.getChildren()) { + if (child instanceof ControlDefNode) { + controlDefs.add(child); + } + } + + replaceControlNodes(); + + } + + private void replaceControlNodes() { + for (final Node defNode : controlDefs) { + if (defNode instanceof EachDefNode) { + replaceEachDefNode((EachDefNode) defNode); + } + + } + } + + private void replaceEachDefNode(EachDefNode defNode) { + for (final Node child : defNode.getChildren()) { + if (child instanceof BlockNode) { + for (final String variable : defNode.getVariables()) { + + String output = child.toString(); + output = output.replaceAll( + Pattern.quote("#{" + defNode.getVariableName() + + "}"), variable); + SimpleNode simple = new SimpleNode(output); + + rootNode.appendChild(simple, defNode); + } + } + } + rootNode.removeChild(defNode); + } + +} diff --git a/sass/src/com/vaadin/sass/visitor/MixinVisitor.java b/sass/src/com/vaadin/sass/visitor/MixinVisitor.java index 68408574c3..d6008526b4 100644 --- a/sass/src/com/vaadin/sass/visitor/MixinVisitor.java +++ b/sass/src/com/vaadin/sass/visitor/MixinVisitor.java @@ -47,6 +47,7 @@ public class MixinVisitor implements Visitor { node.removeChild(child); } } + } private void replaceMixins(Node node) throws Exception { |