From 82edfe45a29647302c0ce97118fd25220e9513c0 Mon Sep 17 00:00:00 2001 From: kpouer Date: Fri, 22 Aug 2003 20:40:00 +0000 Subject: [PATCH] a lot of fixes --- .../phpdt/internal/compiler/ast/HTMLBlock.java | 4 +- .../phpdt/internal/compiler/ast/IfStatement.java | 16 +- .../internal/compiler/ast/InclusionStatement.java | 5 +- .../phpdt/internal/compiler/ast/Variable.java | 30 +- net.sourceforge.phpeclipse/src/test/PHPParser.java | 2401 ++++++++++---------- net.sourceforge.phpeclipse/src/test/PHPParser.jj | 480 ++-- .../src/test/PHPParserConstants.java | 265 ++-- .../src/test/PHPParserTokenManager.java | 1556 ++++++++----- 8 files changed, 2554 insertions(+), 2203 deletions(-) diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/HTMLBlock.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/HTMLBlock.java index 27d93fa..496ca72 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/HTMLBlock.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/HTMLBlock.java @@ -11,7 +11,7 @@ public class HTMLBlock extends Statement { public AstNode[] nodes; public HTMLBlock(final AstNode[] nodes) { - super(nodes[0].sourceStart, nodes[nodes.length-1].sourceEnd); + super(nodes[0].sourceStart, nodes[(nodes.length > 0) ? nodes.length - 1 : 0].sourceEnd); this.nodes = nodes; } @@ -24,7 +24,7 @@ public class HTMLBlock extends Statement { final StringBuffer buff = new StringBuffer(tabString(tab)); buff.append("?>"); for (int i = 0; i < nodes.length; i++) { - buff.append(nodes[i].toString(tab +1)); + buff.append(nodes[i].toString(tab + 1)); } buff.append(" SimpleCharStream.currentBuffer.length()) { return; } - final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,currentPosition+1).toCharArray(); + final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart, + currentPosition).toCharArray(); pushOnAstNodes(new HTMLCode(chars, htmlStart,currentPosition)); } /** Create a new task. */ - public static final void createNewTask() { - final int currentPosition = token.sourceStart; - final String todo = SimpleCharStream.currentBuffer.substring(currentPosition-3, + public static final void createNewTask(final int todoStart) { + final String todo = SimpleCharStream.currentBuffer.substring(todoStart, SimpleCharStream.currentBuffer.indexOf("\n", - currentPosition)-1); + todoStart)-1); if (!PARSER_DEBUG) { try { setMarker(fileToParse, @@ -338,6 +339,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon phpFile(); } + static final public void todo() throws ParseException { + Token todoToken; + todoToken = jj_consume_token(23); + createNewTask(todoToken.sourceStart); + } + static final public void phpTest() throws ParseException { Php(); jj_consume_token(0); @@ -379,8 +386,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case WHILE: case FOREACH: case AT: - case DOLLAR: case BANG: + case TILDE: case PLUS_PLUS: case MINUS_MINUS: case PLUS: @@ -389,11 +396,11 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOLLAR: case IDENTIFIER: case LPAREN: case LBRACE: case SEMICOLON: - case DOLLAR_ID: ; break; default: @@ -420,7 +427,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon */ static final public void PhpBlock() throws ParseException { final PHPEchoBlock phpEchoBlock; - final Token token; + final Token token,phpEnd; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PHPECHOSTART: phpEchoBlock = phpEchoBlock(); @@ -456,8 +463,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case WHILE: case FOREACH: case AT: - case DOLLAR: case BANG: + case TILDE: case PLUS_PLUS: case MINUS_MINUS: case PLUS: @@ -466,11 +473,11 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOLLAR: case IDENTIFIER: case LPAREN: case LBRACE: case SEMICOLON: - case DOLLAR_ID: switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PHPSTARTSHORT: case PHPSTARTLONG: @@ -501,9 +508,11 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon jj_la1[2] = jj_gen; ; } + PHPParser.createNewHTMLCode(); Php(); try { - jj_consume_token(PHPEND); + phpEnd = jj_consume_token(PHPEND); + htmlStart = phpEnd.sourceEnd; } catch (ParseException e) { errorMessage = "'?>' expected"; errorLevel = ERROR; @@ -524,6 +533,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon final PHPEchoBlock echoBlock; final Token token, token2; token = jj_consume_token(PHPECHOSTART); + PHPParser.createNewHTMLCode(); expr = Expression(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: @@ -534,6 +544,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon ; } token2 = jj_consume_token(PHPEND); + htmlStart = token2.sourceEnd; + echoBlock = new PHPEchoBlock(expr,token.sourceStart,token2.sourceEnd); pushOnAstNodes(echoBlock); {if (true) return echoBlock;} @@ -571,8 +583,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case WHILE: case FOREACH: case AT: - case DOLLAR: case BANG: + case TILDE: case PLUS_PLUS: case MINUS_MINUS: case PLUS: @@ -581,11 +593,11 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOLLAR: case IDENTIFIER: case LPAREN: case LBRACE: case SEMICOLON: - case DOLLAR_ID: ; break; default: @@ -602,6 +614,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon final Token superclassName, token, extendsToken; String classNameImage = SYNTAX_ERROR_CHAR; String superclassNameImage = null; + final int classEnd; token = jj_consume_token(CLASS); try { className = jj_consume_token(IDENTIFIER); @@ -655,15 +668,16 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } currentSegment.add(classDeclaration); currentSegment = classDeclaration; - ClassBody(classDeclaration); + classEnd = ClassBody(classDeclaration); currentSegment = (OutlineableWithChildren) currentSegment.getParent(); - classDeclaration.sourceEnd = SimpleCharStream.getPosition(); + classDeclaration.sourceEnd = classEnd; pushOnAstNodes(classDeclaration); {if (true) return classDeclaration;} throw new Error("Missing return statement in function"); } - static final public void ClassBody(final ClassDeclaration classDeclaration) throws ParseException { + static final public int ClassBody(final ClassDeclaration classDeclaration) throws ParseException { +Token token; try { jj_consume_token(LBRACE); } catch (ParseException e) { @@ -687,14 +701,17 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon ClassBodyDeclaration(classDeclaration); } try { - jj_consume_token(RBRACE); + token = jj_consume_token(RBRACE); + {if (true) return token.sourceEnd;} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. 'var', 'function' or '}' expected"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; processParseExceptionDebug(e); + {if (true) return PHPParser.token.sourceEnd;} } + throw new Error("Missing return statement in function"); } /** @@ -781,10 +798,27 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon * It will be used by fields and formal parameters */ static final public VariableDeclaration VariableDeclaratorNoSuffix() throws ParseException { - final Token varName; - Expression initializer = null; + final Token dollar, token, lbrace,rbrace; + Expression expr, initializer = null; Token assignToken; - varName = jj_consume_token(DOLLAR_ID); + Variable variable; + dollar = jj_consume_token(DOLLAR); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IDENTIFIER: + token = jj_consume_token(IDENTIFIER); + variable = new Variable(token.image,dollar.sourceStart,token.sourceEnd); + break; + case LBRACE: + lbrace = jj_consume_token(LBRACE); + expr = Expression(); + rbrace = jj_consume_token(RBRACE); + variable = new Variable(expr,dollar.sourceStart,rbrace.sourceEnd); + break; + default: + jj_la1[10] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ASSIGN: assignToken = jj_consume_token(ASSIGN); @@ -799,24 +833,20 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } break; default: - jj_la1[10] = jj_gen; + jj_la1[11] = jj_gen; ; } if (initializer == null) { {if (true) return new VariableDeclaration(currentSegment, - new Variable(varName.image.substring(1), - varName.sourceStart+1, - varName.sourceEnd+1), - varName.sourceStart+1, - varName.sourceEnd+1);} + variable, + variable.sourceStart, + variable.sourceEnd);} } {if (true) return new VariableDeclaration(currentSegment, - new Variable(varName.image.substring(1), - varName.sourceStart+1, - varName.sourceEnd+1), + variable, initializer, VariableDeclaration.EQUAL, - varName.sourceStart+1);} + variable.sourceStart);} throw new Error("Missing return statement in function"); } @@ -842,7 +872,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } break; default: - jj_la1[11] = jj_gen; + jj_la1[12] = jj_gen; ; } if (initializer == null) { @@ -891,183 +921,40 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon throw new Error("Missing return statement in function"); } -/** - * Return a variablename without the $. - * @return a variable name - *//* -Variable Variable(): -{ - final StringBuffer buff; - Expression expression = null; - final Token token; - Variable expr; - final int pos; -} -{ - token = - [ expression = Expression() ] - { - if (expression == null) { - return new Variable(token.image.substring(1), - token.sourceStart+1, - token.sourceEnd+1); - } - String s = expression.toStringExpression(); - buff = new StringBuffer(token.image.length()+s.length()+2); - buff.append(token.image); - buff.append("{"); - buff.append(s); - buff.append("}"); - s = buff.toString(); - return new Variable(s,token.sourceStart+1,token.sourceEnd+1); - } -| - token = - expr = VariableName() - {return new Variable(expr,token.sourceStart,expr.sourceEnd);} -} */ static final public Variable Variable() throws ParseException { Variable variable = null; final Token token; - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case DOLLAR_ID: - token = jj_consume_token(DOLLAR_ID); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case DOLLAR: - case IDENTIFIER: - case LBRACE: - case DOLLAR_ID: - variable = Var(token); - break; - default: - jj_la1[12] = jj_gen; - ; - } - if (variable == null) { - {if (true) return new Variable(token.image.substring(1),token.sourceStart+1,token.sourceEnd+1);} - } - final StringBuffer buff = new StringBuffer(); - buff.append(token.image.substring(1)); - buff.append(variable.toStringExpression()); - {if (true) return new Variable(buff.toString(),token.sourceStart+1,variable.sourceEnd+1);} - break; - case DOLLAR: - token = jj_consume_token(DOLLAR); - variable = Var(token); + token = jj_consume_token(DOLLAR); + variable = Var(token); {if (true) return new Variable(variable,token.sourceStart,variable.sourceEnd);} - break; - default: - jj_la1[13] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } throw new Error("Missing return statement in function"); } static final public Variable Var(final Token dollar) throws ParseException { Variable variable = null; - final Token token; + final Token token,token2; ConstantIdentifier constant; + Expression expression; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case DOLLAR_ID: - token = jj_consume_token(DOLLAR_ID); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case DOLLAR: - case IDENTIFIER: - case LBRACE: - case DOLLAR_ID: - variable = Var(token); - break; - default: - jj_la1[14] = jj_gen; - ; - } - if (variable == null) { - {if (true) return new Variable(token.image.substring(1),token.sourceStart+1,token.sourceEnd+1);} - } - final StringBuffer buff = new StringBuffer(); - buff.append(token.image.substring(1)); - buff.append(variable.toStringExpression()); - {if (true) return new Variable(buff.toString(),dollar.sourceStart,variable.sourceEnd);} - break; - default: - jj_la1[15] = jj_gen; - if (jj_2_2(2147483647)) { - token = jj_consume_token(DOLLAR); - variable = Var(token); + case DOLLAR: + token = jj_consume_token(DOLLAR); + variable = Var(token); {if (true) return new Variable(variable,dollar.sourceStart,variable.sourceEnd);} - } else { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case IDENTIFIER: - case LBRACE: - constant = VariableName(); - {if (true) return new Variable(constant.name,dollar.sourceStart,constant.sourceEnd);} - break; - default: - jj_la1[16] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - } - } - throw new Error("Missing return statement in function"); - } - -/** - * A Variable name (without the $) - * @return a variable name String - */ - static final public ConstantIdentifier VariableName() throws ParseException { - final StringBuffer buff; - String expr; - Expression expression = null; - final Token token; - Token token2 = null; - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + break; case LBRACE: token = jj_consume_token(LBRACE); expression = Expression(); token2 = jj_consume_token(RBRACE); - expr = expression.toStringExpression(); - buff = new StringBuffer(expr.length()+2); - buff.append("{"); - buff.append(expr); - buff.append("}"); - expr = buff.toString(); - {if (true) return new ConstantIdentifier(expr, - token.sourceStart, - token2.sourceEnd);} + {if (true) return new Variable(expression, + dollar.sourceStart, + token2.sourceEnd);} break; case IDENTIFIER: token = jj_consume_token(IDENTIFIER); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case LBRACE: - jj_consume_token(LBRACE); - expression = Expression(); - token2 = jj_consume_token(RBRACE); - break; - default: - jj_la1[17] = jj_gen; - ; - } - if (expression == null) { - {if (true) return new ConstantIdentifier(token.image, - token.sourceStart, - token.sourceEnd);} - } - expr = expression.toStringExpression(); - buff = new StringBuffer(token.image.length()+expr.length()+2); - buff.append(token.image); - buff.append("{"); - buff.append(expr); - buff.append("}"); - expr = buff.toString(); - {if (true) return new ConstantIdentifier(expr, - token.sourceStart, - token2.sourceEnd);} + {if (true) return new Variable(token.image,dollar.sourceStart,token.sourceEnd);} break; default: - jj_la1[18] = jj_gen; + jj_la1[13] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1097,7 +984,7 @@ Variable Variable(): token = jj_consume_token(FLOATING_POINT_LITERAL); break; default: - jj_la1[19] = jj_gen; + jj_la1[14] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1115,7 +1002,7 @@ Variable Variable(): token = jj_consume_token(FLOATING_POINT_LITERAL); break; default: - jj_la1[20] = jj_gen; + jj_la1[15] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1132,7 +1019,7 @@ Variable Variable(): {if (true) return new ConstantIdentifier(token);} break; default: - jj_la1[21] = jj_gen; + jj_la1[16] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1149,7 +1036,7 @@ final Expression expr,expr2; {if (true) return new ArrayVariableDeclaration(expr,expr2);} break; default: - jj_la1[22] = jj_gen; + jj_la1[17] = jj_gen; ; } {if (true) return new ArrayVariableDeclaration(expr,SimpleCharStream.getPosition());} @@ -1169,8 +1056,8 @@ final Expression expr,expr2; case TRUE: case FALSE: case AT: - case DOLLAR: case BANG: + case TILDE: case PLUS_PLUS: case MINUS_MINUS: case PLUS: @@ -1179,14 +1066,14 @@ final Expression expr,expr2; case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOLLAR: case IDENTIFIER: case LPAREN: - case DOLLAR_ID: expr = ArrayVariable(); list.add(expr); label_6: while (true) { - if (jj_2_3(2)) { + if (jj_2_2(2)) { ; } else { break label_6; @@ -1197,7 +1084,7 @@ final Expression expr,expr2; } break; default: - jj_la1[23] = jj_gen; + jj_la1[18] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1206,7 +1093,7 @@ final Expression expr,expr2; list.add(null); break; default: - jj_la1[24] = jj_gen; + jj_la1[19] = jj_gen; ; } jj_consume_token(RPAREN); @@ -1262,7 +1149,7 @@ final Expression expr,expr2; end = reference.sourceEnd; break; default: - jj_la1[25] = jj_gen; + jj_la1[20] = jj_gen; ; } try { @@ -1322,7 +1209,7 @@ final Expression expr,expr2; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: - case DOLLAR_ID: + case DOLLAR: var = FormalParameter(); parameters.put(var.name(),var);end = var.sourceEnd; label_7: @@ -1332,7 +1219,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[26] = jj_gen; + jj_la1[21] = jj_gen; break label_7; } jj_consume_token(COMMA); @@ -1341,7 +1228,7 @@ final Expression expr,expr2; } break; default: - jj_la1[27] = jj_gen; + jj_la1[22] = jj_gen; ; } try { @@ -1370,7 +1257,7 @@ final Expression expr,expr2; token = jj_consume_token(BIT_AND); break; default: - jj_la1[28] = jj_gen; + jj_la1[23] = jj_gen; ; } variableDeclaration = VariableDeclaratorNoSuffix(); @@ -1421,7 +1308,7 @@ final Expression expr,expr2; {if (true) return new ConstantIdentifier(token);} break; default: - jj_la1[29] = jj_gen; + jj_la1[24] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1439,8 +1326,8 @@ final Expression expr,expr2; case TRUE: case FALSE: case AT: - case DOLLAR: case BANG: + case TILDE: case PLUS_PLUS: case MINUS_MINUS: case PLUS: @@ -1449,9 +1336,9 @@ final Expression expr,expr2; case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOLLAR: case IDENTIFIER: case LPAREN: - case DOLLAR_ID: expr = ConditionalExpression(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ASSIGN: @@ -1481,7 +1368,7 @@ final Expression expr,expr2; } break; default: - jj_la1[30] = jj_gen; + jj_la1[25] = jj_gen; ; } if (assignOperator != -1) {// todo : change this, very very bad :( @@ -1508,7 +1395,7 @@ final Expression expr,expr2; {if (true) return expr;} break; default: - jj_la1[31] = jj_gen; + jj_la1[26] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1530,7 +1417,7 @@ final Expression expr,expr2; {if (true) return expr;} break; default: - jj_la1[32] = jj_gen; + jj_la1[27] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1549,7 +1436,7 @@ final Expression expr,expr2; {if (true) return expr;} break; default: - jj_la1[33] = jj_gen; + jj_la1[28] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1615,7 +1502,7 @@ final Expression expr,expr2; {if (true) return VariableDeclaration.TILDE_EQUAL;} break; default: - jj_la1[34] = jj_gen; + jj_la1[29] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1635,7 +1522,7 @@ final Expression expr,expr2; expr3 = ConditionalExpression(); break; default: - jj_la1[35] = jj_gen; + jj_la1[30] = jj_gen; ; } if (expr3 == null) { @@ -1657,7 +1544,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[36] = jj_gen; + jj_la1[31] = jj_gen; break label_8; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1670,7 +1557,7 @@ final Expression expr,expr2; operator = OperatorIds.ORL; break; default: - jj_la1[37] = jj_gen; + jj_la1[32] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1693,7 +1580,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[38] = jj_gen; + jj_la1[33] = jj_gen; break label_9; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1706,7 +1593,7 @@ final Expression expr,expr2; operator = OperatorIds.ANDL; break; default: - jj_la1[39] = jj_gen; + jj_la1[34] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1727,7 +1614,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[40] = jj_gen; + jj_la1[35] = jj_gen; break label_10; } jj_consume_token(DOT); @@ -1748,7 +1635,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[41] = jj_gen; + jj_la1[36] = jj_gen; break label_11; } jj_consume_token(BIT_OR); @@ -1769,7 +1656,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[42] = jj_gen; + jj_la1[37] = jj_gen; break label_12; } jj_consume_token(XOR); @@ -1790,7 +1677,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[43] = jj_gen; + jj_la1[38] = jj_gen; break label_13; } jj_consume_token(BIT_AND); @@ -1817,7 +1704,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[44] = jj_gen; + jj_la1[39] = jj_gen; break label_14; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1842,7 +1729,7 @@ final Expression expr,expr2; operator = OperatorIds.EQUAL_EQUAL_EQUAL; break; default: - jj_la1[45] = jj_gen; + jj_la1[40] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1879,7 +1766,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[46] = jj_gen; + jj_la1[41] = jj_gen; break label_15; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1900,7 +1787,7 @@ final Expression expr,expr2; operator = OperatorIds.GREATER_EQUAL; break; default: - jj_la1[47] = jj_gen; + jj_la1[42] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1924,7 +1811,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[48] = jj_gen; + jj_la1[43] = jj_gen; break label_16; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1941,7 +1828,7 @@ final Expression expr,expr2; operator = OperatorIds.UNSIGNED_RIGHT_SHIFT; break; default: - jj_la1[49] = jj_gen; + jj_la1[44] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1964,7 +1851,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[50] = jj_gen; + jj_la1[45] = jj_gen; break label_17; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1977,7 +1864,7 @@ final Expression expr,expr2; operator = OperatorIds.MINUS; break; default: - jj_la1[51] = jj_gen; + jj_la1[46] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2010,7 +1897,7 @@ final Expression expr,expr2; ; break; default: - jj_la1[52] = jj_gen; + jj_la1[47] = jj_gen; break label_18; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2027,7 +1914,7 @@ final Expression expr,expr2; operator = OperatorIds.REMAINDER; break; default: - jj_la1[53] = jj_gen; + jj_la1[48] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2046,8 +1933,54 @@ final Expression expr,expr2; /* expr = UnaryExpressionNoPrefix() //why did I had that ? {return new PrefixedUnaryExpression(expr,OperatorIds.AND,pos);} | */ + expr = AtNotTildeUnaryExpression(); + {if (true) return expr;} + throw new Error("Missing return statement in function"); + } + + static final public Expression AtNotTildeUnaryExpression() throws ParseException { + final Expression expr; + final Token token; + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case AT: + token = jj_consume_token(AT); + expr = AtNotTildeUnaryExpression(); + {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.AT,token.sourceStart);} + break; + case TILDE: + token = jj_consume_token(TILDE); + expr = AtNotTildeUnaryExpression(); + {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.TWIDDLE,token.sourceStart);} + break; + case BANG: + token = jj_consume_token(BANG); expr = AtNotUnaryExpression(); - {if (true) return expr;} + {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);} + break; + case ARRAY: + case NEW: + case NULL: + case TRUE: + case FALSE: + case PLUS_PLUS: + case MINUS_MINUS: + case PLUS: + case MINUS: + case BIT_AND: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case DOLLAR: + case IDENTIFIER: + case LPAREN: + expr = UnaryExpressionNoPrefix(); + {if (true) return expr;} + break; + default: + jj_la1[49] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } throw new Error("Missing return statement in function"); } @@ -2074,7 +2007,6 @@ final Expression expr,expr2; case NULL: case TRUE: case FALSE: - case DOLLAR: case PLUS_PLUS: case MINUS_MINUS: case PLUS: @@ -2083,14 +2015,14 @@ final Expression expr,expr2; case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOLLAR: case IDENTIFIER: case LPAREN: - case DOLLAR_ID: expr = UnaryExpressionNoPrefix(); {if (true) return expr;} break; default: - jj_la1[54] = jj_gen; + jj_la1[50] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2103,15 +2035,15 @@ final Expression expr,expr2; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: token = jj_consume_token(PLUS); - expr = AtNotUnaryExpression(); - {if (true) return new PrefixedUnaryExpression(expr, + expr = AtNotTildeUnaryExpression(); + {if (true) return new PrefixedUnaryExpression(expr, OperatorIds.PLUS, token.sourceStart);} break; case MINUS: token = jj_consume_token(MINUS); - expr = AtNotUnaryExpression(); - {if (true) return new PrefixedUnaryExpression(expr, + expr = AtNotTildeUnaryExpression(); + {if (true) return new PrefixedUnaryExpression(expr, OperatorIds.MINUS, token.sourceStart);} break; @@ -2125,19 +2057,18 @@ final Expression expr,expr2; case NULL: case TRUE: case FALSE: - case DOLLAR: case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOLLAR: case IDENTIFIER: case LPAREN: - case DOLLAR_ID: expr = UnaryExpressionNotPlusMinus(); {if (true) return expr;} break; default: - jj_la1[55] = jj_gen; + jj_la1[51] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2158,7 +2089,7 @@ final Token token; operator = OperatorIds.MINUS_MINUS; break; default: - jj_la1[56] = jj_gen; + jj_la1[52] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2169,17 +2100,16 @@ final Token token; static final public Expression UnaryExpressionNotPlusMinus() throws ParseException { final Expression expr; - if (jj_2_4(2147483647)) { + if (jj_2_3(2147483647)) { expr = CastExpression(); {if (true) return expr;} } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: case NEW: - case DOLLAR: case BIT_AND: + case DOLLAR: case IDENTIFIER: - case DOLLAR_ID: expr = PostfixExpression(); {if (true) return expr;} break; @@ -2207,7 +2137,7 @@ final Token token; {if (true) return expr;} break; default: - jj_la1[57] = jj_gen; + jj_la1[53] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2237,7 +2167,7 @@ final Token token,token1; type = new ConstantIdentifier(token); break; default: - jj_la1[58] = jj_gen; + jj_la1[54] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2265,13 +2195,13 @@ final Token token,token1; operator = OperatorIds.MINUS_MINUS; break; default: - jj_la1[59] = jj_gen; + jj_la1[55] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[60] = jj_gen; + jj_la1[56] = jj_gen; ; } if (operator == -1) { @@ -2286,16 +2216,15 @@ final Token token,token1; Token token = null; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case NEW: - case DOLLAR: case BIT_AND: + case DOLLAR: case IDENTIFIER: - case DOLLAR_ID: switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: token = jj_consume_token(BIT_AND); break; default: - jj_la1[61] = jj_gen; + jj_la1[57] = jj_gen; ; } expr = refPrimaryExpression(token); @@ -2306,7 +2235,7 @@ final Token token,token1; {if (true) return expr;} break; default: - jj_la1[62] = jj_gen; + jj_la1[58] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2328,7 +2257,7 @@ final Token token,token1; ; break; default: - jj_la1[63] = jj_gen; + jj_la1[59] = jj_gen; break label_19; } jj_consume_token(STATICCLASSACCESS); @@ -2342,7 +2271,7 @@ final Token token,token1; expr2 = Arguments(expr); break; default: - jj_la1[64] = jj_gen; + jj_la1[60] = jj_gen; ; } if (expr2 == null) { @@ -2359,14 +2288,13 @@ final Token token,token1; {if (true) return expr2;} break; case DOLLAR: - case DOLLAR_ID: expr = VariableDeclaratorId(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LPAREN: expr = Arguments(expr); break; default: - jj_la1[65] = jj_gen; + jj_la1[61] = jj_gen; ; } {if (true) return expr;} @@ -2388,13 +2316,13 @@ final Token token,token1; expr = Arguments(expr); break; default: - jj_la1[66] = jj_gen; + jj_la1[62] = jj_gen; ; } {if (true) return expr;} break; default: - jj_la1[67] = jj_gen; + jj_la1[63] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2438,12 +2366,11 @@ final Token token,token1; {if (true) return expr;} break; case DOLLAR: - case DOLLAR_ID: expr = VariableDeclaratorId(); {if (true) return expr;} break; default: - jj_la1[68] = jj_gen; + jj_la1[64] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2455,7 +2382,7 @@ final Token token,token1; */ static final public AbstractVariable VariableSuffix(final AbstractVariable prefix) throws ParseException { Expression expression = null; - final Token classAccessToken; + final Token classAccessToken,lbrace,rbrace; Token token; int pos; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2463,16 +2390,23 @@ final Token token,token1; classAccessToken = jj_consume_token(CLASSACCESS); try { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case IDENTIFIER: case LBRACE: - expression = VariableName(); + lbrace = jj_consume_token(LBRACE); + expression = Expression(); + rbrace = jj_consume_token(RBRACE); + expression = new Variable(expression, + lbrace.sourceStart, + rbrace.sourceEnd); + break; + case IDENTIFIER: + token = jj_consume_token(IDENTIFIER); + expression = new Variable(token.image,token.sourceStart,token.sourceEnd); break; case DOLLAR: - case DOLLAR_ID: expression = Variable(); break; default: - jj_la1[69] = jj_gen; + jj_la1[65] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2508,8 +2442,8 @@ final Token token,token1; case INT: case INTEGER: case AT: - case DOLLAR: case BANG: + case TILDE: case PLUS_PLUS: case MINUS_MINUS: case PLUS: @@ -2518,9 +2452,9 @@ final Token token,token1; case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOLLAR: case IDENTIFIER: case LPAREN: - case DOLLAR_ID: switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: case LIST: @@ -2530,8 +2464,8 @@ final Token token,token1; case TRUE: case FALSE: case AT: - case DOLLAR: case BANG: + case TILDE: case PLUS_PLUS: case MINUS_MINUS: case PLUS: @@ -2540,9 +2474,9 @@ final Token token,token1; case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOLLAR: case IDENTIFIER: case LPAREN: - case DOLLAR_ID: expression = Expression(); pos = expression.sourceEnd+1; break; @@ -2559,13 +2493,13 @@ final Token token,token1; pos = expression.sourceEnd+1; break; default: - jj_la1[70] = jj_gen; + jj_la1[66] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[71] = jj_gen; + jj_la1[67] = jj_gen; ; } try { @@ -2580,8 +2514,101 @@ final Token token,token1; } {if (true) return new ArrayDeclarator(prefix,expression,pos);} break; + case LBRACE: + token = jj_consume_token(LBRACE); + pos = token.sourceEnd+1; + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ARRAY: + case LIST: + case PRINT: + case NEW: + case NULL: + case TRUE: + case FALSE: + case STRING: + case OBJECT: + case BOOL: + case BOOLEAN: + case REAL: + case DOUBLE: + case FLOAT: + case INT: + case INTEGER: + case AT: + case BANG: + case TILDE: + case PLUS_PLUS: + case MINUS_MINUS: + case PLUS: + case MINUS: + case BIT_AND: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case DOLLAR: + case IDENTIFIER: + case LPAREN: + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ARRAY: + case LIST: + case PRINT: + case NEW: + case NULL: + case TRUE: + case FALSE: + case AT: + case BANG: + case TILDE: + case PLUS_PLUS: + case MINUS_MINUS: + case PLUS: + case MINUS: + case BIT_AND: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case DOLLAR: + case IDENTIFIER: + case LPAREN: + expression = Expression(); + pos = expression.sourceEnd+1; + break; + case STRING: + case OBJECT: + case BOOL: + case BOOLEAN: + case REAL: + case DOUBLE: + case FLOAT: + case INT: + case INTEGER: + expression = Type(); + pos = expression.sourceEnd+1; + break; + default: + jj_la1[68] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + break; + default: + jj_la1[69] = jj_gen; + ; + } + try { + token = jj_consume_token(RBRACE); + pos = token.sourceEnd; + } catch (ParseException e) { + errorMessage = "']' expected"; + errorLevel = ERROR; + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); + } + {if (true) return new ArrayDeclarator(prefix,expression,pos);} + break; default: - jj_la1[72] = jj_gen; + jj_la1[70] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2616,7 +2643,7 @@ final Token token,token1; {if (true) return new NullLiteral(token);} break; default: - jj_la1[73] = jj_gen; + jj_la1[71] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2636,8 +2663,8 @@ final Token token; case TRUE: case FALSE: case AT: - case DOLLAR: case BANG: + case TILDE: case PLUS_PLUS: case MINUS_MINUS: case PLUS: @@ -2646,13 +2673,13 @@ final Token token; case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOLLAR: case IDENTIFIER: case LPAREN: - case DOLLAR_ID: args = ArgumentList(); break; default: - jj_la1[74] = jj_gen; + jj_la1[72] = jj_gen; ; } try { @@ -2688,7 +2715,7 @@ Token token; ; break; default: - jj_la1[75] = jj_gen; + jj_la1[73] = jj_gen; break label_20; } token = jj_consume_token(COMMA); @@ -2718,7 +2745,7 @@ Token token; static final public Statement StatementNoBreak() throws ParseException { final Statement statement; Token token = null; - if (jj_2_5(2)) { + if (jj_2_4(2)) { statement = expressionStatement(); {if (true) return statement;} } else { @@ -2781,7 +2808,7 @@ Token token; token = jj_consume_token(AT); break; default: - jj_la1[76] = jj_gen; + jj_la1[74] = jj_gen; ; } statement = IncludeStatement(); @@ -2804,7 +2831,7 @@ Token token; currentSegment.add((Outlineable)statement);{if (true) return statement;} break; default: - jj_la1[77] = jj_gen; + jj_la1[75] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2934,8 +2961,8 @@ Token token; case WHILE: case FOREACH: case AT: - case DOLLAR: case BANG: + case TILDE: case PLUS_PLUS: case MINUS_MINUS: case PLUS: @@ -2944,11 +2971,11 @@ Token token; case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: + case DOLLAR: case IDENTIFIER: case LPAREN: case LBRACE: case SEMICOLON: - case DOLLAR_ID: statement = StatementNoBreak(); {if (true) return statement;} break; @@ -2957,7 +2984,7 @@ Token token; {if (true) return statement;} break; default: - jj_la1[78] = jj_gen; + jj_la1[76] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2971,7 +2998,9 @@ Token token; final int startIndex = nodePtr; final AstNode[] blockNodes; final int nbNodes; - jj_consume_token(PHPEND); + final Token phpEnd; + phpEnd = jj_consume_token(PHPEND); + htmlStart = phpEnd.sourceEnd; label_21: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2979,7 +3008,7 @@ Token token; ; break; default: - jj_la1[79] = jj_gen; + jj_la1[77] = jj_gen; break label_21; } phpEchoBlock(); @@ -2993,10 +3022,11 @@ Token token; jj_consume_token(PHPSTARTSHORT); break; default: - jj_la1[80] = jj_gen; + jj_la1[78] = jj_gen; jj_consume_token(-1); throw new ParseException(); } + PHPParser.createNewHTMLCode(); } catch (ParseException e) { errorMessage = "unexpected end of file , '= 0) { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 129; i++) { + for (int i = 0; i < 126; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1< jj_gen) { @@ -7355,7 +7395,6 @@ final ArrayList list = new ArrayList(); case 2: jj_3_3(); break; case 3: jj_3_4(); break; case 4: jj_3_5(); break; - case 5: jj_3_6(); break; } } p = p.next; diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.jj b/net.sourceforge.phpeclipse/src/test/PHPParser.jj index e8ab5f2..9ad3eff 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj @@ -87,7 +87,7 @@ public final class PHPParser extends PHPParserSuperclass { /** The cursor in expression stack. */ private static int nodePtr; - public static final boolean PARSER_DEBUG = false; + public static final boolean PARSER_DEBUG = true; public final void setFileToParse(final IFile fileToParse) { PHPParser.fileToParse = fileToParse; @@ -331,19 +331,20 @@ public final class PHPParser extends PHPParserSuperclass { public static final void createNewHTMLCode() { final int currentPosition = token.sourceStart; if (currentPosition == htmlStart || + currentPosition < htmlStart || currentPosition > SimpleCharStream.currentBuffer.length()) { return; } - final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,currentPosition+1).toCharArray(); + final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart, + currentPosition).toCharArray(); pushOnAstNodes(new HTMLCode(chars, htmlStart,currentPosition)); } /** Create a new task. */ - public static final void createNewTask() { - final int currentPosition = token.sourceStart; - final String todo = SimpleCharStream.currentBuffer.substring(currentPosition-3, + public static final void createNewTask(final int todoStart) { + final String todo = SimpleCharStream.currentBuffer.substring(todoStart, SimpleCharStream.currentBuffer.indexOf("\n", - currentPosition)-1); + todoStart)-1); if (!PARSER_DEBUG) { try { setMarker(fileToParse, @@ -378,14 +379,14 @@ TOKEN_MGR_DECLS: TOKEN : { - {PHPParser.createNewHTMLCode();} : PHPPARSING -| {PHPParser.createNewHTMLCode();} : PHPPARSING -| : PHPPARSING +| : PHPPARSING +| "> {PHPParser.htmlStart = PHPParser.token.sourceEnd;} : DEFAULT + "> : DEFAULT } /* Skip any character if we are not in php mode */ @@ -405,6 +406,14 @@ TOKEN_MGR_DECLS: | "\f" } + SPECIAL_TOKEN : +{ + " " : PHPPARSING +| "\t" : PHPPARSING +| "\n" : PHPPARSING +| "\r" : PHPPARSING +| "\f" : PHPPARSING +} /* COMMENTS */ SPECIAL_TOKEN : { @@ -422,9 +431,14 @@ TOKEN_MGR_DECLS: SPECIAL_TOKEN : { - "todo" {PHPParser.createNewTask();} + "todo" } +void todo() : +{Token todoToken;} +{ + todoToken = "TODO" {createNewTask(todoToken.sourceStart);} +} SPECIAL_TOKEN : { "*/" : PHPPARSING @@ -467,9 +481,13 @@ MORE : | | | -| "> -| -| "> +} + + TOKEN : +{ + "> : PHPPARSING +| : PHPPARSING +| "> : PHPPARSING } /* RESERVED WORDS AND LITERALS */ @@ -516,36 +534,35 @@ MORE : } //Misc token - TOKEN : + TOKEN : { - -| -| -| -| -| + : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING } /* OPERATORS */ - TOKEN : -{ - -| -| -| -| -| -| -| -| -| -| -| -| -| >"> -| >>"> -| <_ORL : "OR"> -| <_ANDL : "AND"> + TOKEN : +{ + : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| >"> : PHPPARSING +| >>"> : PHPPARSING +| <_ORL : "OR"> : PHPPARSING +| <_ANDL : "AND"> : PHPPARSING } /* LITERALS */ @@ -580,7 +597,11 @@ MORE : /* IDENTIFIERS */ - TOKEN : + + TOKEN : { : IN_VARIABLE} + + + TOKEN : { |) (||)* > | @@ -599,55 +620,50 @@ MORE : /* SEPARATORS */ - TOKEN : + TOKEN : { - -| -| -| -| -| -| -| -| + : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| : PHPPARSING } /* COMPARATOR */ - TOKEN : + TOKEN : { - "> -| -| -| ="> -| "> -| -| + "> : PHPPARSING +| : PHPPARSING +| : PHPPARSING +| ="> : PHPPARSING +| "> : PHPPARSING +| : PHPPARSING +| : PHPPARSING } /* ASSIGNATION */ - TOKEN : -{ - -| >="> -} - - TOKEN : -{ - > + TOKEN : +{ + : PHPPARSING +| >="> : PHPPARSING } void phpTest() : @@ -681,7 +697,7 @@ void phpFile() : void PhpBlock() : { final PHPEchoBlock phpEchoBlock; - final Token token; + final Token token,phpEnd; } { phpEchoBlock = phpEchoBlock() @@ -700,9 +716,11 @@ void PhpBlock() : PHPeclipsePlugin.log(e); }} ] + {PHPParser.createNewHTMLCode();} Php() try { - + phpEnd = + {htmlStart = phpEnd.sourceEnd;} } catch (ParseException e) { errorMessage = "'?>' expected"; errorLevel = ERROR; @@ -719,8 +737,11 @@ PHPEchoBlock phpEchoBlock() : final Token token, token2; } { - token = expr = Expression() [ ] token2 = + token = {PHPParser.createNewHTMLCode();} + expr = Expression() [ ] token2 = { + htmlStart = token2.sourceEnd; + echoBlock = new PHPEchoBlock(expr,token.sourceStart,token2.sourceEnd); pushOnAstNodes(echoBlock); return echoBlock;} @@ -739,6 +760,7 @@ ClassDeclaration ClassDeclaration() : final Token superclassName, token, extendsToken; String classNameImage = SYNTAX_ERROR_CHAR; String superclassNameImage = null; + final int classEnd; } { token = @@ -791,15 +813,17 @@ ClassDeclaration ClassDeclaration() : currentSegment.add(classDeclaration); currentSegment = classDeclaration; } - ClassBody(classDeclaration) + classEnd = ClassBody(classDeclaration) {currentSegment = (OutlineableWithChildren) currentSegment.getParent(); - classDeclaration.sourceEnd = SimpleCharStream.getPosition(); + classDeclaration.sourceEnd = classEnd; pushOnAstNodes(classDeclaration); return classDeclaration;} } -void ClassBody(final ClassDeclaration classDeclaration) : -{} +int ClassBody(final ClassDeclaration classDeclaration) : +{ +Token token; +} { try { @@ -812,13 +836,15 @@ void ClassBody(final ClassDeclaration classDeclaration) : } ( ClassBodyDeclaration(classDeclaration) )* try { - + token = + {return token.sourceEnd;} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. 'var', 'function' or '}' expected"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; processParseExceptionDebug(e); + return PHPParser.token.sourceEnd; } } @@ -894,12 +920,20 @@ FieldDeclaration FieldDeclaration() : */ VariableDeclaration VariableDeclaratorNoSuffix() : { - final Token varName; - Expression initializer = null; + final Token dollar, token, lbrace,rbrace; + Expression expr, initializer = null; Token assignToken; + Variable variable; } { - varName = + dollar = + ( + token = + {variable = new Variable(token.image,dollar.sourceStart,token.sourceEnd);} + | + lbrace = expr = Expression() rbrace = + {variable = new Variable(expr,dollar.sourceStart,rbrace.sourceEnd);} + ) [ assignToken = try { @@ -915,19 +949,15 @@ VariableDeclaration VariableDeclaratorNoSuffix() : { if (initializer == null) { return new VariableDeclaration(currentSegment, - new Variable(varName.image.substring(1), - varName.sourceStart+1, - varName.sourceEnd+1), - varName.sourceStart+1, - varName.sourceEnd+1); + variable, + variable.sourceStart, + variable.sourceEnd); } return new VariableDeclaration(currentSegment, - new Variable(varName.image.substring(1), - varName.sourceStart+1, - varName.sourceEnd+1), + variable, initializer, VariableDeclaration.EQUAL, - varName.sourceStart+1); + variable.sourceStart); } } @@ -1000,59 +1030,12 @@ AbstractVariable VariableDeclaratorId() : } } -/** - * Return a variablename without the $. - * @return a variable name - *//* -Variable Variable(): -{ - final StringBuffer buff; - Expression expression = null; - final Token token; - Variable expr; - final int pos; -} -{ - token = - [ expression = Expression() ] - { - if (expression == null) { - return new Variable(token.image.substring(1), - token.sourceStart+1, - token.sourceEnd+1); - } - String s = expression.toStringExpression(); - buff = new StringBuffer(token.image.length()+s.length()+2); - buff.append(token.image); - buff.append("{"); - buff.append(s); - buff.append("}"); - s = buff.toString(); - return new Variable(s,token.sourceStart+1,token.sourceEnd+1); - } -| - token = - expr = VariableName() - {return new Variable(expr,token.sourceStart,expr.sourceEnd);} -} */ - Variable Variable() : { Variable variable = null; final Token token; } { - token = [variable = Var(token)] - { - if (variable == null) { - return new Variable(token.image.substring(1),token.sourceStart+1,token.sourceEnd+1); - } - final StringBuffer buff = new StringBuffer(); - buff.append(token.image.substring(1)); - buff.append(variable.toStringExpression()); - return new Variable(buff.toString(),token.sourceStart+1,variable.sourceEnd+1); - } -| token = variable = Var(token) { return new Variable(variable,token.sourceStart,variable.sourceEnd); @@ -1062,88 +1045,23 @@ Variable Variable() : Variable Var(final Token dollar) : { Variable variable = null; - final Token token; + final Token token,token2; ConstantIdentifier constant; + Expression expression; } { - token = [variable = Var(token)] - {if (variable == null) { - return new Variable(token.image.substring(1),token.sourceStart+1,token.sourceEnd+1); - } - final StringBuffer buff = new StringBuffer(); - buff.append(token.image.substring(1)); - buff.append(variable.toStringExpression()); - return new Variable(buff.toString(),dollar.sourceStart,variable.sourceEnd); - } -| - LOOKAHEAD( ) token = variable = Var(token) {return new Variable(variable,dollar.sourceStart,variable.sourceEnd);} | - constant = VariableName() - {return new Variable(constant.name,dollar.sourceStart,constant.sourceEnd);} -} - -/** - * A Variable name (without the $) - * @return a variable name String - */ -ConstantIdentifier VariableName(): -{ - final StringBuffer buff; - String expr; - Expression expression = null; - final Token token; - Token token2 = null; -} -{ token = expression = Expression() token2 = - {expr = expression.toStringExpression(); - buff = new StringBuffer(expr.length()+2); - buff.append("{"); - buff.append(expr); - buff.append("}"); - expr = buff.toString(); - return new ConstantIdentifier(expr, - token.sourceStart, - token2.sourceEnd); - - } -| - token = - [ expression = Expression() token2 = ] { - if (expression == null) { - return new ConstantIdentifier(token.image, - token.sourceStart, - token.sourceEnd); - } - expr = expression.toStringExpression(); - buff = new StringBuffer(token.image.length()+expr.length()+2); - buff.append(token.image); - buff.append("{"); - buff.append(expr); - buff.append("}"); - expr = buff.toString(); - return new ConstantIdentifier(expr, - token.sourceStart, - token2.sourceEnd); - } -/*| - - var = VariableName() - { - return new Variable(var, - var.sourceStart-1, - var.sourceEnd); + return new Variable(expression, + dollar.sourceStart, + token2.sourceEnd); } | - token = - { - return new Variable(token.image, - token.sourceStart+1, - token.sourceEnd+1); - } */ + token = + {return new Variable(token.image,dollar.sourceStart,token.sourceEnd);} } Expression VariableInitializer() : @@ -1685,7 +1603,29 @@ Expression UnaryExpression() : /* expr = UnaryExpressionNoPrefix() //why did I had that ? {return new PrefixedUnaryExpression(expr,OperatorIds.AND,pos);} | */ - expr = AtNotUnaryExpression() {return expr;} + expr = AtNotTildeUnaryExpression() {return expr;} +} + +Expression AtNotTildeUnaryExpression() : +{ + final Expression expr; + final Token token; +} +{ + token = + expr = AtNotTildeUnaryExpression() + {return new PrefixedUnaryExpression(expr,OperatorIds.AT,token.sourceStart);} +| + token = + expr = AtNotTildeUnaryExpression() + {return new PrefixedUnaryExpression(expr,OperatorIds.TWIDDLE,token.sourceStart);} +| + token = + expr = AtNotUnaryExpression() + {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);} +| + expr = UnaryExpressionNoPrefix() + {return expr;} } /** @@ -1716,11 +1656,11 @@ Expression UnaryExpressionNoPrefix() : final Token token; } { - token = expr = AtNotUnaryExpression() {return new PrefixedUnaryExpression(expr, + token = expr = AtNotTildeUnaryExpression() {return new PrefixedUnaryExpression(expr, OperatorIds.PLUS, token.sourceStart);} | - token = expr = AtNotUnaryExpression() {return new PrefixedUnaryExpression(expr, + token = expr = AtNotTildeUnaryExpression() {return new PrefixedUnaryExpression(expr, OperatorIds.MINUS, token.sourceStart);} | @@ -1909,14 +1849,26 @@ Expression ClassIdentifier(): AbstractVariable VariableSuffix(final AbstractVariable prefix) : { Expression expression = null; - final Token classAccessToken; + final Token classAccessToken,lbrace,rbrace; Token token; int pos; } { classAccessToken = try { - ( expression = VariableName() | expression = Variable() ) + ( + lbrace = expression = Expression() rbrace = + { + expression = new Variable(expression, + lbrace.sourceStart, + rbrace.sourceEnd); + } + | + token = + {expression = new Variable(token.image,token.sourceStart,token.sourceEnd);} + | + expression = Variable() + ) } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function call or field access expected"; errorLevel = ERROR; @@ -1942,6 +1894,21 @@ AbstractVariable VariableSuffix(final AbstractVariable prefix) : processParseExceptionDebug(e); } {return new ArrayDeclarator(prefix,expression,pos);} +| + token = {pos = token.sourceEnd+1;} + [ expression = Expression() {pos = expression.sourceEnd+1;} + | expression = Type() {pos = expression.sourceEnd+1;}] //Not good + try { + token = + {pos = token.sourceEnd;} + } catch (ParseException e) { + errorMessage = "']' expected"; + errorLevel = ERROR; + errorStart = pos; + errorEnd = pos; + processParseExceptionDebug(e); + } + {return new ArrayDeclarator(prefix,expression,pos);}//todo : check braces here } Literal Literal() : @@ -2162,11 +2129,15 @@ HTMLBlock htmlBlock() : final int startIndex = nodePtr; final AstNode[] blockNodes; final int nbNodes; + final Token phpEnd; } { - (phpEchoBlock())* + phpEnd = + {htmlStart = phpEnd.sourceEnd;} + (phpEchoBlock())* try { ( | ) + {PHPParser.createNewHTMLCode();} } catch (ParseException e) { errorMessage = "unexpected end of file , ' {keyword = InclusionStatement.INCLUDE_ONCE;pos=token.sourceEnd;}) try { expr = Expression() - {pos=expr.sourceEnd;} + {pos = expr.sourceEnd;} } catch (ParseException e) { if (errorMessage != null) { throw e; } errorMessage = "unexpected token '"+ e.currentToken.next.image+"', expression expected"; errorLevel = ERROR; - errorStart = pos+1; - errorEnd = pos+1; + errorStart = e.currentToken.next.sourceStart; + errorEnd = e.currentToken.next.sourceEnd; expr = new ConstantIdentifier(SYNTAX_ERROR_CHAR,pos,pos); processParseExceptionDebug(e); } - {inclusionStatement = new InclusionStatement(currentSegment, - keyword, - expr, - token.sourceStart); - currentSegment.add(inclusionStatement); - } try { token2 = + {pos=token2.sourceEnd;} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + errorStart = e.currentToken.next.sourceStart; + errorEnd = e.currentToken.next.sourceEnd; + processParseExceptionDebug(e); + } + { + inclusionStatement = new InclusionStatement(currentSegment, + keyword, + expr, + token.sourceStart, + pos); + currentSegment.add(inclusionStatement); + return inclusionStatement; } - {inclusionStatement.sourceEnd = token2.sourceEnd; - return inclusionStatement;} } PrintExpression PrintExpression() : @@ -2448,7 +2424,13 @@ Block Block() : processParseExceptionDebug(e); } ( statement = BlockStatement() {list.add(statement);pos = statement.sourceEnd+1;} - | statement = htmlBlock() {list.add(statement);pos = statement.sourceEnd+1;})* + | statement = htmlBlock() {if (statement != null) { + list.add(statement); + pos = statement.sourceEnd+1; + } + pos = PHPParser.token.sourceEnd+1; + } + )* try { token2 = {pos = token2.sourceEnd+1;} @@ -2652,6 +2634,7 @@ AbstractCase[] switchStatementBrace() : return abcase; } } + /** * A Switch statement with : ... endswitch; * @param start the begin offset of the switch @@ -2712,8 +2695,9 @@ AbstractCase switchLabel0() : { expr = SwitchLabel() ( statement = BlockStatementNoBreak() {stmts.add(statement);} - | statement = htmlBlock() {stmts.add(statement);})* - [ statement = BreakStatement() {stmts.add(statement);}] + | statement = htmlBlock() {if (statement != null) {stmts.add(statement);}} + | statement = BreakStatement() {stmts.add(statement);})* + //[ statement = BreakStatement() {stmts.add(statement);}] { final int listSize = stmts.size(); final Statement[] stmtsArray = new Statement[listSize]; @@ -2854,7 +2838,7 @@ IfStatement IfStatement0(final Expression condition, final int start,final int e {stmts = new ArrayList();} ( statement = Statement() {stmts.add(statement);} - | statement = htmlBlock() {stmts.add(statement);})* + | statement = htmlBlock() {if (statement != null) {stmts.add(statement);}})* {endStatements = SimpleCharStream.getPosition();} (elseifStatement = ElseIfStatementColon() {elseIfList.add(elseifStatement);})* [elseStatement = ElseStatementColon()] @@ -2950,7 +2934,7 @@ ElseIf ElseIfStatementColon() : { elseifToken = condition = Condition("elseif") ( statement = Statement() {list.add(statement);} - | statement = htmlBlock() {list.add(statement);})* + | statement = htmlBlock() {if (statement != null) {list.add(statement);}})* { final int sizeList = list.size(); final Statement[] stmtsArray = new Statement[sizeList]; @@ -2968,7 +2952,7 @@ Else ElseStatementColon() : } { elseToken = ( statement = Statement() {list.add(statement);} - | statement = htmlBlock() {list.add(statement);})* + | statement = htmlBlock() {if (statement != null) {list.add(statement);}})* { final int sizeList = list.size(); final Statement[] stmtsArray = new Statement[sizeList]; diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java b/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java index 33e3a98..85ec698 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java @@ -8,135 +8,135 @@ public interface PHPParserConstants { int PHPSTARTLONG = 2; int PHPECHOSTART = 3; int PHPEND = 4; - int SINGLE_LINE_COMMENT = 15; - int CLASS = 21; - int FUNCTION = 22; - int VAR = 23; - int IF = 24; - int ELSEIF = 25; - int ELSE = 26; - int ARRAY = 27; - int BREAK = 28; - int LIST = 29; - int PRINT = 30; - int ECHO = 31; - int INCLUDE = 32; - int REQUIRE = 33; - int INCLUDE_ONCE = 34; - int REQUIRE_ONCE = 35; - int GLOBAL = 36; - int DEFINE = 37; - int STATIC = 38; - int CLASSACCESS = 39; - int STATICCLASSACCESS = 40; - int ARRAYASSIGN = 41; - int CASE = 42; - int CONST = 43; - int CONTINUE = 44; - int _DEFAULT = 45; - int DO = 46; - int EXTENDS = 47; - int FOR = 48; - int GOTO = 49; - int NEW = 50; - int NULL = 51; - int RETURN = 52; - int SUPER = 53; - int SWITCH = 54; - int THIS = 55; - int TRUE = 56; - int FALSE = 57; - int WHILE = 58; - int ENDWHILE = 59; - int ENDSWITCH = 60; - int ENDIF = 61; - int ENDFOR = 62; - int FOREACH = 63; - int AS = 64; - int STRING = 65; - int OBJECT = 66; - int BOOL = 67; - int BOOLEAN = 68; - int REAL = 69; - int DOUBLE = 70; - int FLOAT = 71; - int INT = 72; - int INTEGER = 73; - int AT = 74; - int DOLLAR = 75; - int BANG = 76; - int TILDE = 77; - int HOOK = 78; - int COLON = 79; - int OR_OR = 80; - int AND_AND = 81; - int PLUS_PLUS = 82; - int MINUS_MINUS = 83; - int PLUS = 84; - int MINUS = 85; - int STAR = 86; - int SLASH = 87; - int BIT_AND = 88; - int BIT_OR = 89; - int XOR = 90; - int REMAINDER = 91; - int LSHIFT = 92; - int RSIGNEDSHIFT = 93; - int RUNSIGNEDSHIFT = 94; - int _ORL = 95; - int _ANDL = 96; - int INTEGER_LITERAL = 97; - int DECIMAL_LITERAL = 98; - int HEX_LITERAL = 99; - int OCTAL_LITERAL = 100; - int FLOATING_POINT_LITERAL = 101; - int EXPONENT = 102; - int STRING_LITERAL = 103; - int STRING_1 = 104; - int STRING_2 = 105; - int STRING_3 = 106; - int IDENTIFIER = 107; - int LETTER = 108; - int DIGIT = 109; - int SPECIAL = 110; - int LPAREN = 111; - int RPAREN = 112; - int LBRACE = 113; - int RBRACE = 114; - int LBRACKET = 115; - int RBRACKET = 116; - int SEMICOLON = 117; - int COMMA = 118; - int DOT = 119; - int GT = 120; - int LT = 121; - int EQUAL_EQUAL = 122; - int LE = 123; - int GE = 124; - int NOT_EQUAL = 125; - int DIF = 126; - int BANGDOUBLEEQUAL = 127; - int TRIPLEEQUAL = 128; - int ASSIGN = 129; - int PLUSASSIGN = 130; - int MINUSASSIGN = 131; - int STARASSIGN = 132; - int SLASHASSIGN = 133; - int ANDASSIGN = 134; - int ORASSIGN = 135; - int XORASSIGN = 136; - int DOTASSIGN = 137; - int REMASSIGN = 138; - int TILDEEQUAL = 139; - int LSHIFTASSIGN = 140; - int RSIGNEDSHIFTASSIGN = 141; - int DOLLAR_ID = 142; + int SINGLE_LINE_COMMENT = 20; + int CLASS = 27; + int FUNCTION = 28; + int VAR = 29; + int IF = 30; + int ELSEIF = 31; + int ELSE = 32; + int ARRAY = 33; + int BREAK = 34; + int LIST = 35; + int PRINT = 36; + int ECHO = 37; + int INCLUDE = 38; + int REQUIRE = 39; + int INCLUDE_ONCE = 40; + int REQUIRE_ONCE = 41; + int GLOBAL = 42; + int DEFINE = 43; + int STATIC = 44; + int CLASSACCESS = 45; + int STATICCLASSACCESS = 46; + int ARRAYASSIGN = 47; + int CASE = 48; + int CONST = 49; + int CONTINUE = 50; + int _DEFAULT = 51; + int DO = 52; + int EXTENDS = 53; + int FOR = 54; + int GOTO = 55; + int NEW = 56; + int NULL = 57; + int RETURN = 58; + int SUPER = 59; + int SWITCH = 60; + int THIS = 61; + int TRUE = 62; + int FALSE = 63; + int WHILE = 64; + int ENDWHILE = 65; + int ENDSWITCH = 66; + int ENDIF = 67; + int ENDFOR = 68; + int FOREACH = 69; + int AS = 70; + int STRING = 71; + int OBJECT = 72; + int BOOL = 73; + int BOOLEAN = 74; + int REAL = 75; + int DOUBLE = 76; + int FLOAT = 77; + int INT = 78; + int INTEGER = 79; + int AT = 80; + int BANG = 81; + int TILDE = 82; + int HOOK = 83; + int COLON = 84; + int OR_OR = 85; + int AND_AND = 86; + int PLUS_PLUS = 87; + int MINUS_MINUS = 88; + int PLUS = 89; + int MINUS = 90; + int STAR = 91; + int SLASH = 92; + int BIT_AND = 93; + int BIT_OR = 94; + int XOR = 95; + int REMAINDER = 96; + int LSHIFT = 97; + int RSIGNEDSHIFT = 98; + int RUNSIGNEDSHIFT = 99; + int _ORL = 100; + int _ANDL = 101; + int INTEGER_LITERAL = 102; + int DECIMAL_LITERAL = 103; + int HEX_LITERAL = 104; + int OCTAL_LITERAL = 105; + int FLOATING_POINT_LITERAL = 106; + int EXPONENT = 107; + int STRING_LITERAL = 108; + int STRING_1 = 109; + int STRING_2 = 110; + int STRING_3 = 111; + int DOLLAR = 112; + int IDENTIFIER = 113; + int LETTER = 114; + int DIGIT = 115; + int SPECIAL = 116; + int LPAREN = 117; + int RPAREN = 118; + int LBRACE = 119; + int RBRACE = 120; + int LBRACKET = 121; + int RBRACKET = 122; + int SEMICOLON = 123; + int COMMA = 124; + int DOT = 125; + int GT = 126; + int LT = 127; + int EQUAL_EQUAL = 128; + int LE = 129; + int GE = 130; + int NOT_EQUAL = 131; + int DIF = 132; + int BANGDOUBLEEQUAL = 133; + int TRIPLEEQUAL = 134; + int ASSIGN = 135; + int PLUSASSIGN = 136; + int MINUSASSIGN = 137; + int STARASSIGN = 138; + int SLASHASSIGN = 139; + int ANDASSIGN = 140; + int ORASSIGN = 141; + int XORASSIGN = 142; + int DOTASSIGN = 143; + int REMASSIGN = 144; + int TILDEEQUAL = 145; + int LSHIFTASSIGN = 146; + int RSIGNEDSHIFTASSIGN = 147; int DEFAULT = 0; int PHPPARSING = 1; int IN_SINGLE_LINE_COMMENT = 2; - int IN_FORMAL_COMMENT = 3; - int IN_MULTI_LINE_COMMENT = 4; + int IN_VARIABLE = 3; + int IN_FORMAL_COMMENT = 4; + int IN_MULTI_LINE_COMMENT = 5; String[] tokenImage = { "", @@ -150,16 +150,22 @@ public interface PHPParserConstants { "\"\\n\"", "\"\\r\"", "\"\\f\"", + "\" \"", + "\"\\t\"", + "\"\\n\"", + "\"\\r\"", + "\"\\f\"", "\"//\"", "\"#\"", - "", + "", "\"/*\"", "", - "", + "", "\"todo\"", + "\"TODO\"", "\"*/\"", "\"*/\"", - "", + "", "\"class\"", "\"function\"", "\"var\"", @@ -214,7 +220,6 @@ public interface PHPParserConstants { "\"int\"", "\"integer\"", "\"@\"", - "\"$\"", "\"!\"", "\"~\"", "\"?\"", @@ -246,6 +251,7 @@ public interface PHPParserConstants { "", "", "", + "\"$\"", "", "", "", @@ -281,7 +287,6 @@ public interface PHPParserConstants { "\"~=\"", "\"<<=\"", "\">>=\"", - "", }; } diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java index 434a067..1b01b7c 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java @@ -42,6 +42,9 @@ static private final int jjMoveStringLiteralDfa0_0() { case 60: return jjMoveStringLiteralDfa1_0(0xeL); + case 84: + case 116: + return jjMoveStringLiteralDfa1_0(0x800000L); default : return 1; } @@ -61,6 +64,9 @@ static private final int jjMoveStringLiteralDfa1_0(long active0) jjmatchedPos = 1; } return jjMoveStringLiteralDfa2_0(active0, 0xcL); + case 79: + case 111: + return jjMoveStringLiteralDfa2_0(active0, 0x800000L); default : return 2; } @@ -79,6 +85,9 @@ static private final int jjMoveStringLiteralDfa2_0(long old0, long active0) if ((active0 & 0x8L) != 0L) return jjStopAtPos(2, 3); break; + case 68: + case 100: + return jjMoveStringLiteralDfa3_0(active0, 0x800000L); case 80: case 112: return jjMoveStringLiteralDfa3_0(active0, 0x4L); @@ -100,9 +109,15 @@ static private final int jjMoveStringLiteralDfa3_0(long old0, long active0) case 72: case 104: return jjMoveStringLiteralDfa4_0(active0, 0x4L); + case 79: + case 111: + if ((active0 & 0x800000L) != 0L) + return jjStopAtPos(3, 23); + break; default : return 4; } + return 4; } static private final int jjMoveStringLiteralDfa4_0(long old0, long active0) { @@ -124,20 +139,20 @@ static private final int jjMoveStringLiteralDfa4_0(long old0, long active0) } return 5; } -static private final int jjMoveStringLiteralDfa0_4() +static private final int jjMoveStringLiteralDfa0_5() { switch(curChar) { case 42: - return jjMoveStringLiteralDfa1_4(0x80000L); + return jjMoveStringLiteralDfa1_5(0x2000000L); case 84: case 116: - return jjMoveStringLiteralDfa1_4(0x20000L); + return jjMoveStringLiteralDfa1_5(0x400000L); default : return 1; } } -static private final int jjMoveStringLiteralDfa1_4(long active0) +static private final int jjMoveStringLiteralDfa1_5(long active0) { try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { @@ -146,18 +161,18 @@ static private final int jjMoveStringLiteralDfa1_4(long active0) switch(curChar) { case 47: - if ((active0 & 0x80000L) != 0L) - return jjStopAtPos(1, 19); + if ((active0 & 0x2000000L) != 0L) + return jjStopAtPos(1, 25); break; case 79: case 111: - return jjMoveStringLiteralDfa2_4(active0, 0x20000L); + return jjMoveStringLiteralDfa2_5(active0, 0x400000L); default : return 2; } return 2; } -static private final int jjMoveStringLiteralDfa2_4(long old0, long active0) +static private final int jjMoveStringLiteralDfa2_5(long old0, long active0) { if (((active0 &= old0)) == 0L) return 2; @@ -169,12 +184,12 @@ static private final int jjMoveStringLiteralDfa2_4(long old0, long active0) { case 68: case 100: - return jjMoveStringLiteralDfa3_4(active0, 0x20000L); + return jjMoveStringLiteralDfa3_5(active0, 0x400000L); default : return 3; } } -static private final int jjMoveStringLiteralDfa3_4(long old0, long active0) +static private final int jjMoveStringLiteralDfa3_5(long old0, long active0) { if (((active0 &= old0)) == 0L) return 3; @@ -186,8 +201,8 @@ static private final int jjMoveStringLiteralDfa3_4(long old0, long active0) { case 79: case 111: - if ((active0 & 0x20000L) != 0L) - return jjStopAtPos(3, 17); + if ((active0 & 0x400000L) != 0L) + return jjStopAtPos(3, 22); break; default : return 4; @@ -222,7 +237,7 @@ static private final int jjMoveStringLiteralDfa0_2() return jjMoveStringLiteralDfa1_2(0x10L); case 84: case 116: - return jjMoveStringLiteralDfa1_2(0x20000L); + return jjMoveStringLiteralDfa1_2(0x400000L); default : return jjMoveNfa_2(0, 0); } @@ -242,7 +257,7 @@ static private final int jjMoveStringLiteralDfa1_2(long active0) break; case 79: case 111: - return jjMoveStringLiteralDfa2_2(active0, 0x20000L); + return jjMoveStringLiteralDfa2_2(active0, 0x400000L); default : break; } @@ -261,7 +276,7 @@ static private final int jjMoveStringLiteralDfa2_2(long old0, long active0) { case 68: case 100: - return jjMoveStringLiteralDfa3_2(active0, 0x20000L); + return jjMoveStringLiteralDfa3_2(active0, 0x400000L); default : break; } @@ -280,8 +295,8 @@ static private final int jjMoveStringLiteralDfa3_2(long old0, long active0) { case 79: case 111: - if ((active0 & 0x20000L) != 0L) - return jjStopAtPos(3, 17); + if ((active0 & 0x400000L) != 0L) + return jjStopAtPos(3, 22); break; default : break; @@ -340,15 +355,15 @@ static private final int jjMoveNfa_2(int startState, int curPos) case 0: if ((0x2400L & l) != 0L) { - if (kind > 15) - kind = 15; + if (kind > 20) + kind = 20; } if (curChar == 13) jjstateSet[jjnewStateCnt++] = 1; break; case 1: - if (curChar == 10 && kind > 15) - kind = 15; + if (curChar == 10 && kind > 20) + kind = 20; break; case 2: if (curChar == 13) @@ -399,124 +414,122 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac switch (pos) { case 0: - if ((active0 & 0x4800L) != 0L || (active1 & 0x800000L) != 0L || (active2 & 0x20L) != 0L) + if ((active0 & 0x90000L) != 0L || (active1 & 0x10000000L) != 0L || (active2 & 0x800L) != 0L) return 2; - if ((active1 & 0x800L) != 0L) - return 16; - if ((active1 & 0x80000000000000L) != 0L || (active2 & 0x200L) != 0L) + if ((active1 & 0x2000000000000000L) != 0L || (active2 & 0x8000L) != 0L) return 8; - if ((active0 & 0xfffffc7fffe00000L) != 0L || (active1 & 0x1800003ffL) != 0L) + if ((active0 & 0xffff1ffff8000000L) != 0L || (active1 & 0x300000ffffL) != 0L) { - jjmatchedKind = 107; + jjmatchedKind = 113; return 14; } return -1; case 1: - if ((active0 & 0x4000L) != 0L) + if ((active0 & 0x80000L) != 0L) return 0; - if ((active0 & 0x400001000000L) != 0L || (active1 & 0x80000041L) != 0L) + if ((active0 & 0x10000040000000L) != 0L || (active1 & 0x1000001040L) != 0L) return 14; - if ((active0 & 0xffffbc7ffee00000L) != 0L || (active1 & 0x1000003beL) != 0L) + if ((active0 & 0xffef1fffb8000000L) != 0L || (active1 & 0x200000efbfL) != 0L) { if (jjmatchedPos != 1) { - jjmatchedKind = 107; + jjmatchedKind = 113; jjmatchedPos = 1; } return 14; } return -1; case 2: - if ((active0 & 0x8005000000800000L) != 0L || (active1 & 0x100000300L) != 0L) - return 14; - if ((active0 & 0x7ffabc7ffe600000L) != 0L || (active1 & 0xfeL) != 0L) + if ((active0 & 0xfeaf1fff98000000L) != 0L || (active1 & 0x3f9fL) != 0L) { if (jjmatchedPos != 2) { - jjmatchedKind = 107; + jjmatchedKind = 113; jjmatchedPos = 2; } return 14; } + if ((active0 & 0x140000020000000L) != 0L || (active1 & 0x200000c020L) != 0L) + return 14; return -1; case 3: - if ((active0 & 0x18a0400a6000000L) != 0L || (active1 & 0x38L) != 0L) + if ((active0 & 0x6281002980000000L) != 0L || (active1 & 0xe00L) != 0L) return 14; - if ((active0 & 0xfe70b87f58600000L) != 0L || (active1 & 0x2c6L) != 0L) + if ((active0 & 0x9c2e1fd618000000L) != 0L || (active1 & 0xb1bfL) != 0L) { if (jjmatchedPos != 3) { - jjmatchedKind = 107; + jjmatchedKind = 113; jjmatchedPos = 3; } return 14; } return -1; case 4: - if ((active0 & 0x2620080058200000L) != 0L || (active1 & 0x80L) != 0L) + if ((active0 & 0x8802001608000000L) != 0L || (active1 & 0x2009L) != 0L) return 14; - if ((active0 & 0xd850b07f02400000L) != 0L || (active1 & 0x256L) != 0L) + if ((active0 & 0x142c1fc090000000L) != 0L || (active1 & 0x95b6L) != 0L) { - jjmatchedKind = 107; + jjmatchedKind = 113; jjmatchedPos = 4; return 14; } return -1; case 5: - if ((active0 & 0x4050007002000000L) != 0L || (active1 & 0x46L) != 0L) - return 14; - if ((active0 & 0x9800b00f00400000L) != 0L || (active1 & 0x210L) != 0L) + if ((active0 & 0x2c03c010000000L) != 0L || (active1 & 0x8426L) != 0L) { - jjmatchedKind = 107; + jjmatchedKind = 113; jjmatchedPos = 5; return 14; } + if ((active0 & 0x14001c0080000000L) != 0L || (active1 & 0x1190L) != 0L) + return 14; return -1; case 6: - if ((active0 & 0x8000a00f00000000L) != 0L || (active1 & 0x210L) != 0L) + if ((active0 & 0x2803c000000000L) != 0L || (active1 & 0x8420L) != 0L) return 14; - if ((active0 & 0x1800100000400000L) != 0L) + if ((active0 & 0x4000010000000L) != 0L || (active1 & 0x6L) != 0L) { if (jjmatchedPos != 6) { - jjmatchedKind = 107; + jjmatchedKind = 113; jjmatchedPos = 6; } return 14; } return -1; case 7: - if ((active0 & 0x800100000400000L) != 0L) + if ((active0 & 0x4000010000000L) != 0L || (active1 & 0x2L) != 0L) return 14; - if ((active0 & 0x1000000c00000000L) != 0L) + if ((active0 & 0x30000000000L) != 0L || (active1 & 0x4L) != 0L) { - jjmatchedKind = 107; + jjmatchedKind = 113; jjmatchedPos = 7; return 14; } return -1; case 8: - if ((active0 & 0xc00000000L) != 0L) + if ((active1 & 0x4L) != 0L) + return 14; + if ((active0 & 0x30000000000L) != 0L) { - jjmatchedKind = 107; + jjmatchedKind = 113; jjmatchedPos = 8; return 14; } - if ((active0 & 0x1000000000000000L) != 0L) - return 14; return -1; case 9: - if ((active0 & 0xc00000000L) != 0L) + if ((active0 & 0x30000000000L) != 0L) { - jjmatchedKind = 107; + jjmatchedKind = 113; jjmatchedPos = 9; return 14; } return -1; case 10: - if ((active0 & 0xc00000000L) != 0L) + if ((active0 & 0x30000000000L) != 0L) { - jjmatchedKind = 107; + jjmatchedKind = 113; jjmatchedPos = 10; return 14; } @@ -542,126 +555,126 @@ static private final int jjMoveStringLiteralDfa0_1() switch(curChar) { case 33: - jjmatchedKind = 76; - return jjMoveStringLiteralDfa1_1(0x0L, 0xa000000000000000L, 0x0L); + jjmatchedKind = 81; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x28L); case 35: - return jjStopAtPos(0, 12); + return jjStopAtPos(0, 17); case 36: - return jjStartNfaWithStates_1(0, 75, 16); + return jjStopAtPos(0, 112); case 37: - jjmatchedKind = 91; - return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x400L); + jjmatchedKind = 96; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x10000L); case 38: - jjmatchedKind = 88; - return jjMoveStringLiteralDfa1_1(0x0L, 0x20000L, 0x40L); + jjmatchedKind = 93; + return jjMoveStringLiteralDfa1_1(0x0L, 0x400000L, 0x1000L); case 40: - return jjStopAtPos(0, 111); + return jjStopAtPos(0, 117); case 41: - return jjStopAtPos(0, 112); + return jjStopAtPos(0, 118); case 42: - jjmatchedKind = 86; - return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x10L); + jjmatchedKind = 91; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x400L); case 43: - jjmatchedKind = 84; - return jjMoveStringLiteralDfa1_1(0x0L, 0x40000L, 0x4L); + jjmatchedKind = 89; + return jjMoveStringLiteralDfa1_1(0x0L, 0x800000L, 0x100L); case 44: - return jjStopAtPos(0, 118); + return jjStopAtPos(0, 124); case 45: - jjmatchedKind = 85; - return jjMoveStringLiteralDfa1_1(0x8000000000L, 0x80000L, 0x8L); + jjmatchedKind = 90; + return jjMoveStringLiteralDfa1_1(0x200000000000L, 0x1000000L, 0x200L); case 46: - jjmatchedKind = 119; - return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x200L); + jjmatchedKind = 125; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x8000L); case 47: - jjmatchedKind = 87; - return jjMoveStringLiteralDfa1_1(0x4800L, 0x0L, 0x20L); + jjmatchedKind = 92; + return jjMoveStringLiteralDfa1_1(0x90000L, 0x0L, 0x800L); case 58: - jjmatchedKind = 79; - return jjMoveStringLiteralDfa1_1(0x10000000000L, 0x0L, 0x0L); + jjmatchedKind = 84; + return jjMoveStringLiteralDfa1_1(0x400000000000L, 0x0L, 0x0L); case 59: - return jjStopAtPos(0, 117); + return jjStopAtPos(0, 123); case 60: - jjmatchedKind = 121; - return jjMoveStringLiteralDfa1_1(0x0L, 0x4800000010000000L, 0x1000L); + jjmatchedKind = 127; + return jjMoveStringLiteralDfa1_1(0x0L, 0x200000000L, 0x40012L); case 61: - jjmatchedKind = 129; - return jjMoveStringLiteralDfa1_1(0x20000000000L, 0x400000000000000L, 0x1L); + jjmatchedKind = 135; + return jjMoveStringLiteralDfa1_1(0x800000000000L, 0x0L, 0x41L); case 62: - jjmatchedKind = 120; - return jjMoveStringLiteralDfa1_1(0x0L, 0x1000000060000000L, 0x2000L); + jjmatchedKind = 126; + return jjMoveStringLiteralDfa1_1(0x0L, 0xc00000000L, 0x80004L); case 63: - jjmatchedKind = 78; + jjmatchedKind = 83; return jjMoveStringLiteralDfa1_1(0x10L, 0x0L, 0x0L); case 64: - return jjStopAtPos(0, 74); + return jjStopAtPos(0, 80); case 91: - return jjStopAtPos(0, 115); + return jjStopAtPos(0, 121); case 93: - return jjStopAtPos(0, 116); + return jjStopAtPos(0, 122); case 94: - jjmatchedKind = 90; - return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x100L); + jjmatchedKind = 95; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x4000L); case 65: case 97: - return jjMoveStringLiteralDfa1_1(0x8000000L, 0x100000001L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x200000000L, 0x2000000040L, 0x0L); case 66: case 98: - return jjMoveStringLiteralDfa1_1(0x10000000L, 0x18L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x400000000L, 0x600L, 0x0L); case 67: case 99: - return jjMoveStringLiteralDfa1_1(0x1c0000200000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x7000008000000L, 0x0L, 0x0L); case 68: case 100: - return jjMoveStringLiteralDfa1_1(0x602000000000L, 0x40L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x18080000000000L, 0x1000L, 0x0L); case 69: case 101: - return jjMoveStringLiteralDfa1_1(0x7800800086000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x20002180000000L, 0x1eL, 0x0L); case 70: case 102: - return jjMoveStringLiteralDfa1_1(0x8201000000400000L, 0x80L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x8040000010000000L, 0x2020L, 0x0L); case 71: case 103: - return jjMoveStringLiteralDfa1_1(0x2001000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x80040000000000L, 0x0L, 0x0L); case 73: case 105: - return jjMoveStringLiteralDfa1_1(0x501000000L, 0x300L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x14040000000L, 0xc000L, 0x0L); case 76: case 108: - return jjMoveStringLiteralDfa1_1(0x20000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x800000000L, 0x0L, 0x0L); case 78: case 110: - return jjMoveStringLiteralDfa1_1(0xc000000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x300000000000000L, 0x0L, 0x0L); case 79: case 111: - return jjMoveStringLiteralDfa1_1(0x0L, 0x80000004L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x0L, 0x1000000100L, 0x0L); case 80: case 112: - return jjMoveStringLiteralDfa1_1(0x40000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x1000000000L, 0x0L, 0x0L); case 82: case 114: - return jjMoveStringLiteralDfa1_1(0x10000a00000000L, 0x20L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x400028000000000L, 0x800L, 0x0L); case 83: case 115: - return jjMoveStringLiteralDfa1_1(0x60004000000000L, 0x2L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x1800100000000000L, 0x80L, 0x0L); case 84: case 116: - return jjMoveStringLiteralDfa1_1(0x180000000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x6000000000000000L, 0x0L, 0x0L); case 86: case 118: - return jjMoveStringLiteralDfa1_1(0x800000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x20000000L, 0x0L, 0x0L); case 87: case 119: - return jjMoveStringLiteralDfa1_1(0x400000000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x0L, 0x1L, 0x0L); case 123: - return jjStopAtPos(0, 113); + return jjStopAtPos(0, 119); case 124: - jjmatchedKind = 89; - return jjMoveStringLiteralDfa1_1(0x0L, 0x10000L, 0x80L); + jjmatchedKind = 94; + return jjMoveStringLiteralDfa1_1(0x0L, 0x200000L, 0x2000L); case 125: - return jjStopAtPos(0, 114); + return jjStopAtPos(0, 120); case 126: - jjmatchedKind = 77; - return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x800L); + jjmatchedKind = 82; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x20000L); default : return jjMoveNfa_1(3, 0); } @@ -676,63 +689,51 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l switch(curChar) { case 38: - if ((active1 & 0x20000L) != 0L) - return jjStopAtPos(1, 81); + if ((active1 & 0x400000L) != 0L) + return jjStopAtPos(1, 86); break; case 42: - if ((active0 & 0x4000L) != 0L) - return jjStartNfaWithStates_1(1, 14, 0); + if ((active0 & 0x80000L) != 0L) + return jjStartNfaWithStates_1(1, 19, 0); break; case 43: - if ((active1 & 0x40000L) != 0L) - return jjStopAtPos(1, 82); + if ((active1 & 0x800000L) != 0L) + return jjStopAtPos(1, 87); break; case 45: - if ((active1 & 0x80000L) != 0L) - return jjStopAtPos(1, 83); + if ((active1 & 0x1000000L) != 0L) + return jjStopAtPos(1, 88); break; case 47: - if ((active0 & 0x800L) != 0L) - return jjStopAtPos(1, 11); + if ((active0 & 0x10000L) != 0L) + return jjStopAtPos(1, 16); break; case 58: - if ((active0 & 0x10000000000L) != 0L) - return jjStopAtPos(1, 40); + if ((active0 & 0x400000000000L) != 0L) + return jjStopAtPos(1, 46); break; case 60: - if ((active1 & 0x10000000L) != 0L) + if ((active1 & 0x200000000L) != 0L) { - jjmatchedKind = 92; + jjmatchedKind = 97; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x1000L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x40000L); case 61: - if ((active1 & 0x400000000000000L) != 0L) + if ((active2 & 0x1L) != 0L) { - jjmatchedKind = 122; - jjmatchedPos = 1; - } - else if ((active1 & 0x800000000000000L) != 0L) - return jjStopAtPos(1, 123); - else if ((active1 & 0x1000000000000000L) != 0L) - return jjStopAtPos(1, 124); - else if ((active1 & 0x2000000000000000L) != 0L) - { - jjmatchedKind = 125; + jjmatchedKind = 128; jjmatchedPos = 1; } + else if ((active2 & 0x2L) != 0L) + return jjStopAtPos(1, 129); else if ((active2 & 0x4L) != 0L) return jjStopAtPos(1, 130); else if ((active2 & 0x8L) != 0L) - return jjStopAtPos(1, 131); - else if ((active2 & 0x10L) != 0L) - return jjStopAtPos(1, 132); - else if ((active2 & 0x20L) != 0L) - return jjStopAtPos(1, 133); - else if ((active2 & 0x40L) != 0L) - return jjStopAtPos(1, 134); - else if ((active2 & 0x80L) != 0L) - return jjStopAtPos(1, 135); + { + jjmatchedKind = 131; + jjmatchedPos = 1; + } else if ((active2 & 0x100L) != 0L) return jjStopAtPos(1, 136); else if ((active2 & 0x200L) != 0L) @@ -741,84 +742,96 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l return jjStopAtPos(1, 138); else if ((active2 & 0x800L) != 0L) return jjStopAtPos(1, 139); - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x8000000000000000L, active2, 0x1L); + else if ((active2 & 0x1000L) != 0L) + return jjStopAtPos(1, 140); + else if ((active2 & 0x2000L) != 0L) + return jjStopAtPos(1, 141); + else if ((active2 & 0x4000L) != 0L) + return jjStopAtPos(1, 142); + else if ((active2 & 0x8000L) != 0L) + return jjStopAtPos(1, 143); + else if ((active2 & 0x10000L) != 0L) + return jjStopAtPos(1, 144); + else if ((active2 & 0x20000L) != 0L) + return jjStopAtPos(1, 145); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x60L); case 62: if ((active0 & 0x10L) != 0L) return jjStopAtPos(1, 4); - else if ((active0 & 0x8000000000L) != 0L) - return jjStopAtPos(1, 39); - else if ((active0 & 0x20000000000L) != 0L) - return jjStopAtPos(1, 41); - else if ((active1 & 0x20000000L) != 0L) + else if ((active0 & 0x200000000000L) != 0L) + return jjStopAtPos(1, 45); + else if ((active0 & 0x800000000000L) != 0L) + return jjStopAtPos(1, 47); + else if ((active1 & 0x400000000L) != 0L) { - jjmatchedKind = 93; + jjmatchedKind = 98; jjmatchedPos = 1; } - else if ((active1 & 0x4000000000000000L) != 0L) - return jjStopAtPos(1, 126); - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x40000000L, active2, 0x2000L); + else if ((active2 & 0x10L) != 0L) + return jjStopAtPos(1, 132); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x800000000L, active2, 0x80000L); case 65: case 97: - return jjMoveStringLiteralDfa2_1(active0, 0x200040000800000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x8001000020000000L, active1, 0L, active2, 0L); case 66: case 98: - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x4L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x100L, active2, 0L); case 67: case 99: - return jjMoveStringLiteralDfa2_1(active0, 0x80000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x2000000000L, active1, 0L, active2, 0L); case 69: case 101: - return jjMoveStringLiteralDfa2_1(active0, 0x14202a00000000L, active1, 0x20L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x5080a8000000000L, active1, 0x800L, active2, 0L); case 70: case 102: - if ((active0 & 0x1000000L) != 0L) - return jjStartNfaWithStates_1(1, 24, 14); + if ((active0 & 0x40000000L) != 0L) + return jjStartNfaWithStates_1(1, 30, 14); break; case 72: case 104: - return jjMoveStringLiteralDfa2_1(active0, 0x480000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x2000000000000000L, active1, 0x1L, active2, 0L); case 73: case 105: - return jjMoveStringLiteralDfa2_1(active0, 0x20000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x800000000L, active1, 0L, active2, 0L); case 76: case 108: - return jjMoveStringLiteralDfa2_1(active0, 0x1006200000L, active1, 0x80L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x40188000000L, active1, 0x2000L, active2, 0L); case 78: case 110: - return jjMoveStringLiteralDfa2_1(active0, 0x7800000500000000L, active1, 0x100000300L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x14000000000L, active1, 0x200000c01eL, active2, 0L); case 79: case 111: - if ((active0 & 0x400000000000L) != 0L) + if ((active0 & 0x10000000000000L) != 0L) { - jjmatchedKind = 46; + jjmatchedKind = 52; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0x8003180000000000L, active1, 0x58L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0xc6000000000000L, active1, 0x1620L, active2, 0L); case 82: case 114: - if ((active1 & 0x80000000L) != 0L) - return jjStartNfaWithStates_1(1, 95, 14); - return jjMoveStringLiteralDfa2_1(active0, 0x100000058000000L, active1, 0L, active2, 0L); + if ((active1 & 0x1000000000L) != 0L) + return jjStartNfaWithStates_1(1, 100, 14); + return jjMoveStringLiteralDfa2_1(active0, 0x4000001600000000L, active1, 0L, active2, 0L); case 83: case 115: - if ((active1 & 0x1L) != 0L) - return jjStartNfaWithStates_1(1, 64, 14); + if ((active1 & 0x40L) != 0L) + return jjStartNfaWithStates_1(1, 70, 14); break; case 84: case 116: - return jjMoveStringLiteralDfa2_1(active0, 0x4000000000L, active1, 0x2L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x100000000000L, active1, 0x80L, active2, 0L); case 85: case 117: - return jjMoveStringLiteralDfa2_1(active0, 0x28000000400000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0xa00000010000000L, active1, 0L, active2, 0L); case 87: case 119: - return jjMoveStringLiteralDfa2_1(active0, 0x40000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x1000000000000000L, active1, 0L, active2, 0L); case 88: case 120: - return jjMoveStringLiteralDfa2_1(active0, 0x800000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x20000000000000L, active1, 0L, active2, 0L); case 124: - if ((active1 & 0x10000L) != 0L) - return jjStopAtPos(1, 80); + if ((active1 & 0x200000L) != 0L) + return jjStopAtPos(1, 85); break; default : break; @@ -837,88 +850,88 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long switch(curChar) { case 61: - if ((active1 & 0x8000000000000000L) != 0L) - return jjStopAtPos(2, 127); - else if ((active2 & 0x1L) != 0L) - return jjStopAtPos(2, 128); - else if ((active2 & 0x1000L) != 0L) - return jjStopAtPos(2, 140); - else if ((active2 & 0x2000L) != 0L) - return jjStopAtPos(2, 141); + if ((active2 & 0x20L) != 0L) + return jjStopAtPos(2, 133); + else if ((active2 & 0x40L) != 0L) + return jjStopAtPos(2, 134); + else if ((active2 & 0x40000L) != 0L) + return jjStopAtPos(2, 146); + else if ((active2 & 0x80000L) != 0L) + return jjStopAtPos(2, 147); break; case 62: - if ((active1 & 0x40000000L) != 0L) - return jjStopAtPos(2, 94); + if ((active1 & 0x800000000L) != 0L) + return jjStopAtPos(2, 99); break; case 65: case 97: - return jjMoveStringLiteralDfa3_1(active0, 0x4000200000L, active1, 0x20L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x100008000000L, active1, 0x800L, active2, 0L); case 67: case 99: - return jjMoveStringLiteralDfa3_1(active0, 0x500000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x14000000000L, active1, 0L, active2, 0L); case 68: case 100: - if ((active1 & 0x100000000L) != 0L) - return jjStartNfaWithStates_1(2, 96, 14); - return jjMoveStringLiteralDfa3_1(active0, 0x7800000000000000L, active1, 0L, active2, 0L); + if ((active1 & 0x2000000000L) != 0L) + return jjStartNfaWithStates_1(2, 101, 14); + return jjMoveStringLiteralDfa3_1(active0, 0L, active1, 0x1eL, active2, 0L); case 69: case 101: - return jjMoveStringLiteralDfa3_1(active0, 0x10000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x400000000L, active1, 0L, active2, 0L); case 70: case 102: - return jjMoveStringLiteralDfa3_1(active0, 0x202000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x8080000000000L, active1, 0L, active2, 0L); case 72: case 104: - return jjMoveStringLiteralDfa3_1(active0, 0x80000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x2000000000L, active1, 0L, active2, 0L); case 73: case 105: - return jjMoveStringLiteralDfa3_1(active0, 0x4c0000040000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x3000001000000000L, active1, 0x1L, active2, 0L); case 74: case 106: - return jjMoveStringLiteralDfa3_1(active0, 0L, active1, 0x4L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0L, active1, 0x100L, active2, 0L); case 76: case 108: - return jjMoveStringLiteralDfa3_1(active0, 0x208000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x8200000000000000L, active1, 0L, active2, 0L); case 78: case 110: - return jjMoveStringLiteralDfa3_1(active0, 0x180000400000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x6000010000000L, active1, 0L, active2, 0L); case 79: case 111: - return jjMoveStringLiteralDfa3_1(active0, 0x1000000000L, active1, 0x98L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x40000000000L, active1, 0x2600L, active2, 0L); case 80: case 112: - return jjMoveStringLiteralDfa3_1(active0, 0x20000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x800000000000000L, active1, 0L, active2, 0L); case 81: case 113: - return jjMoveStringLiteralDfa3_1(active0, 0xa00000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x28000000000L, active1, 0L, active2, 0L); case 82: case 114: - if ((active0 & 0x800000L) != 0L) - return jjStartNfaWithStates_1(2, 23, 14); - else if ((active0 & 0x1000000000000L) != 0L) + if ((active0 & 0x20000000L) != 0L) + return jjStartNfaWithStates_1(2, 29, 14); + else if ((active0 & 0x40000000000000L) != 0L) { - jjmatchedKind = 48; + jjmatchedKind = 54; jjmatchedPos = 2; } - return jjMoveStringLiteralDfa3_1(active0, 0x8000000008000000L, active1, 0x2L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x200000000L, active1, 0xa0L, active2, 0L); case 83: case 115: - return jjMoveStringLiteralDfa3_1(active0, 0x40026000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x1000980000000L, active1, 0L, active2, 0L); case 84: case 116: - if ((active1 & 0x100L) != 0L) + if ((active1 & 0x4000L) != 0L) { - jjmatchedKind = 72; + jjmatchedKind = 78; jjmatchedPos = 2; } - return jjMoveStringLiteralDfa3_1(active0, 0x12800000000000L, active1, 0x200L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x4a0000000000000L, active1, 0x8000L, active2, 0L); case 85: case 117: - return jjMoveStringLiteralDfa3_1(active0, 0x100000000000000L, active1, 0x40L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x4000000000000000L, active1, 0x1000L, active2, 0L); case 87: case 119: - if ((active0 & 0x4000000000000L) != 0L) - return jjStartNfaWithStates_1(2, 50, 14); + if ((active0 & 0x100000000000000L) != 0L) + return jjStartNfaWithStates_1(2, 56, 14); break; default : break; @@ -938,69 +951,69 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa4_1(active0, 0x200018000000L, active1, 0x80L); + return jjMoveStringLiteralDfa4_1(active0, 0x8000600000000L, active1, 0x2000L); case 66: case 98: - return jjMoveStringLiteralDfa4_1(active0, 0x1000000000L, active1, 0x40L); + return jjMoveStringLiteralDfa4_1(active0, 0x40000000000L, active1, 0x1000L); case 67: case 99: - return jjMoveStringLiteralDfa4_1(active0, 0x400000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x10000000L, active1, 0L); case 69: case 101: - if ((active0 & 0x4000000L) != 0L) + if ((active0 & 0x100000000L) != 0L) { - jjmatchedKind = 26; + jjmatchedKind = 32; jjmatchedPos = 3; } - else if ((active0 & 0x40000000000L) != 0L) - return jjStartNfaWithStates_1(3, 42, 14); - else if ((active0 & 0x100000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 56, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x8020800002000000L, active1, 0x204L); + else if ((active0 & 0x1000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 48, 14); + else if ((active0 & 0x4000000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 62, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x820000080000000L, active1, 0x8120L); case 70: case 102: - return jjMoveStringLiteralDfa4_1(active0, 0x4000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0L, active1, 0x10L); case 73: case 105: - return jjMoveStringLiteralDfa4_1(active0, 0x2000002000000000L, active1, 0x2L); + return jjMoveStringLiteralDfa4_1(active0, 0x80000000000L, active1, 0x88L); case 76: case 108: - if ((active0 & 0x8000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 51, 14); - else if ((active1 & 0x8L) != 0L) + if ((active0 & 0x200000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 57, 14); + else if ((active1 & 0x200L) != 0L) { - jjmatchedKind = 67; + jjmatchedKind = 73; jjmatchedPos = 3; } - else if ((active1 & 0x20L) != 0L) - return jjStartNfaWithStates_1(3, 69, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x400000500000000L, active1, 0x10L); + else if ((active1 & 0x800L) != 0L) + return jjStartNfaWithStates_1(3, 75, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x14000000000L, active1, 0x401L); case 78: case 110: - return jjMoveStringLiteralDfa4_1(active0, 0x40000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x1000000000L, active1, 0L); case 79: case 111: - if ((active0 & 0x80000000L) != 0L) - return jjStartNfaWithStates_1(3, 31, 14); - else if ((active0 & 0x2000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 49, 14); + if ((active0 & 0x2000000000L) != 0L) + return jjStartNfaWithStates_1(3, 37, 14); + else if ((active0 & 0x80000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 55, 14); break; case 83: case 115: - if ((active0 & 0x80000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 55, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x1200080000200000L, active1, 0L); + if ((active0 & 0x2000000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 61, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x8002000008000000L, active1, 0x4L); case 84: case 116: - if ((active0 & 0x20000000L) != 0L) - return jjStartNfaWithStates_1(3, 29, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x40104000000000L, active1, 0L); + if ((active0 & 0x800000000L) != 0L) + return jjStartNfaWithStates_1(3, 35, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x1004100000000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa4_1(active0, 0x10000a00000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x400028000000000L, active1, 0L); case 87: case 119: - return jjMoveStringLiteralDfa4_1(active0, 0x800000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0L, active1, 0x2L); default : break; } @@ -1019,74 +1032,74 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa5_1(active0, 0x8000001000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x40000000000L, active1, 0x20L); case 67: case 99: - return jjMoveStringLiteralDfa5_1(active0, 0x40000000000000L, active1, 0x4L); + return jjMoveStringLiteralDfa5_1(active0, 0x1000000000000000L, active1, 0x100L); case 69: case 101: - if ((active0 & 0x200000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 57, 14); - else if ((active0 & 0x400000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 58, 14); - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x10L); + if ((active0 & 0x8000000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 63, 14); + else if ((active1 & 0x1L) != 0L) + return jjStartNfaWithStates_1(4, 64, 14); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x400L); case 70: case 102: - if ((active0 & 0x2000000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 61, 14); + if ((active1 & 0x8L) != 0L) + return jjStartNfaWithStates_1(4, 67, 14); break; case 71: case 103: - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x200L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x8000L); case 72: case 104: - return jjMoveStringLiteralDfa5_1(active0, 0x800000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x2L); case 73: case 105: - return jjMoveStringLiteralDfa5_1(active0, 0x104a02000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x4128080000000L, active1, 0L); case 75: case 107: - if ((active0 & 0x10000000L) != 0L) - return jjStartNfaWithStates_1(4, 28, 14); + if ((active0 & 0x400000000L) != 0L) + return jjStartNfaWithStates_1(4, 34, 14); break; case 76: case 108: - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x40L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x1000L); case 78: case 110: - return jjMoveStringLiteralDfa5_1(active0, 0x802000000000L, active1, 0x2L); + return jjMoveStringLiteralDfa5_1(active0, 0x20080000000000L, active1, 0x80L); case 79: case 111: - return jjMoveStringLiteralDfa5_1(active0, 0x4000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x10L); case 82: case 114: - if ((active0 & 0x20000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 53, 14); - return jjMoveStringLiteralDfa5_1(active0, 0x10000000000000L, active1, 0L); + if ((active0 & 0x800000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 59, 14); + return jjMoveStringLiteralDfa5_1(active0, 0x400000000000000L, active1, 0L); case 83: case 115: - if ((active0 & 0x200000L) != 0L) - return jjStartNfaWithStates_1(4, 21, 14); + if ((active0 & 0x8000000L) != 0L) + return jjStartNfaWithStates_1(4, 27, 14); break; case 84: case 116: - if ((active0 & 0x40000000L) != 0L) - return jjStartNfaWithStates_1(4, 30, 14); - else if ((active0 & 0x80000000000L) != 0L) - return jjStartNfaWithStates_1(4, 43, 14); - else if ((active1 & 0x80L) != 0L) - return jjStartNfaWithStates_1(4, 71, 14); - return jjMoveStringLiteralDfa5_1(active0, 0x400000L, active1, 0L); + if ((active0 & 0x1000000000L) != 0L) + return jjStartNfaWithStates_1(4, 36, 14); + else if ((active0 & 0x2000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 49, 14); + else if ((active1 & 0x2000L) != 0L) + return jjStartNfaWithStates_1(4, 77, 14); + return jjMoveStringLiteralDfa5_1(active0, 0x10000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa5_1(active0, 0x200500000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x8014000000000L, active1, 0L); case 87: case 119: - return jjMoveStringLiteralDfa5_1(active0, 0x1000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x4L); case 89: case 121: - if ((active0 & 0x8000000L) != 0L) - return jjStartNfaWithStates_1(4, 27, 14); + if ((active0 & 0x200000000L) != 0L) + return jjStartNfaWithStates_1(4, 33, 14); break; default : break; @@ -1106,59 +1119,59 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x10L); + return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x400L); case 67: case 99: - if ((active0 & 0x4000000000L) != 0L) - return jjStartNfaWithStates_1(5, 38, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x8000000000000000L, active1, 0L); + if ((active0 & 0x100000000000L) != 0L) + return jjStartNfaWithStates_1(5, 44, 14); + return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x20L); case 68: case 100: - return jjMoveStringLiteralDfa6_1(active0, 0x800500000000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0x20014000000000L, active1, 0L); case 69: case 101: - if ((active0 & 0x2000000000L) != 0L) - return jjStartNfaWithStates_1(5, 37, 14); - else if ((active1 & 0x40L) != 0L) - return jjStartNfaWithStates_1(5, 70, 14); - return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x200L); + if ((active0 & 0x80000000000L) != 0L) + return jjStartNfaWithStates_1(5, 43, 14); + else if ((active1 & 0x1000L) != 0L) + return jjStartNfaWithStates_1(5, 76, 14); + return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x8000L); case 70: case 102: - if ((active0 & 0x2000000L) != 0L) - return jjStartNfaWithStates_1(5, 25, 14); + if ((active0 & 0x80000000L) != 0L) + return jjStartNfaWithStates_1(5, 31, 14); break; case 71: case 103: - if ((active1 & 0x2L) != 0L) - return jjStartNfaWithStates_1(5, 65, 14); + if ((active1 & 0x80L) != 0L) + return jjStartNfaWithStates_1(5, 71, 14); break; case 72: case 104: - if ((active0 & 0x40000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 54, 14); + if ((active0 & 0x1000000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 60, 14); break; case 73: case 105: - return jjMoveStringLiteralDfa6_1(active0, 0x1800000000400000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0x10000000L, active1, 0x6L); case 76: case 108: - if ((active0 & 0x1000000000L) != 0L) - return jjStartNfaWithStates_1(5, 36, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x200000000000L, active1, 0L); + if ((active0 & 0x40000000000L) != 0L) + return jjStartNfaWithStates_1(5, 42, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x8000000000000L, active1, 0L); case 78: case 110: - if ((active0 & 0x10000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 52, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x100000000000L, active1, 0L); + if ((active0 & 0x400000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 58, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x4000000000000L, active1, 0L); case 82: case 114: - if ((active0 & 0x4000000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 62, 14); - return jjMoveStringLiteralDfa6_1(active0, 0xa00000000L, active1, 0L); + if ((active1 & 0x10L) != 0L) + return jjStartNfaWithStates_1(5, 68, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x28000000000L, active1, 0L); case 84: case 116: - if ((active1 & 0x4L) != 0L) - return jjStartNfaWithStates_1(5, 66, 14); + if ((active1 & 0x100L) != 0L) + return jjStartNfaWithStates_1(5, 72, 14); break; default : break; @@ -1178,51 +1191,51 @@ static private final int jjMoveStringLiteralDfa6_1(long old0, long active0, long { case 69: case 101: - if ((active0 & 0x100000000L) != 0L) + if ((active0 & 0x4000000000L) != 0L) { - jjmatchedKind = 32; + jjmatchedKind = 38; jjmatchedPos = 6; } - else if ((active0 & 0x200000000L) != 0L) + else if ((active0 & 0x8000000000L) != 0L) { - jjmatchedKind = 33; + jjmatchedKind = 39; jjmatchedPos = 6; } - return jjMoveStringLiteralDfa7_1(active0, 0xc00000000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x30000000000L, active1, 0L); case 72: case 104: - if ((active0 & 0x8000000000000000L) != 0L) - return jjStartNfaWithStates_1(6, 63, 14); + if ((active1 & 0x20L) != 0L) + return jjStartNfaWithStates_1(6, 69, 14); break; case 76: case 108: - return jjMoveStringLiteralDfa7_1(active0, 0x800000000000000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0L, active1, 0x2L); case 78: case 110: - if ((active1 & 0x10L) != 0L) - return jjStartNfaWithStates_1(6, 68, 14); + if ((active1 & 0x400L) != 0L) + return jjStartNfaWithStates_1(6, 74, 14); break; case 79: case 111: - return jjMoveStringLiteralDfa7_1(active0, 0x400000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x10000000L, active1, 0L); case 82: case 114: - if ((active1 & 0x200L) != 0L) - return jjStartNfaWithStates_1(6, 73, 14); + if ((active1 & 0x8000L) != 0L) + return jjStartNfaWithStates_1(6, 79, 14); break; case 83: case 115: - if ((active0 & 0x800000000000L) != 0L) - return jjStartNfaWithStates_1(6, 47, 14); + if ((active0 & 0x20000000000000L) != 0L) + return jjStartNfaWithStates_1(6, 53, 14); break; case 84: case 116: - if ((active0 & 0x200000000000L) != 0L) - return jjStartNfaWithStates_1(6, 45, 14); - return jjMoveStringLiteralDfa7_1(active0, 0x1000000000000000L, active1, 0L); + if ((active0 & 0x8000000000000L) != 0L) + return jjStartNfaWithStates_1(6, 51, 14); + return jjMoveStringLiteralDfa7_1(active0, 0L, active1, 0x4L); case 85: case 117: - return jjMoveStringLiteralDfa7_1(active0, 0x100000000000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x4000000000000L, active1, 0L); default : break; } @@ -1234,61 +1247,61 @@ static private final int jjMoveStringLiteralDfa7_1(long old0, long active0, long return jjStartNfa_1(5, old0, old1, 0L); try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { - jjStopStringLiteralDfa_1(6, active0, 0L, 0L); + jjStopStringLiteralDfa_1(6, active0, active1, 0L); return 7; } switch(curChar) { case 95: - return jjMoveStringLiteralDfa8_1(active0, 0xc00000000L); + return jjMoveStringLiteralDfa8_1(active0, 0x30000000000L, active1, 0L); case 67: case 99: - return jjMoveStringLiteralDfa8_1(active0, 0x1000000000000000L); + return jjMoveStringLiteralDfa8_1(active0, 0L, active1, 0x4L); case 69: case 101: - if ((active0 & 0x100000000000L) != 0L) - return jjStartNfaWithStates_1(7, 44, 14); - else if ((active0 & 0x800000000000000L) != 0L) - return jjStartNfaWithStates_1(7, 59, 14); + if ((active0 & 0x4000000000000L) != 0L) + return jjStartNfaWithStates_1(7, 50, 14); + else if ((active1 & 0x2L) != 0L) + return jjStartNfaWithStates_1(7, 65, 14); break; case 78: case 110: - if ((active0 & 0x400000L) != 0L) - return jjStartNfaWithStates_1(7, 22, 14); + if ((active0 & 0x10000000L) != 0L) + return jjStartNfaWithStates_1(7, 28, 14); break; default : break; } - return jjStartNfa_1(6, active0, 0L, 0L); + return jjStartNfa_1(6, active0, active1, 0L); } -static private final int jjMoveStringLiteralDfa8_1(long old0, long active0) +static private final int jjMoveStringLiteralDfa8_1(long old0, long active0, long old1, long active1) { - if (((active0 &= old0)) == 0L) - return jjStartNfa_1(6, old0, 0L, 0L); + if (((active0 &= old0) | (active1 &= old1)) == 0L) + return jjStartNfa_1(6, old0, old1, 0L); try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { - jjStopStringLiteralDfa_1(7, active0, 0L, 0L); + jjStopStringLiteralDfa_1(7, active0, active1, 0L); return 8; } switch(curChar) { case 72: case 104: - if ((active0 & 0x1000000000000000L) != 0L) - return jjStartNfaWithStates_1(8, 60, 14); + if ((active1 & 0x4L) != 0L) + return jjStartNfaWithStates_1(8, 66, 14); break; case 79: case 111: - return jjMoveStringLiteralDfa9_1(active0, 0xc00000000L); + return jjMoveStringLiteralDfa9_1(active0, 0x30000000000L, active1, 0L); default : break; } - return jjStartNfa_1(7, active0, 0L, 0L); + return jjStartNfa_1(7, active0, active1, 0L); } -static private final int jjMoveStringLiteralDfa9_1(long old0, long active0) +static private final int jjMoveStringLiteralDfa9_1(long old0, long active0, long old1, long active1) { - if (((active0 &= old0)) == 0L) - return jjStartNfa_1(7, old0, 0L, 0L); + if (((active0 &= old0) | (active1 &= old1)) == 0L) + return jjStartNfa_1(7, old0, old1, 0L); try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { jjStopStringLiteralDfa_1(8, active0, 0L, 0L); @@ -1298,7 +1311,7 @@ static private final int jjMoveStringLiteralDfa9_1(long old0, long active0) { case 78: case 110: - return jjMoveStringLiteralDfa10_1(active0, 0xc00000000L); + return jjMoveStringLiteralDfa10_1(active0, 0x30000000000L); default : break; } @@ -1317,7 +1330,7 @@ static private final int jjMoveStringLiteralDfa10_1(long old0, long active0) { case 67: case 99: - return jjMoveStringLiteralDfa11_1(active0, 0xc00000000L); + return jjMoveStringLiteralDfa11_1(active0, 0x30000000000L); default : break; } @@ -1336,10 +1349,10 @@ static private final int jjMoveStringLiteralDfa11_1(long old0, long active0) { case 69: case 101: - if ((active0 & 0x400000000L) != 0L) - return jjStartNfaWithStates_1(11, 34, 14); - else if ((active0 & 0x800000000L) != 0L) - return jjStartNfaWithStates_1(11, 35, 14); + if ((active0 & 0x10000000000L) != 0L) + return jjStartNfaWithStates_1(11, 40, 14); + else if ((active0 & 0x20000000000L) != 0L) + return jjStartNfaWithStates_1(11, 41, 14); break; default : break; @@ -1353,7 +1366,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) { int[] nextStates; int startsAt = 0; - jjnewStateCnt = 64; + jjnewStateCnt = 61; int i = 1; jjstateSet[0] = startState; int j, kind = 0x7fffffff; @@ -1375,22 +1388,20 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAddStates(7, 12); else if (curChar == 34) jjCheckNAddStates(13, 18); - else if (curChar == 36) - jjstateSet[jjnewStateCnt++] = 16; else if (curChar == 46) jjCheckNAdd(8); else if (curChar == 47) jjstateSet[jjnewStateCnt++] = 2; if ((0x3fe000000000000L & l) != 0L) { - if (kind > 97) - kind = 97; + if (kind > 102) + kind = 102; jjCheckNAddTwoStates(5, 6); } else if (curChar == 48) { - if (kind > 97) - kind = 97; + if (kind > 102) + kind = 102; jjCheckNAddStates(19, 21); } break; @@ -1399,8 +1410,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 1; break; case 1: - if ((0xffff7fffffffffffL & l) != 0L && kind > 13) - kind = 13; + if ((0xffff7fffffffffffL & l) != 0L && kind > 18) + kind = 18; break; case 2: if (curChar == 42) @@ -1409,15 +1420,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 4: if ((0x3fe000000000000L & l) == 0L) break; - if (kind > 97) - kind = 97; + if (kind > 102) + kind = 102; jjCheckNAddTwoStates(5, 6); break; case 5: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 97) - kind = 97; + if (kind > 102) + kind = 102; jjCheckNAddTwoStates(5, 6); break; case 7: @@ -1427,8 +1438,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 8: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 101) - kind = 101; + if (kind > 106) + kind = 106; jjCheckNAddStates(22, 24); break; case 10: @@ -1438,167 +1449,156 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 11: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 101) - kind = 101; + if (kind > 106) + kind = 106; jjCheckNAddTwoStates(11, 12); break; case 14: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 107) - kind = 107; + if (kind > 113) + kind = 113; jjstateSet[jjnewStateCnt++] = 14; break; case 15: - if (curChar == 36) - jjstateSet[jjnewStateCnt++] = 16; - break; - case 17: - if ((0x3ff000000000000L & l) == 0L) - break; - if (kind > 142) - kind = 142; - jjstateSet[jjnewStateCnt++] = 17; - break; - case 18: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(0, 6); break; - case 19: + case 16: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(19, 20); + jjCheckNAddTwoStates(16, 17); break; - case 20: + case 17: if (curChar != 46) break; - if (kind > 101) - kind = 101; + if (kind > 106) + kind = 106; jjCheckNAddStates(25, 27); break; - case 21: + case 18: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 101) - kind = 101; + if (kind > 106) + kind = 106; jjCheckNAddStates(25, 27); break; - case 23: + case 20: if ((0x280000000000L & l) != 0L) - jjCheckNAdd(24); + jjCheckNAdd(21); break; - case 24: + case 21: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 101) - kind = 101; - jjCheckNAddTwoStates(24, 12); + if (kind > 106) + kind = 106; + jjCheckNAddTwoStates(21, 12); break; - case 25: + case 22: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(25, 26); + jjCheckNAddTwoStates(22, 23); break; - case 27: + case 24: if ((0x280000000000L & l) != 0L) - jjCheckNAdd(28); + jjCheckNAdd(25); break; - case 28: + case 25: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 101) - kind = 101; - jjCheckNAddTwoStates(28, 12); + if (kind > 106) + kind = 106; + jjCheckNAddTwoStates(25, 12); break; - case 29: + case 26: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(28, 30); break; - case 31: + case 28: if ((0x280000000000L & l) != 0L) - jjCheckNAdd(32); + jjCheckNAdd(29); break; - case 32: + case 29: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(32, 12); + jjCheckNAddTwoStates(29, 12); break; - case 33: + case 30: if (curChar != 48) break; - if (kind > 97) - kind = 97; + if (kind > 102) + kind = 102; jjCheckNAddStates(19, 21); break; - case 35: + case 32: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 97) - kind = 97; - jjCheckNAddTwoStates(35, 6); + if (kind > 102) + kind = 102; + jjCheckNAddTwoStates(32, 6); break; - case 36: + case 33: if ((0xff000000000000L & l) == 0L) break; - if (kind > 97) - kind = 97; - jjCheckNAddTwoStates(36, 6); + if (kind > 102) + kind = 102; + jjCheckNAddTwoStates(33, 6); break; - case 37: + case 34: if (curChar == 34) jjCheckNAddStates(13, 18); break; - case 38: + case 35: if ((0xfffffffbffffffffL & l) != 0L) jjCheckNAddStates(31, 33); break; - case 40: + case 37: jjCheckNAddStates(31, 33); break; - case 41: - if (curChar == 34 && kind > 103) - kind = 103; + case 38: + if (curChar == 34 && kind > 108) + kind = 108; break; - case 42: + case 39: if ((0xfffffffbffffffffL & l) != 0L) jjCheckNAddStates(34, 36); break; - case 44: + case 41: jjCheckNAddStates(34, 36); break; - case 45: - if (curChar == 34 && kind > 104) - kind = 104; + case 42: + if (curChar == 34 && kind > 109) + kind = 109; break; - case 46: + case 43: if (curChar == 39) jjCheckNAddStates(7, 12); break; - case 47: + case 44: if ((0xffffff7fffffffffL & l) != 0L) jjCheckNAddStates(37, 39); break; - case 49: + case 46: jjCheckNAddStates(37, 39); break; - case 50: - if (curChar == 39 && kind > 103) - kind = 103; + case 47: + if (curChar == 39 && kind > 108) + kind = 108; break; - case 51: + case 48: if ((0xffffff7fffffffffL & l) != 0L) jjCheckNAddStates(40, 42); break; - case 53: + case 50: jjCheckNAddStates(40, 42); break; - case 54: - if (curChar == 39 && kind > 105) - kind = 105; + case 51: + if (curChar == 39 && kind > 110) + kind = 110; break; - case 56: - case 58: + case 53: + case 55: jjCheckNAddStates(43, 45); break; - case 60: - case 62: + case 57: + case 59: jjCheckNAddStates(46, 48); break; default : break; @@ -1615,145 +1615,137 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 3: if ((0x87fffffe87fffffeL & l) != 0L) { - if (kind > 107) - kind = 107; + if (kind > 113) + kind = 113; jjCheckNAdd(14); } else if (curChar == 96) jjCheckNAddStates(49, 54); break; case 1: - if (kind > 13) - kind = 13; + if (kind > 18) + kind = 18; break; case 6: - if ((0x100000001000L & l) != 0L && kind > 97) - kind = 97; + if ((0x100000001000L & l) != 0L && kind > 102) + kind = 102; break; case 9: if ((0x2000000020L & l) != 0L) jjAddStates(55, 56); break; case 12: - if ((0x5000000050L & l) != 0L && kind > 101) - kind = 101; + if ((0x5000000050L & l) != 0L && kind > 106) + kind = 106; break; case 13: case 14: if ((0x87fffffe87fffffeL & l) == 0L) break; - if (kind > 107) - kind = 107; + if (kind > 113) + kind = 113; jjCheckNAdd(14); break; - case 16: - case 17: - if ((0x87fffffe87fffffeL & l) == 0L) - break; - if (kind > 142) - kind = 142; - jjCheckNAdd(17); - break; - case 22: + case 19: if ((0x2000000020L & l) != 0L) jjAddStates(57, 58); break; - case 26: + case 23: if ((0x2000000020L & l) != 0L) jjAddStates(59, 60); break; - case 30: + case 27: if ((0x2000000020L & l) != 0L) jjAddStates(61, 62); break; - case 34: + case 31: if ((0x100000001000000L & l) != 0L) - jjCheckNAdd(35); + jjCheckNAdd(32); break; - case 35: + case 32: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 97) - kind = 97; - jjCheckNAddTwoStates(35, 6); + if (kind > 102) + kind = 102; + jjCheckNAddTwoStates(32, 6); break; - case 38: + case 35: if ((0xffffffffefffffffL & l) != 0L) jjCheckNAddStates(31, 33); break; - case 39: + case 36: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 40; + jjstateSet[jjnewStateCnt++] = 37; break; - case 40: + case 37: jjCheckNAddStates(31, 33); break; - case 42: + case 39: if ((0xffffffffefffffffL & l) != 0L) jjCheckNAddStates(34, 36); break; - case 43: + case 40: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 44; + jjstateSet[jjnewStateCnt++] = 41; break; - case 44: + case 41: jjCheckNAddStates(34, 36); break; - case 47: + case 44: if ((0xffffffffefffffffL & l) != 0L) jjCheckNAddStates(37, 39); break; - case 48: + case 45: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 49; + jjstateSet[jjnewStateCnt++] = 46; break; - case 49: + case 46: jjCheckNAddStates(37, 39); break; - case 51: + case 48: if ((0xffffffffefffffffL & l) != 0L) jjCheckNAddStates(40, 42); break; - case 52: + case 49: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 53; + jjstateSet[jjnewStateCnt++] = 50; break; - case 53: + case 50: jjCheckNAddStates(40, 42); break; - case 55: + case 52: if (curChar == 96) jjCheckNAddStates(49, 54); break; - case 56: + case 53: if ((0xfffffffeefffffffL & l) != 0L) jjCheckNAddStates(43, 45); break; - case 57: + case 54: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 58; + jjstateSet[jjnewStateCnt++] = 55; break; - case 58: + case 55: jjCheckNAddStates(43, 45); break; - case 59: - if (curChar == 96 && kind > 103) - kind = 103; + case 56: + if (curChar == 96 && kind > 108) + kind = 108; break; - case 60: + case 57: if ((0xfffffffeefffffffL & l) != 0L) jjCheckNAddStates(46, 48); break; - case 61: + case 58: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 62; + jjstateSet[jjnewStateCnt++] = 59; break; - case 62: + case 59: jjCheckNAddStates(46, 48); break; - case 63: - if (curChar == 96 && kind > 106) - kind = 106; + case 60: + if (curChar == 96 && kind > 111) + kind = 111; break; default : break; } @@ -1771,49 +1763,41 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 14: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 107) - kind = 107; + if (kind > 113) + kind = 113; jjCheckNAdd(14); break; case 1: - if ((jjbitVec0[i2] & l2) != 0L && kind > 13) - kind = 13; + if ((jjbitVec0[i2] & l2) != 0L && kind > 18) + kind = 18; break; - case 16: - case 17: - if ((jjbitVec0[i2] & l2) == 0L) - break; - if (kind > 142) - kind = 142; - jjCheckNAdd(17); - break; - case 38: - case 40: + case 35: + case 37: if ((jjbitVec0[i2] & l2) != 0L) jjCheckNAddStates(31, 33); break; - case 42: - case 44: + case 39: + case 41: if ((jjbitVec0[i2] & l2) != 0L) jjCheckNAddStates(34, 36); break; - case 47: - case 49: + case 44: + case 46: if ((jjbitVec0[i2] & l2) != 0L) jjCheckNAddStates(37, 39); break; - case 51: - case 53: + case 48: + case 50: if ((jjbitVec0[i2] & l2) != 0L) jjCheckNAddStates(40, 42); break; - case 56: - case 58: + case 53: + case 55: if ((jjbitVec0[i2] & l2) != 0L) jjCheckNAddStates(43, 45); break; - case 60: - case 62: + case 57: + case 59: if ((jjbitVec0[i2] & l2) != 0L) jjCheckNAddStates(46, 48); break; @@ -1828,26 +1812,26 @@ static private final int jjMoveNfa_1(int startState, int curPos) kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 64 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 61 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } } } -static private final int jjMoveStringLiteralDfa0_3() +static private final int jjMoveStringLiteralDfa0_4() { switch(curChar) { case 42: - return jjMoveStringLiteralDfa1_3(0x40000L); + return jjMoveStringLiteralDfa1_4(0x1000000L); case 84: case 116: - return jjMoveStringLiteralDfa1_3(0x20000L); + return jjMoveStringLiteralDfa1_4(0x400000L); default : return 1; } } -static private final int jjMoveStringLiteralDfa1_3(long active0) +static private final int jjMoveStringLiteralDfa1_4(long active0) { try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { @@ -1856,18 +1840,18 @@ static private final int jjMoveStringLiteralDfa1_3(long active0) switch(curChar) { case 47: - if ((active0 & 0x40000L) != 0L) - return jjStopAtPos(1, 18); + if ((active0 & 0x1000000L) != 0L) + return jjStopAtPos(1, 24); break; case 79: case 111: - return jjMoveStringLiteralDfa2_3(active0, 0x20000L); + return jjMoveStringLiteralDfa2_4(active0, 0x400000L); default : return 2; } return 2; } -static private final int jjMoveStringLiteralDfa2_3(long old0, long active0) +static private final int jjMoveStringLiteralDfa2_4(long old0, long active0) { if (((active0 &= old0)) == 0L) return 2; @@ -1879,12 +1863,12 @@ static private final int jjMoveStringLiteralDfa2_3(long old0, long active0) { case 68: case 100: - return jjMoveStringLiteralDfa3_3(active0, 0x20000L); + return jjMoveStringLiteralDfa3_4(active0, 0x400000L); default : return 3; } } -static private final int jjMoveStringLiteralDfa3_3(long old0, long active0) +static private final int jjMoveStringLiteralDfa3_4(long old0, long active0) { if (((active0 &= old0)) == 0L) return 3; @@ -1896,64 +1880,413 @@ static private final int jjMoveStringLiteralDfa3_3(long old0, long active0) { case 79: case 111: - if ((active0 & 0x20000L) != 0L) - return jjStopAtPos(3, 17); + if ((active0 & 0x400000L) != 0L) + return jjStopAtPos(3, 22); break; default : return 4; } return 4; } +private static final int jjStopStringLiteralDfa_3(int pos, long active0, long active1, long active2) +{ + switch (pos) + { + case 0: + if ((active1 & 0x3000000000L) != 0L) + { + jjmatchedKind = 113; + return 1; + } + return -1; + case 1: + if ((active1 & 0x2000000000L) != 0L) + { + if (jjmatchedPos != 1) + { + jjmatchedKind = 113; + jjmatchedPos = 1; + } + return 1; + } + if ((active1 & 0x1000000000L) != 0L) + return 1; + return -1; + default : + return -1; + } +} +private static final int jjStartNfa_3(int pos, long active0, long active1, long active2) +{ + return jjMoveNfa_3(jjStopStringLiteralDfa_3(pos, active0, active1, active2), pos + 1); +} +static private final int jjStartNfaWithStates_3(int pos, int kind, int state) +{ + jjmatchedKind = kind; + jjmatchedPos = pos; + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { return pos + 1; } + return jjMoveNfa_3(state, pos + 1); +} +static private final int jjMoveStringLiteralDfa0_3() +{ + switch(curChar) + { + case 9: + return jjStopAtPos(0, 12); + case 10: + return jjStopAtPos(0, 13); + case 12: + return jjStopAtPos(0, 15); + case 13: + return jjStopAtPos(0, 14); + case 32: + return jjStopAtPos(0, 11); + case 33: + jjmatchedKind = 81; + return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x28L); + case 36: + return jjStopAtPos(0, 112); + case 37: + jjmatchedKind = 96; + return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x10000L); + case 38: + jjmatchedKind = 93; + return jjMoveStringLiteralDfa1_3(0x0L, 0x400000L, 0x1000L); + case 40: + return jjStopAtPos(0, 117); + case 41: + return jjStopAtPos(0, 118); + case 42: + jjmatchedKind = 91; + return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x400L); + case 43: + jjmatchedKind = 89; + return jjMoveStringLiteralDfa1_3(0x0L, 0x800000L, 0x100L); + case 44: + return jjStopAtPos(0, 124); + case 45: + jjmatchedKind = 90; + return jjMoveStringLiteralDfa1_3(0x200000000000L, 0x1000000L, 0x200L); + case 46: + jjmatchedKind = 125; + return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x8000L); + case 47: + jjmatchedKind = 92; + return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x800L); + case 58: + jjmatchedKind = 84; + return jjMoveStringLiteralDfa1_3(0x400000000000L, 0x0L, 0x0L); + case 59: + return jjStopAtPos(0, 123); + case 60: + jjmatchedKind = 127; + return jjMoveStringLiteralDfa1_3(0x0L, 0x200000000L, 0x40012L); + case 61: + jjmatchedKind = 135; + return jjMoveStringLiteralDfa1_3(0x800000000000L, 0x0L, 0x41L); + case 62: + jjmatchedKind = 126; + return jjMoveStringLiteralDfa1_3(0x0L, 0xc00000000L, 0x80004L); + case 63: + jjmatchedKind = 83; + return jjMoveStringLiteralDfa1_3(0x10L, 0x0L, 0x0L); + case 64: + return jjStopAtPos(0, 80); + case 91: + return jjStopAtPos(0, 121); + case 93: + return jjStopAtPos(0, 122); + case 94: + jjmatchedKind = 95; + return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x4000L); + case 65: + case 97: + return jjMoveStringLiteralDfa1_3(0x0L, 0x2000000000L, 0x0L); + case 79: + case 111: + return jjMoveStringLiteralDfa1_3(0x0L, 0x1000000000L, 0x0L); + case 123: + return jjStopAtPos(0, 119); + case 124: + jjmatchedKind = 94; + return jjMoveStringLiteralDfa1_3(0x0L, 0x200000L, 0x2000L); + case 125: + return jjStopAtPos(0, 120); + case 126: + jjmatchedKind = 82; + return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x20000L); + default : + return jjMoveNfa_3(0, 0); + } +} +static private final int jjMoveStringLiteralDfa1_3(long active0, long active1, long active2) +{ + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { + jjStopStringLiteralDfa_3(0, active0, active1, active2); + return 1; + } + switch(curChar) + { + case 38: + if ((active1 & 0x400000L) != 0L) + return jjStopAtPos(1, 86); + break; + case 43: + if ((active1 & 0x800000L) != 0L) + return jjStopAtPos(1, 87); + break; + case 45: + if ((active1 & 0x1000000L) != 0L) + return jjStopAtPos(1, 88); + break; + case 58: + if ((active0 & 0x400000000000L) != 0L) + return jjStopAtPos(1, 46); + break; + case 60: + if ((active1 & 0x200000000L) != 0L) + { + jjmatchedKind = 97; + jjmatchedPos = 1; + } + return jjMoveStringLiteralDfa2_3(active0, 0L, active1, 0L, active2, 0x40000L); + case 61: + if ((active2 & 0x1L) != 0L) + { + jjmatchedKind = 128; + jjmatchedPos = 1; + } + else if ((active2 & 0x2L) != 0L) + return jjStopAtPos(1, 129); + else if ((active2 & 0x4L) != 0L) + return jjStopAtPos(1, 130); + else if ((active2 & 0x8L) != 0L) + { + jjmatchedKind = 131; + jjmatchedPos = 1; + } + else if ((active2 & 0x100L) != 0L) + return jjStopAtPos(1, 136); + else if ((active2 & 0x200L) != 0L) + return jjStopAtPos(1, 137); + else if ((active2 & 0x400L) != 0L) + return jjStopAtPos(1, 138); + else if ((active2 & 0x800L) != 0L) + return jjStopAtPos(1, 139); + else if ((active2 & 0x1000L) != 0L) + return jjStopAtPos(1, 140); + else if ((active2 & 0x2000L) != 0L) + return jjStopAtPos(1, 141); + else if ((active2 & 0x4000L) != 0L) + return jjStopAtPos(1, 142); + else if ((active2 & 0x8000L) != 0L) + return jjStopAtPos(1, 143); + else if ((active2 & 0x10000L) != 0L) + return jjStopAtPos(1, 144); + else if ((active2 & 0x20000L) != 0L) + return jjStopAtPos(1, 145); + return jjMoveStringLiteralDfa2_3(active0, 0L, active1, 0L, active2, 0x60L); + case 62: + if ((active0 & 0x10L) != 0L) + return jjStopAtPos(1, 4); + else if ((active0 & 0x200000000000L) != 0L) + return jjStopAtPos(1, 45); + else if ((active0 & 0x800000000000L) != 0L) + return jjStopAtPos(1, 47); + else if ((active1 & 0x400000000L) != 0L) + { + jjmatchedKind = 98; + jjmatchedPos = 1; + } + else if ((active2 & 0x10L) != 0L) + return jjStopAtPos(1, 132); + return jjMoveStringLiteralDfa2_3(active0, 0L, active1, 0x800000000L, active2, 0x80000L); + case 78: + case 110: + return jjMoveStringLiteralDfa2_3(active0, 0L, active1, 0x2000000000L, active2, 0L); + case 82: + case 114: + if ((active1 & 0x1000000000L) != 0L) + return jjStartNfaWithStates_3(1, 100, 1); + break; + case 124: + if ((active1 & 0x200000L) != 0L) + return jjStopAtPos(1, 85); + break; + default : + break; + } + return jjStartNfa_3(0, active0, active1, active2); +} +static private final int jjMoveStringLiteralDfa2_3(long old0, long active0, long old1, long active1, long old2, long active2) +{ + if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L) + return jjStartNfa_3(0, old0, old1, old2); + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { + jjStopStringLiteralDfa_3(1, 0L, active1, active2); + return 2; + } + switch(curChar) + { + case 61: + if ((active2 & 0x20L) != 0L) + return jjStopAtPos(2, 133); + else if ((active2 & 0x40L) != 0L) + return jjStopAtPos(2, 134); + else if ((active2 & 0x40000L) != 0L) + return jjStopAtPos(2, 146); + else if ((active2 & 0x80000L) != 0L) + return jjStopAtPos(2, 147); + break; + case 62: + if ((active1 & 0x800000000L) != 0L) + return jjStopAtPos(2, 99); + break; + case 68: + case 100: + if ((active1 & 0x2000000000L) != 0L) + return jjStartNfaWithStates_3(2, 101, 1); + break; + default : + break; + } + return jjStartNfa_3(1, 0L, active1, active2); +} +static private final int jjMoveNfa_3(int startState, int curPos) +{ + int[] nextStates; + int startsAt = 0; + jjnewStateCnt = 2; + int i = 1; + jjstateSet[0] = startState; + int j, kind = 0x7fffffff; + for (;;) + { + if (++jjround == 0x7fffffff) + ReInitRounds(); + if (curChar < 64) + { + long l = 1L << curChar; + MatchLoop: do + { + switch(jjstateSet[--i]) + { + case 1: + if ((0x3ff000000000000L & l) == 0L) + break; + kind = 113; + jjstateSet[jjnewStateCnt++] = 1; + break; + default : break; + } + } while(i != startsAt); + } + else if (curChar < 128) + { + long l = 1L << (curChar & 077); + MatchLoop: do + { + switch(jjstateSet[--i]) + { + case 0: + case 1: + if ((0x87fffffe87fffffeL & l) == 0L) + break; + if (kind > 113) + kind = 113; + jjCheckNAdd(1); + break; + default : break; + } + } while(i != startsAt); + } + else + { + int i2 = (curChar & 0xff) >> 6; + long l2 = 1L << (curChar & 077); + MatchLoop: do + { + switch(jjstateSet[--i]) + { + case 0: + case 1: + if ((jjbitVec0[i2] & l2) == 0L) + break; + if (kind > 113) + kind = 113; + jjCheckNAdd(1); + break; + default : break; + } + } while(i != startsAt); + } + if (kind != 0x7fffffff) + { + jjmatchedKind = kind; + jjmatchedPos = curPos; + kind = 0x7fffffff; + } + ++curPos; + if ((i = jjnewStateCnt) == (startsAt = 2 - (jjnewStateCnt = startsAt))) + return curPos; + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { return curPos; } + } +} static final int[] jjnextStates = { - 19, 20, 25, 26, 29, 30, 12, 47, 48, 50, 51, 52, 54, 38, 39, 41, - 42, 43, 45, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, 12, 38, - 39, 41, 42, 43, 45, 47, 48, 50, 51, 52, 54, 56, 57, 59, 60, 61, - 63, 56, 57, 59, 60, 61, 63, 10, 11, 23, 24, 27, 28, 31, 32, + 16, 17, 22, 23, 26, 27, 12, 44, 45, 47, 48, 49, 51, 35, 36, 38, + 39, 40, 42, 31, 33, 6, 8, 9, 12, 18, 19, 12, 26, 27, 12, 35, + 36, 38, 39, 40, 42, 44, 45, 47, 48, 49, 51, 53, 54, 56, 57, 58, + 60, 53, 54, 56, 57, 58, 60, 10, 11, 20, 21, 24, 25, 28, 29, }; public static final String[] jjstrLiteralImages = { "", "\74\77", null, "\74\77\75", "\77\76", 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, -"\55\76", "\72\72", "\75\76", null, null, null, null, null, null, null, null, null, null, +null, null, null, null, null, null, "\55\76", "\72\72", "\75\76", 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, "\100", "\44", "\41", "\176", "\77", -"\72", "\174\174", "\46\46", "\53\53", "\55\55", "\53", "\55", "\52", "\57", "\46", -"\174", "\136", "\45", "\74\74", "\76\76", "\76\76\76", null, null, null, null, null, -null, null, null, null, null, null, null, null, null, null, null, "\50", "\51", -"\173", "\175", "\133", "\135", "\73", "\54", "\56", "\76", "\74", "\75\75", "\74\75", -"\76\75", "\41\75", "\74\76", "\41\75\75", "\75\75\75", "\75", "\53\75", "\55\75", -"\52\75", "\57\75", "\46\75", "\174\75", "\136\75", "\56\75", "\45\75", "\176\75", -"\74\74\75", "\76\76\75", null, }; +null, "\100", "\41", "\176", "\77", "\72", "\174\174", "\46\46", "\53\53", "\55\55", +"\53", "\55", "\52", "\57", "\46", "\174", "\136", "\45", "\74\74", "\76\76", +"\76\76\76", null, null, null, null, null, null, null, null, null, null, null, null, "\44", +null, null, null, null, "\50", "\51", "\173", "\175", "\133", "\135", "\73", "\54", +"\56", "\76", "\74", "\75\75", "\74\75", "\76\75", "\41\75", "\74\76", "\41\75\75", +"\75\75\75", "\75", "\53\75", "\55\75", "\52\75", "\57\75", "\46\75", "\174\75", "\136\75", +"\56\75", "\45\75", "\176\75", "\74\74\75", "\76\76\75", }; public static final String[] lexStateNames = { "DEFAULT", "PHPPARSING", "IN_SINGLE_LINE_COMMENT", + "IN_VARIABLE", "IN_FORMAL_COMMENT", "IN_MULTI_LINE_COMMENT", }; public static final int[] jjnewLexState = { - -1, 1, 1, 1, 0, -1, -1, -1, -1, -1, -1, 2, 2, 3, 4, 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, 0, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 2, 2, 4, 5, 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, 1, + 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 3, -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 = { - 0xffffffffffe0001fL, 0xffff8fa3ffffffffL, 0x7fffL, + 0xfffffffff880001fL, 0xffe3f47fffffffffL, 0xfffffL, }; static final long[] jjtoSkip = { - 0xfffe0L, 0x0L, 0x0L, + 0x37fffe0L, 0x0L, 0x0L, }; static final long[] jjtoSpecial = { - 0xff800L, 0x0L, 0x0L, + 0x37ff800L, 0x0L, 0x0L, }; static final long[] jjtoMore = { - 0x100000L, 0x0L, 0x0L, + 0x4000000L, 0x0L, 0x0L, }; static protected SimpleCharStream input_stream; -static private final int[] jjrounds = new int[64]; -static private final int[] jjstateSet = new int[128]; +static private final int[] jjrounds = new int[61]; +static private final int[] jjstateSet = new int[122]; static StringBuffer image; static int jjimageLen; static int lengthOfMatch; @@ -1980,7 +2313,7 @@ static private final void ReInitRounds() { int i; jjround = 0x80000001; - for (i = 64; i-- > 0;) + for (i = 61; i-- > 0;) jjrounds[i] = 0x80000000; } static public void ReInit(SimpleCharStream stream, int lexState) @@ -1990,7 +2323,7 @@ static public void ReInit(SimpleCharStream stream, int lexState) } static public void SwitchTo(int lexState) { - if (lexState >= 5 || lexState < 0) + if (lexState >= 6 || lexState < 0) throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE); else curLexState = lexState; @@ -2068,27 +2401,32 @@ public static Token getNextToken() jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_2(); - if (jjmatchedPos == 0 && jjmatchedKind > 16) + if (jjmatchedPos == 0 && jjmatchedKind > 21) { - jjmatchedKind = 16; + jjmatchedKind = 21; } break; case 3: jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_3(); - if (jjmatchedPos == 0 && jjmatchedKind > 20) - { - jjmatchedKind = 20; - } break; case 4: jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_4(); - if (jjmatchedPos == 0 && jjmatchedKind > 20) + if (jjmatchedPos == 0 && jjmatchedKind > 26) + { + jjmatchedKind = 26; + } + break; + case 5: + jjmatchedKind = 0x7fffffff; + jjmatchedPos = 0; + curPos = jjMoveStringLiteralDfa0_5(); + if (jjmatchedPos == 0 && jjmatchedKind > 26) { - jjmatchedKind = 20; + jjmatchedKind = 26; } break; } @@ -2100,7 +2438,6 @@ public static Token getNextToken() { matchedToken = jjFillToken(); matchedToken.specialToken = specialToken; - TokenLexicalActions(matchedToken); if (jjnewLexState[jjmatchedKind] != -1) curLexState = jjnewLexState[jjmatchedKind]; CommonTokenAction(matchedToken); @@ -2165,58 +2502,15 @@ static void SkipLexicalActions(Token matchedToken) { switch(jjmatchedKind) { - case 13 : + case 18 : if (image == null) image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); else image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); input_stream.backup(1); break; - case 17 : - if (image == null) - image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); - else - image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); - PHPParser.createNewTask(); - break; default : break; } } -static void TokenLexicalActions(Token matchedToken) -{ - switch(jjmatchedKind) - { - case 1 : - if (image == null) - image = new StringBuffer(jjstrLiteralImages[1]); - else - image.append(jjstrLiteralImages[1]); - PHPParser.createNewHTMLCode(); - break; - case 2 : - if (image == null) - image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); - else - image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); - PHPParser.createNewHTMLCode(); - break; - case 3 : - if (image == null) - image = new StringBuffer(jjstrLiteralImages[3]); - else - image.append(jjstrLiteralImages[3]); - PHPParser.createNewHTMLCode(); - break; - case 4 : - if (image == null) - image = new StringBuffer(jjstrLiteralImages[4]); - else - image.append(jjstrLiteralImages[4]); - PHPParser.htmlStart = PHPParser.token.sourceEnd; - break; - default : - break; - } -} } -- 1.7.1