From c9f19d0f9dd92bc5843126bc8d71dcc25db81d61 Mon Sep 17 00:00:00 2001 From: kpouer Date: Fri, 16 May 2003 23:53:15 +0000 Subject: [PATCH] *** empty log message *** --- net.sourceforge.phpeclipse/src/test/PHPParser.java | 639 +++++++++----------- net.sourceforge.phpeclipse/src/test/PHPParser.jj | 63 +-- .../src/test/PHPParserTokenManager.java | 205 +++---- 3 files changed, 377 insertions(+), 530 deletions(-) diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java index 30114bb..92e8360 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java @@ -62,12 +62,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon private static AstNode[] nodes; /** The cursor in expression stack. */ private static int nodePtr; - private static VariableDeclaration[] variableDeclarationStack; - private static int variableDeclarationPtr; - private static Statement[] statementStack; - private static int statementPtr; - private static ElseIf[] elseIfStack; - private static int elseIfPtr; public final void setFileToParse(final IFile fileToParse) { this.fileToParse = fileToParse; @@ -86,11 +80,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon */ private static final void init() { nodes = new AstNode[AstStackIncrement]; - statementStack = new Statement[AstStackIncrement]; - elseIfStack = new ElseIf[AstStackIncrement]; nodePtr = -1; - statementPtr = -1; - elseIfPtr = -1; htmlStart = 0; } @@ -111,45 +101,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } } - private static final void pushOnVariableDeclarationStack(VariableDeclaration var) { - try { - variableDeclarationStack[++variableDeclarationPtr] = var; - } catch (IndexOutOfBoundsException e) { - int oldStackLength = variableDeclarationStack.length; - VariableDeclaration[] oldStack = variableDeclarationStack; - variableDeclarationStack = new VariableDeclaration[oldStackLength + AstStackIncrement]; - System.arraycopy(oldStack, 0, variableDeclarationStack, 0, oldStackLength); - variableDeclarationPtr = oldStackLength; - variableDeclarationStack[variableDeclarationPtr] = var; - } - } - - private static final void pushOnStatementStack(Statement statement) { - try { - statementStack[++statementPtr] = statement; - } catch (IndexOutOfBoundsException e) { - int oldStackLength = statementStack.length; - Statement[] oldStack = statementStack; - statementStack = new Statement[oldStackLength + AstStackIncrement]; - System.arraycopy(oldStack, 0, statementStack, 0, oldStackLength); - statementPtr = oldStackLength; - statementStack[statementPtr] = statement; - } - } - - private static final void pushOnElseIfStack(ElseIf elseIf) { - try { - elseIfStack[++elseIfPtr] = elseIf; - } catch (IndexOutOfBoundsException e) { - int oldStackLength = elseIfStack.length; - ElseIf[] oldStack = elseIfStack; - elseIfStack = new ElseIf[oldStackLength + AstStackIncrement]; - System.arraycopy(oldStack, 0, elseIfStack, 0, oldStackLength); - elseIfPtr = oldStackLength; - elseIfStack[elseIfPtr] = elseIf; - } - } - public static final void phpParserTester(final String strEval) throws CoreException, ParseException { PHPParserTokenManager.SwitchTo(PHPParserTokenManager.PHPPARSING); final StringReader stream = new StringReader(strEval); @@ -779,7 +730,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } static final public VariableDeclaration VariableDeclarator() throws ParseException { - final String varName, varValue; + final String varName; Expression initializer = null; final int pos = jj_input_stream.getPosition(); varName = VariableDeclaratorId(); @@ -1161,8 +1112,6 @@ Expression expr,expr2; * (FormalParameter()) */ static final public Hashtable FormalParameters() throws ParseException { - String expr; - final StringBuffer buff = new StringBuffer("("); VariableDeclaration var; final Hashtable parameters = new Hashtable(); try { @@ -2137,7 +2086,6 @@ final int pos = SimpleCharStream.getPosition(); static final public Expression PrimaryExpression() throws ParseException { final Token identifier; Expression expr; - final StringBuffer buff = new StringBuffer(); final int pos = SimpleCharStream.getPosition(); if (jj_2_5(2)) { identifier = jj_consume_token(IDENTIFIER); @@ -2793,7 +2741,6 @@ final ArrayList list = new ArrayList(); */ static final public InclusionStatement IncludeStatement() throws ParseException { final Expression expr; - final Token token; final int keyword; final int pos = jj_input_stream.getPosition(); final InclusionStatement inclusionStatement; @@ -3751,7 +3698,6 @@ final ArrayList list = new ArrayList(); * @return the if it was a case and null if not */ static final public Expression SwitchLabel() throws ParseException { - final Token token; final Expression expr; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case CASE: @@ -4628,7 +4574,6 @@ final ArrayList list = new ArrayList(); static final public ForeachStatement ForeachStatement() throws ParseException { Statement statement; Expression expression; - final StringBuffer buff = new StringBuffer(); final int pos = SimpleCharStream.getPosition(); ArrayVariableDeclaration variable; jj_consume_token(FOREACH); @@ -5108,6 +5053,120 @@ final int startBlock, endBlock; return retval; } + static final private boolean jj_3R_157() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_159()) { + jj_scanpos = xsp; + if (jj_3R_160()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_166()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_152() { + if (jj_3R_158()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_151() { + if (jj_3R_157()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_156() { + if (jj_scan_token(MINUS)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_155() { + if (jj_scan_token(PLUS)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_148() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_150()) { + jj_scanpos = xsp; + if (jj_3R_151()) { + jj_scanpos = xsp; + if (jj_3R_152()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_150() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_155()) { + jj_scanpos = xsp; + if (jj_3R_156()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_139()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_154() { + if (jj_3R_148()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_149() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_153()) { + jj_scanpos = xsp; + if (jj_3R_154()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_153() { + if (jj_scan_token(AT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_149()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_144() { + if (jj_3R_149()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_139() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_143()) { + jj_scanpos = xsp; + if (jj_3R_144()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_143() { + if (jj_scan_token(BIT_AND)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_148()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_147() { if (jj_scan_token(REMAINDER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5211,16 +5270,6 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_57() { - if (jj_3R_50()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_87()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3_2() { if (jj_scan_token(COMMA)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5229,9 +5278,13 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_138() { - if (jj_scan_token(RUNSIGNEDSHIFT)) return true; + static final private boolean jj_3R_57() { + if (jj_3R_50()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_87()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5247,6 +5300,12 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_138() { + if (jj_scan_token(RUNSIGNEDSHIFT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_137() { if (jj_scan_token(RSIGNEDSHIFT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5275,14 +5334,6 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3_6() { - if (jj_3R_45()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(SEMICOLON)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_121() { if (jj_3R_128()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5295,10 +5346,10 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_58() { - if (jj_scan_token(COMMA)) return true; + static final private boolean jj_3_6() { + if (jj_3R_45()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_57()) return true; + if (jj_scan_token(SEMICOLON)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5318,6 +5369,14 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_58() { + if (jj_scan_token(COMMA)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_57()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_47() { if (jj_3R_57()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5354,6 +5413,14 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_201() { + if (jj_scan_token(ARRAYASSIGN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_45()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_122() { Token xsp; xsp = jj_scanpos; @@ -5373,11 +5440,13 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_201() { - if (jj_scan_token(ARRAYASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + static final private boolean jj_3R_41() { if (jj_3R_45()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_201()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5393,16 +5462,6 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_41() { - if (jj_3R_45()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_201()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_203() { if (jj_scan_token(COMMA)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5423,14 +5482,14 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_200() { - if (jj_3R_202()) return true; + static final private boolean jj_3R_127() { + if (jj_scan_token(TRIPLEEQUAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_127() { - if (jj_scan_token(TRIPLEEQUAL)) return true; + static final private boolean jj_3R_200() { + if (jj_3R_202()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5527,12 +5586,6 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_177() { - if (jj_scan_token(NULL)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_118() { if (jj_scan_token(BIT_AND)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5541,14 +5594,8 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_176() { - if (jj_scan_token(FALSE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_175() { - if (jj_scan_token(TRUE)) return true; + static final private boolean jj_3R_177() { + if (jj_scan_token(NULL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5561,6 +5608,12 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_176() { + if (jj_scan_token(FALSE)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_115() { if (jj_3R_117()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5573,6 +5626,12 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_175() { + if (jj_scan_token(TRUE)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_174() { if (jj_scan_token(STRING_LITERAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5632,23 +5691,6 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_92() { - if (jj_3R_45()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_60() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_92()) { - jj_scanpos = xsp; - if (jj_3R_93()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_113() { if (jj_3R_115()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5661,11 +5703,20 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_46() { - if (jj_scan_token(IDENTIFIER)) return true; + static final private boolean jj_3R_92() { + if (jj_3R_45()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(COLON)) return true; + return false; + } + + static final private boolean jj_3R_60() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_92()) { + jj_scanpos = xsp; + if (jj_3R_93()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5696,6 +5747,14 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_46() { + if (jj_scan_token(IDENTIFIER)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(COLON)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_98() { if (jj_scan_token(LBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5706,12 +5765,6 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3_8() { - if (jj_3R_47()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_114() { if (jj_scan_token(BIT_OR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5744,6 +5797,12 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3_8() { + if (jj_3R_47()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_95() { if (jj_scan_token(DOLLAR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5772,41 +5831,41 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_48() { - if (jj_scan_token(CLASSACCESS)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_59()) return true; + static final private boolean jj_3R_94() { + if (jj_scan_token(DOLLAR_ID)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_98()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_40() { + static final private boolean jj_3R_61() { Token xsp; xsp = jj_scanpos; - if (jj_3R_48()) { + if (jj_3R_94()) { jj_scanpos = xsp; - if (jj_3R_49()) return true; + if (jj_3R_95()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_94() { - if (jj_scan_token(DOLLAR_ID)) return true; + static final private boolean jj_3R_48() { + if (jj_scan_token(CLASSACCESS)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_59()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_98()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_61() { + static final private boolean jj_3R_40() { Token xsp; xsp = jj_scanpos; - if (jj_3R_94()) { + if (jj_3R_48()) { jj_scanpos = xsp; - if (jj_3R_95()) return true; + if (jj_3R_49()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; @@ -5830,6 +5889,19 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_105() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_111()) { + jj_scanpos = xsp; + if (jj_3R_112()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_104()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_195() { if (jj_3R_199()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5847,19 +5919,6 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_105() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_111()) { - jj_scanpos = xsp; - if (jj_3R_112()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_104()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_97() { if (jj_scan_token(HOOK)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5890,6 +5949,12 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3_1() { + if (jj_3R_40()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_107() { if (jj_scan_token(_ORL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5919,9 +5984,15 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3_1() { - if (jj_3R_40()) return true; + static final private boolean jj_3R_50() { + if (jj_3R_61()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3_1()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } @@ -5938,18 +6009,6 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_50() { - if (jj_3R_61()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3_1()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } - return false; - } - static final private boolean jj_3R_96() { if (jj_3R_102()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5972,14 +6031,14 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_191() { - if (jj_3R_50()) return true; + static final private boolean jj_3R_74() { + if (jj_scan_token(TILDEEQUAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_74() { - if (jj_scan_token(TILDEEQUAL)) return true; + static final private boolean jj_3R_191() { + if (jj_3R_50()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -5996,16 +6055,16 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_190() { - if (jj_scan_token(NEW)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_178()) return true; + static final private boolean jj_3R_71() { + if (jj_scan_token(XORASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_71() { - if (jj_scan_token(XORASSIGN)) return true; + static final private boolean jj_3R_190() { + if (jj_scan_token(NEW)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_178()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -6022,6 +6081,12 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_68() { + if (jj_scan_token(LSHIFTASSIGN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_189() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6042,12 +6107,6 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_68() { - if (jj_scan_token(LSHIFTASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_67() { if (jj_scan_token(MINUSASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6160,16 +6219,16 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_101() { - if (jj_scan_token(ASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_45()) return true; + static final private boolean jj_3R_179() { + if (jj_3R_188()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_179() { - if (jj_3R_188()) return true; + static final private boolean jj_3R_101() { + if (jj_scan_token(ASSIGN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_45()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -6184,6 +6243,12 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3_3() { + if (jj_3R_42()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3_5() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6214,12 +6279,6 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3_3() { - if (jj_3R_42()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_56() { if (jj_3R_86()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6238,14 +6297,6 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_100() { - if (jj_scan_token(COMMA)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_50()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_45() { Token xsp; xsp = jj_scanpos; @@ -6269,6 +6320,14 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_100() { + if (jj_scan_token(COMMA)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_50()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_194() { if (jj_scan_token(DECR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6292,12 +6351,6 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_99() { - if (jj_3R_50()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_168() { if (jj_3R_166()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6308,6 +6361,12 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_99() { + if (jj_3R_50()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_83() { if (jj_scan_token(OBJECT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6338,6 +6397,18 @@ final int startBlock, endBlock; return false; } + static final private boolean jj_3R_183() { + if (jj_3R_52()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_80() { + if (jj_scan_token(FLOAT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_85() { if (jj_scan_token(LIST)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6360,18 +6431,6 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_183() { - if (jj_3R_52()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_80() { - if (jj_scan_token(FLOAT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_167() { if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -6548,120 +6607,6 @@ final int startBlock, endBlock; return false; } - static final private boolean jj_3R_157() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_159()) { - jj_scanpos = xsp; - if (jj_3R_160()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_166()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_152() { - if (jj_3R_158()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_151() { - if (jj_3R_157()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_156() { - if (jj_scan_token(MINUS)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_155() { - if (jj_scan_token(PLUS)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_148() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_150()) { - jj_scanpos = xsp; - if (jj_3R_151()) { - jj_scanpos = xsp; - if (jj_3R_152()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_150() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_155()) { - jj_scanpos = xsp; - if (jj_3R_156()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_139()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_154() { - if (jj_3R_148()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_149() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_153()) { - jj_scanpos = xsp; - if (jj_3R_154()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_153() { - if (jj_scan_token(AT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_149()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_144() { - if (jj_3R_149()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_139() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_143()) { - jj_scanpos = xsp; - if (jj_3R_144()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_143() { - if (jj_scan_token(BIT_AND)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_148()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static private boolean jj_initialized_once = false; static public PHPParserTokenManager token_source; static SimpleCharStream jj_input_stream; diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.jj b/net.sourceforge.phpeclipse/src/test/PHPParser.jj index 95618cb..0d76a4c 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj @@ -83,12 +83,6 @@ public final class PHPParser extends PHPParserSuperclass { private static AstNode[] nodes; /** The cursor in expression stack. */ private static int nodePtr; - private static VariableDeclaration[] variableDeclarationStack; - private static int variableDeclarationPtr; - private static Statement[] statementStack; - private static int statementPtr; - private static ElseIf[] elseIfStack; - private static int elseIfPtr; public final void setFileToParse(final IFile fileToParse) { this.fileToParse = fileToParse; @@ -107,11 +101,7 @@ public final class PHPParser extends PHPParserSuperclass { */ private static final void init() { nodes = new AstNode[AstStackIncrement]; - statementStack = new Statement[AstStackIncrement]; - elseIfStack = new ElseIf[AstStackIncrement]; nodePtr = -1; - statementPtr = -1; - elseIfPtr = -1; htmlStart = 0; } @@ -132,45 +122,6 @@ public final class PHPParser extends PHPParserSuperclass { } } - private static final void pushOnVariableDeclarationStack(VariableDeclaration var) { - try { - variableDeclarationStack[++variableDeclarationPtr] = var; - } catch (IndexOutOfBoundsException e) { - int oldStackLength = variableDeclarationStack.length; - VariableDeclaration[] oldStack = variableDeclarationStack; - variableDeclarationStack = new VariableDeclaration[oldStackLength + AstStackIncrement]; - System.arraycopy(oldStack, 0, variableDeclarationStack, 0, oldStackLength); - variableDeclarationPtr = oldStackLength; - variableDeclarationStack[variableDeclarationPtr] = var; - } - } - - private static final void pushOnStatementStack(Statement statement) { - try { - statementStack[++statementPtr] = statement; - } catch (IndexOutOfBoundsException e) { - int oldStackLength = statementStack.length; - Statement[] oldStack = statementStack; - statementStack = new Statement[oldStackLength + AstStackIncrement]; - System.arraycopy(oldStack, 0, statementStack, 0, oldStackLength); - statementPtr = oldStackLength; - statementStack[statementPtr] = statement; - } - } - - private static final void pushOnElseIfStack(ElseIf elseIf) { - try { - elseIfStack[++elseIfPtr] = elseIf; - } catch (IndexOutOfBoundsException e) { - int oldStackLength = elseIfStack.length; - ElseIf[] oldStack = elseIfStack; - elseIfStack = new ElseIf[oldStackLength + AstStackIncrement]; - System.arraycopy(oldStack, 0, elseIfStack, 0, oldStackLength); - elseIfPtr = oldStackLength; - elseIfStack[elseIfPtr] = elseIf; - } - } - public static final void phpParserTester(final String strEval) throws CoreException, ParseException { PHPParserTokenManager.SwitchTo(PHPParserTokenManager.PHPPARSING); final StringReader stream = new StringReader(strEval); @@ -594,10 +545,9 @@ MORE : | @@ -903,7 +853,7 @@ FieldDeclaration FieldDeclaration() : VariableDeclaration VariableDeclarator() : { - final String varName, varValue; + final String varName; Expression initializer = null; final int pos = jj_input_stream.getPosition(); } @@ -1097,11 +1047,10 @@ ArrayVariableDeclaration[] ArrayInitializer() : MethodDeclaration MethodDeclaration() : { final MethodDeclaration functionDeclaration; - Token functionToken; final Block block; } { - functionToken = + try { functionDeclaration = MethodDeclarator() {outlineInfo.addVariable(new String(functionDeclaration.name));} @@ -1160,8 +1109,6 @@ MethodDeclaration MethodDeclarator() : */ Hashtable FormalParameters() : { - String expr; - final StringBuffer buff = new StringBuffer("("); VariableDeclaration var; final Hashtable parameters = new Hashtable(); } @@ -1641,7 +1588,6 @@ Expression PrimaryExpression() : { final Token identifier; Expression expr; - final StringBuffer buff = new StringBuffer(); final int pos = SimpleCharStream.getPosition(); } { @@ -1941,7 +1887,6 @@ HTMLBlock htmlBlock() : InclusionStatement IncludeStatement() : { final Expression expr; - final Token token; final int keyword; final int pos = jj_input_stream.getPosition(); final InclusionStatement inclusionStatement; @@ -2427,7 +2372,6 @@ AbstractCase switchLabel0() : */ Expression SwitchLabel() : { - final Token token; final Expression expr; } { @@ -2756,7 +2700,6 @@ ForeachStatement ForeachStatement() : { Statement statement; Expression expression; - final StringBuffer buff = new StringBuffer(); final int pos = SimpleCharStream.getPosition(); ArrayVariableDeclaration variable; } diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java index 016518a..be6ded1 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java @@ -1253,7 +1253,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) { int[] nextStates; int startsAt = 0; - jjnewStateCnt = 70; + jjnewStateCnt = 64; int i = 1; jjstateSet[0] = startState; int j, kind = 0x7fffffff; @@ -1274,7 +1274,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) else if (curChar == 39) jjCheckNAddStates(7, 12); else if (curChar == 34) - jjCheckNAddStates(13, 20); + jjCheckNAddStates(13, 18); else if (curChar == 36) jjstateSet[jjnewStateCnt++] = 16; else if (curChar == 46) @@ -1291,7 +1291,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) { if (kind > 95) kind = 95; - jjCheckNAddStates(21, 23); + jjCheckNAddStates(19, 21); } break; case 0: @@ -1329,7 +1329,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; if (kind > 99) kind = 99; - jjCheckNAddStates(24, 26); + jjCheckNAddStates(22, 24); break; case 10: if ((0x280000000000L & l) != 0L) @@ -1373,14 +1373,14 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; if (kind > 99) kind = 99; - jjCheckNAddStates(27, 29); + jjCheckNAddStates(25, 27); break; case 21: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 99) kind = 99; - jjCheckNAddStates(27, 29); + jjCheckNAddStates(25, 27); break; case 23: if ((0x280000000000L & l) != 0L) @@ -1410,7 +1410,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 29: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(30, 32); + jjCheckNAddStates(28, 30); break; case 31: if ((0x280000000000L & l) != 0L) @@ -1425,7 +1425,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; if (kind > 95) kind = 95; - jjCheckNAddStates(21, 23); + jjCheckNAddStates(19, 21); break; case 35: if ((0x3ff000000000000L & l) == 0L) @@ -1443,73 +1443,65 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 37: if (curChar == 34) - jjCheckNAddStates(13, 20); + jjCheckNAddStates(13, 18); break; case 38: if ((0xfffffffbffffffffL & l) != 0L) - jjCheckNAddStates(33, 36); + jjCheckNAddStates(31, 33); break; case 39: if (curChar == 34) - jjCheckNAddStates(33, 36); + jjCheckNAddStates(31, 33); break; - case 42: - if ((0xfffffffbffffffffL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 43; - break; - case 44: + case 41: if (curChar == 34 && kind > 101) kind = 101; break; - case 45: + case 42: if ((0xfffffffbffffffffL & l) != 0L) - jjCheckNAddStates(37, 40); + jjCheckNAddStates(34, 36); break; - case 46: + case 43: if (curChar == 34) - jjCheckNAddStates(37, 40); + jjCheckNAddStates(34, 36); break; - case 49: - if ((0xfffffffbffffffffL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 50; - break; - case 51: + case 45: if (curChar == 34 && kind > 102) kind = 102; break; - case 52: + case 46: if (curChar == 39) jjCheckNAddStates(7, 12); break; - case 53: + case 47: if ((0xffffff7fffffffffL & l) != 0L) - jjCheckNAddStates(41, 43); + jjCheckNAddStates(37, 39); break; - case 54: + case 48: if (curChar == 39) - jjCheckNAddStates(41, 43); + jjCheckNAddStates(37, 39); break; - case 56: + case 50: if (curChar == 39 && kind > 101) kind = 101; break; - case 57: + case 51: if ((0xffffff7fffffffffL & l) != 0L) - jjCheckNAddStates(44, 46); + jjCheckNAddStates(40, 42); break; - case 58: + case 52: if (curChar == 39) - jjCheckNAddStates(44, 46); + jjCheckNAddStates(40, 42); break; - case 60: + case 54: if (curChar == 39 && kind > 103) kind = 103; break; - case 62: - jjAddStates(47, 49); + case 56: + jjAddStates(43, 45); break; - case 66: - jjAddStates(50, 52); + case 60: + jjAddStates(46, 48); break; default : break; } @@ -1530,7 +1522,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAdd(14); } else if (curChar == 96) - jjCheckNAddStates(53, 58); + jjCheckNAddStates(49, 54); break; case 1: if (kind > 13) @@ -1542,7 +1534,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 9: if ((0x2000000020L & l) != 0L) - jjAddStates(59, 60); + jjAddStates(55, 56); break; case 12: if ((0x5000000050L & l) != 0L && kind > 99) @@ -1566,15 +1558,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 22: if ((0x2000000020L & l) != 0L) - jjAddStates(61, 62); + jjAddStates(57, 58); break; case 26: if ((0x2000000020L & l) != 0L) - jjAddStates(63, 64); + jjAddStates(59, 60); break; case 30: if ((0x2000000020L & l) != 0L) - jjAddStates(65, 66); + jjAddStates(61, 62); break; case 34: if ((0x100000001000000L & l) != 0L) @@ -1588,90 +1580,66 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAddTwoStates(35, 6); break; case 38: - if ((0xd7ffffffffffffffL & l) != 0L) - jjCheckNAddStates(33, 36); + jjAddStates(31, 33); break; case 40: if (curChar == 92) jjstateSet[jjnewStateCnt++] = 39; break; - case 41: - if (curChar == 123) - jjstateSet[jjnewStateCnt++] = 42; - break; case 42: - jjstateSet[jjnewStateCnt++] = 43; - break; - case 43: - if (curChar == 125) - jjCheckNAddStates(33, 36); - break; - case 45: - if ((0xd7ffffffffffffffL & l) != 0L) - jjCheckNAddStates(37, 40); + jjAddStates(34, 36); break; - case 47: + case 44: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 46; + jjstateSet[jjnewStateCnt++] = 43; break; - case 48: - if (curChar == 123) - jjstateSet[jjnewStateCnt++] = 49; + case 47: + jjAddStates(37, 39); break; case 49: - jjstateSet[jjnewStateCnt++] = 50; - break; - case 50: - if (curChar == 125) - jjCheckNAddStates(37, 40); - break; - case 53: - jjAddStates(41, 43); - break; - case 55: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 54; + jjstateSet[jjnewStateCnt++] = 48; break; - case 57: - jjAddStates(44, 46); + case 51: + jjAddStates(40, 42); break; - case 59: + case 53: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 58; + jjstateSet[jjnewStateCnt++] = 52; break; - case 61: + case 55: if (curChar == 96) - jjCheckNAddStates(53, 58); + jjCheckNAddStates(49, 54); break; - case 62: + case 56: if ((0xfffffffeffffffffL & l) != 0L) - jjCheckNAddStates(47, 49); + jjCheckNAddStates(43, 45); break; - case 63: + case 57: if (curChar == 96) - jjCheckNAddStates(47, 49); + jjCheckNAddStates(43, 45); break; - case 64: + case 58: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 63; + jjstateSet[jjnewStateCnt++] = 57; break; - case 65: + case 59: if (curChar == 96 && kind > 101) kind = 101; break; - case 66: + case 60: if ((0xfffffffeffffffffL & l) != 0L) - jjCheckNAddStates(50, 52); + jjCheckNAddStates(46, 48); break; - case 67: + case 61: if (curChar == 96) - jjCheckNAddStates(50, 52); + jjCheckNAddStates(46, 48); break; - case 68: + case 62: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 67; + jjstateSet[jjnewStateCnt++] = 61; break; - case 69: + case 63: if (curChar == 96 && kind > 104) kind = 104; break; @@ -1709,35 +1677,27 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 38: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(33, 36); + jjAddStates(31, 33); break; case 42: if ((jjbitVec0[i2] & l2) != 0L) - jjstateSet[jjnewStateCnt++] = 43; - break; - case 45: - if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(37, 40); + jjAddStates(34, 36); break; - case 49: - if ((jjbitVec0[i2] & l2) != 0L) - jjstateSet[jjnewStateCnt++] = 50; - break; - case 53: + case 47: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(41, 43); + jjAddStates(37, 39); break; - case 57: + case 51: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(44, 46); + jjAddStates(40, 42); break; - case 62: + case 56: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(47, 49); + jjAddStates(43, 45); break; - case 66: + case 60: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(50, 52); + jjAddStates(46, 48); break; default : break; } @@ -1750,7 +1710,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 70 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 64 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } @@ -1784,11 +1744,10 @@ static private final int jjMoveStringLiteralDfa1_3(long active0) return 2; } static final int[] jjnextStates = { - 19, 20, 25, 26, 29, 30, 12, 53, 55, 56, 57, 59, 60, 38, 40, 41, - 44, 45, 47, 48, 51, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, - 12, 38, 40, 41, 44, 45, 47, 48, 51, 53, 55, 56, 57, 59, 60, 62, - 64, 65, 66, 68, 69, 62, 64, 65, 66, 68, 69, 10, 11, 23, 24, 27, - 28, 31, 32, + 19, 20, 25, 26, 29, 30, 12, 47, 49, 50, 51, 53, 54, 38, 40, 41, + 42, 44, 45, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, 12, 38, + 40, 41, 42, 44, 45, 47, 49, 50, 51, 53, 54, 56, 58, 59, 60, 62, + 63, 56, 58, 59, 60, 62, 63, 10, 11, 23, 24, 27, 28, 31, 32, }; public static final String[] jjstrLiteralImages = { "", "\74\77", null, "\74\77\75", "\77\76", null, null, null, null, null, null, @@ -1832,8 +1791,8 @@ static final long[] jjtoMore = { 0x80000L, 0x0L, 0x0L, }; static protected SimpleCharStream input_stream; -static private final int[] jjrounds = new int[70]; -static private final int[] jjstateSet = new int[140]; +static private final int[] jjrounds = new int[64]; +static private final int[] jjstateSet = new int[128]; static StringBuffer image; static int jjimageLen; static int lengthOfMatch; @@ -1860,7 +1819,7 @@ static private final void ReInitRounds() { int i; jjround = 0x80000001; - for (i = 70; i-- > 0;) + for (i = 64; i-- > 0;) jjrounds[i] = 0x80000000; } static public void ReInit(SimpleCharStream stream, int lexState) -- 1.7.1