From d01eb943c518c3d89b5fac88e241afb395b3bd9e Mon Sep 17 00:00:00 2001 From: kpouer Date: Wed, 2 Apr 2003 09:06:12 +0000 Subject: [PATCH] Some bugs fixed --- net.sourceforge.phpeclipse/src/test/PHPParser.java | 788 ++++++++++---------- net.sourceforge.phpeclipse/src/test/PHPParser.jj | 71 +- .../src/test/PHPParserConstants.java | 1 - .../src/test/PHPParserTokenManager.java | 23 +- 4 files changed, 454 insertions(+), 429 deletions(-) diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java index 2dc2240..ce9e3fa 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java @@ -1382,7 +1382,13 @@ final StringBuffer buff = new StringBuffer("("); jj_consume_token(-1); throw new ParseException(); } - expr = RelationalExpression(); + try { + expr = RelationalExpression(); + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected after '"+operator.image+"'"; + errorLevel = ERROR; + {if (true) throw e;} + } buff.append(operator.image); buff.append(expr); } @@ -2121,6 +2127,7 @@ final StringBuffer buff = new StringBuffer(); break; case PHPEND: jj_consume_token(PHPEND); + PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT); break; default: jj_la1[68] = jj_gen; @@ -2284,8 +2291,9 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 139: - jj_consume_token(139); + case PHPEND: + jj_consume_token(PHPEND); + PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT); break; default: jj_la1[72] = jj_gen; @@ -2309,8 +2317,9 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 139: - jj_consume_token(139); + case PHPEND: + jj_consume_token(PHPEND); + PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT); break; default: jj_la1[73] = jj_gen; @@ -2334,8 +2343,9 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 139: - jj_consume_token(139); + case PHPEND: + jj_consume_token(PHPEND); + PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT); break; default: jj_la1[74] = jj_gen; @@ -2359,8 +2369,9 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 139: - jj_consume_token(139); + case PHPEND: + jj_consume_token(PHPEND); + PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT); break; default: jj_la1[75] = jj_gen; @@ -2470,8 +2481,9 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 139: - jj_consume_token(139); + case PHPEND: + jj_consume_token(PHPEND); + PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT); break; default: jj_la1[81] = jj_gen; @@ -2506,8 +2518,9 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 139: - jj_consume_token(139); + case PHPEND: + jj_consume_token(PHPEND); + PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT); break; default: jj_la1[83] = jj_gen; @@ -2542,8 +2555,9 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 139: - jj_consume_token(139); + case PHPEND: + jj_consume_token(PHPEND); + PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT); break; default: jj_la1[85] = jj_gen; @@ -2942,14 +2956,7 @@ final StringBuffer buff = new StringBuffer(); } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BREAK: - breakToken = jj_consume_token(BREAK); - try { - jj_consume_token(SEMICOLON); - } catch (ParseException e) { - errorMessage = "';' expected after 'break' keyword"; - errorLevel = ERROR; - {if (true) throw e;} - } + breakToken = BreakStatement(); break; default: jj_la1[96] = jj_gen; @@ -2976,6 +2983,48 @@ final StringBuffer buff = new StringBuffer(); } } + static final public Token BreakStatement() throws ParseException { + final Token token; + token = jj_consume_token(BREAK); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ARRAY: + case PRINT: + case LIST: + case NEW: + case NULL: + case TRUE: + case FALSE: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case AT: + case DOLLAR: + case BANG: + case INCR: + case DECR: + case PLUS: + case MINUS: + case BIT_AND: + case DOLLAR_ID: + Expression(); + break; + default: + jj_la1[97] = jj_gen; + ; + } + try { + jj_consume_token(SEMICOLON); + } catch (ParseException e) { + errorMessage = "';' expected after 'break' keyword"; + errorLevel = ERROR; + {if (true) throw e;} + } + {if (true) return token;} + throw new Error("Missing return statement in function"); + } + static final public int SwitchLabel() throws ParseException { final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3010,7 +3059,7 @@ final StringBuffer buff = new StringBuffer(); {if (true) return token.beginLine;} break; default: - jj_la1[97] = jj_gen; + jj_la1[98] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3092,7 +3141,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[98] = jj_gen; + jj_la1[99] = jj_gen; break label_30; } Statement(); @@ -3104,7 +3153,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[99] = jj_gen; + jj_la1[100] = jj_gen; break label_31; } ElseIfStatementColon(); @@ -3114,7 +3163,7 @@ final StringBuffer buff = new StringBuffer(); ElseStatementColon(); break; default: - jj_la1[100] = jj_gen; + jj_la1[101] = jj_gen; ; } try { @@ -3189,7 +3238,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[101] = jj_gen; + jj_la1[102] = jj_gen; break label_32; } ElseIfStatement(); @@ -3200,12 +3249,12 @@ final StringBuffer buff = new StringBuffer(); Statement(); break; default: - jj_la1[102] = jj_gen; + jj_la1[103] = jj_gen; ; } break; default: - jj_la1[103] = jj_gen; + jj_la1[104] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3260,7 +3309,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[104] = jj_gen; + jj_la1[105] = jj_gen; break label_33; } Statement(); @@ -3315,7 +3364,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[105] = jj_gen; + jj_la1[106] = jj_gen; break label_34; } Statement(); @@ -3385,7 +3434,7 @@ final StringBuffer buff = new StringBuffer(); ; break; default: - jj_la1[106] = jj_gen; + jj_la1[107] = jj_gen; break label_35; } Statement(); @@ -3412,11 +3461,12 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 139: - jj_consume_token(139); + case PHPEND: + jj_consume_token(PHPEND); + PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT); break; default: - jj_la1[107] = jj_gen; + jj_la1[108] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3468,7 +3518,7 @@ final StringBuffer buff = new StringBuffer(); Statement(); break; default: - jj_la1[108] = jj_gen; + jj_la1[109] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3484,11 +3534,12 @@ final StringBuffer buff = new StringBuffer(); case SEMICOLON: jj_consume_token(SEMICOLON); break; - case 139: - jj_consume_token(139); + case PHPEND: + jj_consume_token(PHPEND); + PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT); break; default: - jj_la1[109] = jj_gen; + jj_la1[110] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3521,7 +3572,7 @@ final StringBuffer buff = new StringBuffer(); VariableSuffix(); break; default: - jj_la1[110] = jj_gen; + jj_la1[111] = jj_gen; ; } try { @@ -3544,7 +3595,7 @@ final StringBuffer buff = new StringBuffer(); Expression(); break; default: - jj_la1[111] = jj_gen; + jj_la1[112] = jj_gen; ; } try { @@ -3586,7 +3637,7 @@ final int pos = jj_input_stream.bufpos; ForInit(); break; default: - jj_la1[112] = jj_gen; + jj_la1[113] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -3615,7 +3666,7 @@ final int pos = jj_input_stream.bufpos; Expression(); break; default: - jj_la1[113] = jj_gen; + jj_la1[114] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -3630,7 +3681,7 @@ final int pos = jj_input_stream.bufpos; StatementExpressionList(); break; default: - jj_la1[114] = jj_gen; + jj_la1[115] = jj_gen; ; } jj_consume_token(RPAREN); @@ -3723,7 +3774,7 @@ final int pos = jj_input_stream.bufpos; ; break; default: - jj_la1[115] = jj_gen; + jj_la1[116] = jj_gen; break label_36; } Statement(); @@ -3754,7 +3805,7 @@ final int pos = jj_input_stream.bufpos; } break; default: - jj_la1[116] = jj_gen; + jj_la1[117] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3775,7 +3826,7 @@ final int pos = jj_input_stream.bufpos; StatementExpressionList(); break; default: - jj_la1[117] = jj_gen; + jj_la1[118] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3791,7 +3842,7 @@ final int pos = jj_input_stream.bufpos; ; break; default: - jj_la1[118] = jj_gen; + jj_la1[119] = jj_gen; break label_37; } jj_consume_token(COMMA); @@ -3799,25 +3850,6 @@ final int pos = jj_input_stream.bufpos; } } - static final public void BreakStatement() throws ParseException { - jj_consume_token(BREAK); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case IDENTIFIER: - jj_consume_token(IDENTIFIER); - break; - default: - jj_la1[119] = jj_gen; - ; - } - try { - jj_consume_token(SEMICOLON); - } catch (ParseException e) { - errorMessage = "';' expected after 'break' statement"; - errorLevel = ERROR; - {if (true) throw e;} - } - } - static final public void ContinueStatement() throws ParseException { jj_consume_token(CONTINUE); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3937,32 +3969,15 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_182() { - if (jj_scan_token(FALSE)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3_1() { if (jj_3R_38()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_181() { - 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() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_181()) { - jj_scanpos = xsp; - if (jj_3R_182()) return true; + static final private boolean jj_3R_170() { + if (jj_3R_175()) 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; } @@ -3978,40 +3993,22 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_170() { - if (jj_3R_175()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_108() { - if (jj_scan_token(BIT_OR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_107()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_169() { if (jj_3R_174()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_100() { - if (jj_3R_107()) return true; + static final private boolean jj_3R_168() { + if (jj_scan_token(STRING_LITERAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_108()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } return false; } - static final private boolean jj_3R_168() { - if (jj_scan_token(STRING_LITERAL)) return true; + static final private boolean jj_3R_108() { + if (jj_scan_token(BIT_OR)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_107()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4030,16 +4027,22 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_61() { - if (jj_scan_token(COMMA)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_60()) return true; + static final private boolean jj_3R_100() { + if (jj_3R_107()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_108()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } - static final private boolean jj_3R_103() { - if (jj_scan_token(_ANDL)) return true; + static final private boolean jj_3R_61() { + if (jj_scan_token(COMMA)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_60()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4070,6 +4073,18 @@ final int pos = jj_input_stream.bufpos; return false; } + static final private boolean jj_3R_103() { + if (jj_scan_token(_ANDL)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_63() { + if (jj_3R_41()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_101() { if (jj_scan_token(DOT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -4090,8 +4105,24 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_63() { - if (jj_3R_41()) return true; + static final private boolean jj_3R_60() { + if (jj_3R_68()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_69()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_47() { + if (jj_scan_token(LBRACKET)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_63()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(RBRACKET)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4102,13 +4133,21 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_60() { - if (jj_3R_68()) return true; + static final private boolean jj_3_7() { + if (jj_3R_45()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_45() { + if (jj_3R_60()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; - xsp = jj_scanpos; - if (jj_3R_69()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + while (true) { + xsp = jj_scanpos; + if (jj_3R_61()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } @@ -4131,18 +4170,6 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_47() { - if (jj_scan_token(LBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_63()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(RBRACKET)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_78() { if (jj_3R_95()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -4155,30 +4182,6 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_45() { - if (jj_3R_60()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_61()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } - return false; - } - - static final private boolean jj_3R_75() { - if (jj_scan_token(HOOK)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_41()) 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; - if (jj_3R_66()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_46() { if (jj_scan_token(CLASSACCESS)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -4198,51 +4201,57 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3_7() { - if (jj_3R_45()) return true; + static final private boolean jj_3R_75() { + if (jj_scan_token(HOOK)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_41()) 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; + if (jj_3R_66()) 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(SC_OR)) return true; + static final private boolean jj_3R_189() { + if (jj_3R_38()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_189() { - if (jj_3R_38()) return true; + static final private boolean jj_3R_188() { + if (jj_3R_192()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_79() { + static final private boolean jj_3R_184() { Token xsp; xsp = jj_scanpos; - if (jj_3R_97()) { + if (jj_3R_188()) { jj_scanpos = xsp; - if (jj_3R_98()) return true; + if (jj_3R_189()) 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_78()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_188() { - if (jj_3R_192()) return true; + static final private boolean jj_3R_97() { + if (jj_scan_token(SC_OR)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_184() { + static final private boolean jj_3R_79() { Token xsp; xsp = jj_scanpos; - if (jj_3R_188()) { + if (jj_3R_97()) { jj_scanpos = xsp; - if (jj_3R_189()) return true; + if (jj_3R_98()) 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_78()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4281,6 +4290,12 @@ final int pos = jj_input_stream.bufpos; return false; } + static final private boolean jj_3R_178() { + if (jj_3R_68()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_66() { if (jj_3R_74()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -4291,12 +4306,6 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_178() { - if (jj_3R_68()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_177() { if (jj_scan_token(NEW)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -4317,12 +4326,6 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_92() { - 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_171() { Token xsp; xsp = jj_scanpos; @@ -4345,32 +4348,20 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_91() { - if (jj_scan_token(DOTASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_90() { - if (jj_scan_token(ORASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_89() { - if (jj_scan_token(XORASSIGN)) return true; + static final private boolean jj_3R_92() { + 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_88() { - if (jj_scan_token(ANDASSIGN)) return true; + static final private boolean jj_3R_91() { + if (jj_scan_token(DOTASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_87() { - if (jj_scan_token(RSIGNEDSHIFTASSIGN)) return true; + static final private boolean jj_3R_90() { + if (jj_scan_token(ORASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4383,26 +4374,26 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_86() { - if (jj_scan_token(LSHIFTASSIGN)) return true; + static final private boolean jj_3R_89() { + 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_85() { - if (jj_scan_token(MINUSASSIGN)) return true; + static final private boolean jj_3R_88() { + if (jj_scan_token(ANDASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_84() { - if (jj_scan_token(PLUSASSIGN)) return true; + static final private boolean jj_3R_87() { + if (jj_scan_token(RSIGNEDSHIFTASSIGN)) 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(REMASSIGN)) return true; + static final private boolean jj_3R_86() { + if (jj_scan_token(LSHIFTASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4436,14 +4427,14 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_82() { - if (jj_scan_token(SLASHASSIGN)) return true; + static final private boolean jj_3R_85() { + if (jj_scan_token(MINUSASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_81() { - if (jj_scan_token(STARASSIGN)) return true; + static final private boolean jj_3R_84() { + if (jj_scan_token(PLUSASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4460,6 +4451,30 @@ final int pos = jj_input_stream.bufpos; return false; } + static final private boolean jj_3R_83() { + if (jj_scan_token(REMASSIGN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_82() { + if (jj_scan_token(SLASHASSIGN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_187() { + if (jj_3R_184()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_81() { + if (jj_scan_token(STARASSIGN)) 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(ASSIGN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -4510,12 +4525,6 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_187() { - if (jj_3R_184()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3_4() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -4554,6 +4563,14 @@ final int pos = jj_input_stream.bufpos; return false; } + static final private boolean jj_3R_106() { + if (jj_scan_token(ASSIGN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_41()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_59() { if (jj_3R_66()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -4564,16 +4581,18 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_58() { - if (jj_3R_65()) return true; + static final private boolean jj_3R_162() { + if (jj_3R_160()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_173()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_106() { - if (jj_scan_token(ASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_41()) return true; + static final private boolean jj_3R_58() { + if (jj_3R_65()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4598,16 +4617,6 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_162() { - if (jj_3R_160()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_173()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_161() { if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -4620,18 +4629,6 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_56() { - if (jj_scan_token(OBJECT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - static final private boolean jj_3R_55() { - if (jj_scan_token(INTEGER)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_105() { if (jj_scan_token(COMMA)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -4640,8 +4637,8 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_54() { - if (jj_scan_token(INT)) return true; + static final private boolean jj_3R_56() { + if (jj_scan_token(OBJECT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4652,14 +4649,14 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_53() { - if (jj_scan_token(FLOAT)) return true; + static final private boolean jj_3R_55() { + if (jj_scan_token(INTEGER)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_52() { - if (jj_scan_token(DOUBLE)) return true; + static final private boolean jj_3R_54() { + if (jj_scan_token(INT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4674,8 +4671,8 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_51() { - if (jj_scan_token(REAL)) return true; + static final private boolean jj_3R_53() { + if (jj_scan_token(FLOAT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4690,8 +4687,8 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_50() { - if (jj_scan_token(BOOLEAN)) return true; + static final private boolean jj_3R_52() { + if (jj_scan_token(DOUBLE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4722,8 +4719,8 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_49() { - if (jj_scan_token(BOOL)) return true; + static final private boolean jj_3R_51() { + if (jj_scan_token(REAL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4734,46 +4731,20 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_40() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_48()) { - jj_scanpos = xsp; - if (jj_3R_49()) { - jj_scanpos = xsp; - if (jj_3R_50()) { - jj_scanpos = xsp; - if (jj_3R_51()) { - jj_scanpos = xsp; - if (jj_3R_52()) { - jj_scanpos = xsp; - if (jj_3R_53()) { - jj_scanpos = xsp; - if (jj_3R_54()) { - jj_scanpos = xsp; - if (jj_3R_55()) { - jj_scanpos = xsp; - if (jj_3R_56()) return true; + static final private boolean jj_3R_50() { + if (jj_scan_token(BOOLEAN)) 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; - } else 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; - } else 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_48() { - if (jj_scan_token(STRING)) return true; + static final private boolean jj_3R_156() { + if (jj_3R_161()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } - static final private boolean jj_3R_156() { - if (jj_3R_161()) return true; + static final private boolean jj_3R_49() { + if (jj_scan_token(BOOL)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; } @@ -4806,6 +4777,44 @@ final int pos = jj_input_stream.bufpos; return false; } + static final private boolean jj_3R_40() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_48()) { + jj_scanpos = xsp; + if (jj_3R_49()) { + jj_scanpos = xsp; + if (jj_3R_50()) { + jj_scanpos = xsp; + if (jj_3R_51()) { + jj_scanpos = xsp; + if (jj_3R_52()) { + jj_scanpos = xsp; + if (jj_3R_53()) { + jj_scanpos = xsp; + if (jj_3R_54()) { + jj_scanpos = xsp; + if (jj_3R_55()) { + jj_scanpos = xsp; + if (jj_3R_56()) 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; + } else 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; + } else 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_48() { + if (jj_scan_token(STRING)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_64() { if (jj_scan_token(PRINT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -4997,14 +5006,6 @@ final int pos = jj_input_stream.bufpos; 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; - if (jj_3R_39()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_128() { if (jj_scan_token(LE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5030,30 +5031,44 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_193() { + static final private boolean jj_3_2() { + if (jj_scan_token(COMMA)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; if (jj_3R_39()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_124() { + if (jj_3R_130()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_2()) { jj_scanpos = xsp; break; } + if (jj_3R_131()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_124() { - if (jj_3R_130()) return true; + static final private boolean jj_3R_193() { + if (jj_3R_39()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_131()) { jj_scanpos = xsp; break; } + if (jj_3_2()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } + static final private boolean jj_3R_127() { + if (jj_scan_token(GT)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_185() { if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5066,12 +5081,6 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_127() { - if (jj_scan_token(GT)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_132() { if (jj_scan_token(LSHIFT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5094,14 +5103,6 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_195() { - if (jj_scan_token(ARRAYASSIGN)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_41()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_117() { if (jj_3R_124()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5114,6 +5115,20 @@ final int pos = jj_input_stream.bufpos; return false; } + static final private boolean jj_3R_43() { + if (jj_scan_token(PHPEND)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + static final private boolean jj_3R_195() { + if (jj_scan_token(ARRAYASSIGN)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_41()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_39() { if (jj_3R_41()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5124,12 +5139,6 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_43() { - if (jj_scan_token(PHPEND)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_126() { if (jj_scan_token(LT)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5179,12 +5188,6 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_110() { - if (jj_3R_62()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3_5() { if (jj_3R_41()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5198,6 +5201,12 @@ final int pos = jj_input_stream.bufpos; return false; } + static final private boolean jj_3R_110() { + if (jj_3R_62()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_109() { if (jj_scan_token(LBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5238,6 +5247,14 @@ final int pos = jj_input_stream.bufpos; return false; } + static final private boolean jj_3R_197() { + if (jj_scan_token(COMMA)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_41()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_116() { Token xsp; xsp = jj_scanpos; @@ -5270,23 +5287,27 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_113() { - if (jj_3R_115()) return true; + static final private boolean jj_3R_196() { + if (jj_3R_41()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_116()) { jj_scanpos = xsp; break; } + if (jj_3R_197()) { jj_scanpos = xsp; break; } if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; } return false; } - static final private boolean jj_3R_197() { - if (jj_scan_token(COMMA)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_41()) return true; + static final private boolean jj_3R_113() { + if (jj_3R_115()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_116()) { jj_scanpos = xsp; break; } + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } return false; } @@ -5298,18 +5319,6 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_196() { - if (jj_3R_41()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_197()) { jj_scanpos = xsp; break; } - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } - return false; - } - static final private boolean jj_3R_99() { if (jj_scan_token(LBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5330,6 +5339,12 @@ final int pos = jj_input_stream.bufpos; return false; } + static final private boolean jj_3R_194() { + if (jj_3R_196()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_70() { if (jj_scan_token(LBRACE)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5365,12 +5380,6 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_194() { - if (jj_3R_196()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_111() { if (jj_3R_113()) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5383,14 +5392,6 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_94() { - if (jj_scan_token(DOLLAR)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_62()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - static final private boolean jj_3R_192() { if (jj_scan_token(LPAREN)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5403,6 +5404,20 @@ final int pos = jj_input_stream.bufpos; return false; } + static final private boolean jj_3R_94() { + if (jj_scan_token(DOLLAR)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_62()) 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(NULL)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + static final private boolean jj_3R_93() { if (jj_scan_token(DOLLAR_ID)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; @@ -5432,12 +5447,29 @@ final int pos = jj_input_stream.bufpos; return false; } - static final private boolean jj_3R_175() { - if (jj_scan_token(NULL)) return true; + static final private boolean jj_3R_182() { + 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_181() { + 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() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_181()) { + jj_scanpos = xsp; + if (jj_3R_182()) 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 private boolean jj_initialized_once = false; static public PHPParserTokenManager token_source; static SimpleCharStream jj_input_stream; @@ -5462,19 +5494,19 @@ final int pos = jj_input_stream.bufpos; jj_la1_4(); } private static void jj_la1_0() { - jj_la1_0 = new int[] {0xfcb0001e,0x0,0x6,0x6,0xfcb0001e,0xfcb00000,0x0,0x600000,0x600000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x14000000,0x0,0x0,0x0,0x0,0x0,0x0,0x14000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x4000000,0x0,0x4000000,0x0,0x0,0x0,0x0,0x4000000,0x0,0x0,0x0,0x14000000,0x0,0x0,0x0,0x14000000,0x0,0x10,0x0,0xe4800000,0xfc800000,0x0,0x0,0x0,0x0,0xc0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfcb00000,0xfcb00000,0xf4b00000,0x0,0x0,0x0,0x0,0x4000000,0x0,0xf4b00000,0x8000000,0x0,0xfc800000,0x1000000,0x2000000,0x1000000,0x2000000,0xfc800000,0xfc800000,0xfc800000,0xfc800000,0x0,0xfc800000,0x0,0x0,0x0,0x4000000,0x14000000,0x4000000,0xfc800000,0xfc800000,0x4000000,0x0,0x0,0x0,0x14000000,}; + jj_la1_0 = new int[] {0xfcb0001e,0x0,0x6,0x6,0xfcb0001e,0xfcb00000,0x0,0x600000,0x600000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x14000000,0x0,0x0,0x0,0x0,0x0,0x0,0x14000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x4000000,0x0,0x4000000,0x0,0x0,0x0,0x0,0x4000000,0x0,0x0,0x0,0x14000000,0x0,0x0,0x0,0x14000000,0x0,0x10,0x0,0xe4800000,0xfc800000,0x10,0x10,0x10,0x10,0xc0000000,0x0,0x0,0x0,0x0,0x10,0x0,0x10,0x0,0x10,0xfcb00000,0xfcb00000,0xf4b00000,0x0,0x0,0x0,0x0,0x4000000,0x0,0xf4b00000,0x8000000,0x14000000,0x0,0xfc800000,0x1000000,0x2000000,0x1000000,0x2000000,0xfc800000,0xfc800000,0xfc800000,0xfc800000,0x10,0xfc800000,0x10,0x0,0x0,0x4000000,0x14000000,0x4000000,0xfc800000,0xfc800000,0x4000000,0x0,0x0,0x14000000,}; } private static void jj_la1_1() { - jj_la1_1 = new int[] {0x11d7548f,0x0,0x0,0x0,0x11d7548f,0x11d7548f,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc20000,0x40,0xc30080,0x0,0x0,0x0,0x0,0xc0000000,0x0,0xc30080,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc30000,0x0,0xc30000,0x0,0xc30000,0x0,0x0,0x10,0x10,0x10000,0x10000,0x0,0x10,0xc30080,0x10,0xc20000,0xc00000,0xc30080,0x0,0x0,0x0,0x1115540f,0x11d7548f,0x0,0x0,0x0,0x0,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x11d7548f,0x11d7548f,0x11d7548f,0x0,0x0,0x0,0x0,0x10000,0x900,0x11d7548f,0x0,0x900,0x11d7548f,0x0,0x0,0x0,0x0,0x11d7548f,0x11d7548f,0x11d7548f,0x11d7548f,0x0,0x11d7548f,0x0,0x10,0x40,0x10000,0xc30080,0x10000,0x11d7548f,0x11d7548f,0x10000,0x0,0x0,0x0,0xc30080,}; + jj_la1_1 = new int[] {0x11d7548f,0x0,0x0,0x0,0x11d7548f,0x11d7548f,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc20000,0x40,0xc30080,0x0,0x0,0x0,0x0,0xc0000000,0x0,0xc30080,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc30000,0x0,0xc30000,0x0,0xc30000,0x0,0x0,0x10,0x10,0x10000,0x10000,0x0,0x10,0xc30080,0x10,0xc20000,0xc00000,0xc30080,0x0,0x0,0x0,0x1115540f,0x11d7548f,0x0,0x0,0x0,0x0,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x11d7548f,0x11d7548f,0x11d7548f,0x0,0x0,0x0,0x0,0x10000,0x900,0x11d7548f,0x0,0xc30080,0x900,0x11d7548f,0x0,0x0,0x0,0x0,0x11d7548f,0x11d7548f,0x11d7548f,0x11d7548f,0x0,0x11d7548f,0x0,0x10,0x40,0x10000,0xc30080,0x10000,0x11d7548f,0x11d7548f,0x10000,0x0,0x0,0xc30080,}; } private static void jj_la1_2() { - jj_la1_2 = new int[] {0x2288a200,0x20000000,0x0,0x0,0x2288a200,0x2288a200,0x0,0x0,0x0,0x40000000,0x0,0x2000000,0x0,0x2000000,0x2080000,0x2080000,0x2200,0x2200,0x8a200,0x0,0x88a200,0x0,0x40000000,0x0,0x0,0x7f,0x0,0x88a200,0x0,0x0,0x80,0x80,0x100,0x100,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x88a200,0x0,0x88a200,0x0,0x88a200,0x0,0x0,0x8800000,0x8800000,0x80000,0x80000,0x80000,0x8800000,0x88a200,0x8000000,0xa200,0x0,0x88a200,0x40000000,0x20000000,0x0,0x22080000,0x2288a200,0x20000000,0x20000000,0x20000000,0x20000000,0x0,0x0,0x40000000,0x0,0x40000000,0x20000000,0x40000000,0x20000000,0x40000000,0x20000000,0x2288a200,0x2288a200,0x2288a200,0x40000000,0x0,0x0,0x0,0x80000,0x0,0x2288a200,0x0,0x0,0x2288a200,0x0,0x0,0x0,0x0,0x2288a200,0x2288a200,0x2288a200,0x2288a200,0x20000000,0x2288a200,0x20000000,0x8000000,0x0,0x80000,0x88a200,0x80000,0x2288a200,0x2288a200,0x80000,0x40000000,0x80000,0x80000,0x88a200,}; + jj_la1_2 = new int[] {0x2288a200,0x20000000,0x0,0x0,0x2288a200,0x2288a200,0x0,0x0,0x0,0x40000000,0x0,0x2000000,0x0,0x2000000,0x2080000,0x2080000,0x2200,0x2200,0x8a200,0x0,0x88a200,0x0,0x40000000,0x0,0x0,0x7f,0x0,0x88a200,0x0,0x0,0x80,0x80,0x100,0x100,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x88a200,0x0,0x88a200,0x0,0x88a200,0x0,0x0,0x8800000,0x8800000,0x80000,0x80000,0x80000,0x8800000,0x88a200,0x8000000,0xa200,0x0,0x88a200,0x40000000,0x20000000,0x0,0x22080000,0x2288a200,0x20000000,0x20000000,0x20000000,0x20000000,0x0,0x0,0x40000000,0x0,0x40000000,0x20000000,0x40000000,0x20000000,0x40000000,0x20000000,0x2288a200,0x2288a200,0x2288a200,0x40000000,0x0,0x0,0x0,0x80000,0x0,0x2288a200,0x0,0x88a200,0x0,0x2288a200,0x0,0x0,0x0,0x0,0x2288a200,0x2288a200,0x2288a200,0x2288a200,0x20000000,0x2288a200,0x20000000,0x8000000,0x0,0x80000,0x88a200,0x80000,0x2288a200,0x2288a200,0x80000,0x40000000,0x80000,0x88a200,}; } private static void jj_la1_3() { - jj_la1_3 = new int[] {0x78700000,0x0,0x0,0x0,0x78700000,0x78700000,0x0,0x0,0x0,0x0,0x200,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x60000000,0x0,0x78700000,0x0,0x0,0x200000,0x0,0x0,0xffe00,0x78700000,0xffe00,0x800000,0x2000000,0x2000000,0x4000000,0x4000000,0x0,0x0,0x0,0x0,0x1e4,0x1e4,0x1b,0x1b,0x0,0x0,0x60000000,0x60000000,0x80000000,0x80000000,0x100000,0x78700000,0x60000000,0x78600000,0x400000,0x200000,0x18000000,0x18000000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x78700000,0x0,0x0,0x0,0x78700000,0x0,0x0,0x100000,0x18300000,0x78700000,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x78700000,0x78700000,0x78700000,0x0,0x200,0x180ffe00,0x180ffe00,0x18200000,0x0,0x78700000,0x0,0x0,0x78700000,0x0,0x0,0x0,0x0,0x79700000,0x78700000,0x78700000,0x78700000,0x0,0x79700000,0x0,0x0,0x0,0x18200000,0x78700000,0x18200000,0x78700000,0x79700000,0x18200000,0x0,0x0,0x0,0x78700000,}; + jj_la1_3 = new int[] {0x78700000,0x0,0x0,0x0,0x78700000,0x78700000,0x0,0x0,0x0,0x0,0x200,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x60000000,0x0,0x78700000,0x0,0x0,0x200000,0x0,0x0,0xffe00,0x78700000,0xffe00,0x800000,0x2000000,0x2000000,0x4000000,0x4000000,0x0,0x0,0x0,0x0,0x1e4,0x1e4,0x1b,0x1b,0x0,0x0,0x60000000,0x60000000,0x80000000,0x80000000,0x100000,0x78700000,0x60000000,0x78600000,0x400000,0x200000,0x18000000,0x18000000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x78700000,0x0,0x0,0x0,0x78700000,0x0,0x0,0x100000,0x18300000,0x78700000,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x78700000,0x78700000,0x78700000,0x0,0x200,0x180ffe00,0x180ffe00,0x18200000,0x0,0x78700000,0x0,0x78700000,0x0,0x78700000,0x0,0x0,0x0,0x0,0x79700000,0x78700000,0x78700000,0x78700000,0x0,0x79700000,0x0,0x0,0x0,0x18200000,0x78700000,0x18200000,0x78700000,0x79700000,0x18200000,0x0,0x0,0x78700000,}; } private static void jj_la1_4() { - jj_la1_4 = new int[] {0x402,0x0,0x0,0x0,0x402,0x402,0x0,0x0,0x0,0x0,0x0,0x0,0x400,0x0,0x400,0x400,0x0,0x0,0x0,0x0,0x402,0x2,0x0,0x402,0x2,0x0,0x300,0x402,0x300,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x8,0x2,0x0,0x0,0x0,0x0,0xe0,0xe0,0x0,0x0,0x11,0x11,0x0,0x402,0x0,0x400,0x0,0x400,0x0,0x0,0x0,0x0,0x400,0x400,0x400,0x0,0x402,0x0,0x0,0x0,0x402,0x0,0x0,0x0,0x400,0x402,0x800,0x800,0x800,0x800,0x0,0x400,0x0,0x0,0x0,0x800,0x0,0x800,0x0,0x800,0x402,0x402,0x402,0x0,0x0,0x300,0x300,0x400,0x0,0x402,0x0,0x0,0x402,0x0,0x0,0x0,0x0,0x402,0x402,0x402,0x402,0x800,0x402,0x800,0x0,0x0,0x400,0x402,0x400,0x402,0x402,0x400,0x0,0x0,0x0,0x402,}; + jj_la1_4 = new int[] {0x402,0x0,0x0,0x0,0x402,0x402,0x0,0x0,0x0,0x0,0x0,0x0,0x400,0x0,0x400,0x400,0x0,0x0,0x0,0x0,0x402,0x2,0x0,0x402,0x2,0x0,0x300,0x402,0x300,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x8,0x2,0x0,0x0,0x0,0x0,0xe0,0xe0,0x0,0x0,0x11,0x11,0x0,0x402,0x0,0x400,0x0,0x400,0x0,0x0,0x0,0x0,0x400,0x400,0x400,0x0,0x402,0x0,0x0,0x0,0x402,0x0,0x0,0x0,0x400,0x402,0x0,0x0,0x0,0x0,0x0,0x400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x402,0x402,0x402,0x0,0x0,0x300,0x300,0x400,0x0,0x402,0x0,0x402,0x0,0x402,0x0,0x0,0x0,0x0,0x402,0x402,0x402,0x402,0x0,0x402,0x0,0x0,0x0,0x400,0x402,0x400,0x402,0x402,0x400,0x0,0x0,0x402,}; } static final private JJCalls[] jj_2_rtns = new JJCalls[7]; static private boolean jj_rescan = false; @@ -5662,8 +5694,8 @@ final int pos = jj_input_stream.bufpos; static public ParseException generateParseException() { jj_expentries.removeAllElements(); - boolean[] la1tokens = new boolean[140]; - for (int i = 0; i < 140; i++) { + boolean[] la1tokens = new boolean[139]; + for (int i = 0; i < 139; i++) { la1tokens[i] = false; } if (jj_kind >= 0) { @@ -5691,7 +5723,7 @@ final int pos = jj_input_stream.bufpos; } } } - for (int i = 0; i < 140; i++) { + for (int i = 0; i < 139; i++) { if (la1tokens[i]) { jj_expentry = new int[1]; jj_expentry[0] = i; diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.jj b/net.sourceforge.phpeclipse/src/test/PHPParser.jj index e4026ea..b49b15a 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj @@ -267,9 +267,9 @@ PARSER_END(PHPParser) TOKEN : { - : PHPPARSING + : PHPPARSING | : PHPPARSING -| | ) + ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) } catch (ParseException e) { errorMessage = "';' expected"; errorLevel = ERROR; @@ -1661,7 +1667,7 @@ void IncludeStatement() : } } try { - ( | "?>") + ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) } catch (ParseException e) { errorMessage = "';' expected"; errorLevel = ERROR; @@ -1676,7 +1682,7 @@ void IncludeStatement() : } } try { - ( | "?>") + ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) } catch (ParseException e) { errorMessage = "';' expected"; errorLevel = ERROR; @@ -1691,7 +1697,7 @@ void IncludeStatement() : } } try { - ( | "?>") + ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) } catch (ParseException e) { errorMessage = "';' expected"; errorLevel = ERROR; @@ -1706,7 +1712,7 @@ void IncludeStatement() : } } try { - ( | "?>") + ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) } catch (ParseException e) { errorMessage = "';' expected"; errorLevel = ERROR; @@ -1773,7 +1779,7 @@ void EchoStatement() : { Expression() ( Expression())* try { - ( | "?>") + ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) } catch (ParseException e) { errorMessage = "';' expected after 'echo' statement"; errorLevel = ERROR; @@ -1786,7 +1792,7 @@ void GlobalStatement() : { VariableDeclaratorId() ( VariableDeclaratorId())* try { - ( | "?>") + ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) } catch (ParseException e) { errorMessage = "';' expected"; errorLevel = ERROR; @@ -1799,7 +1805,7 @@ void StaticStatement() : { VariableDeclarator() ( VariableDeclarator())* try { - ( | "?>") + ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) } catch (ParseException e) { errorMessage = "';' expected"; errorLevel = ERROR; @@ -1923,15 +1929,7 @@ void SwitchStatement() : ( line = SwitchLabel() ( BlockStatementNoBreak() )* - [ breakToken = - try { - - } catch (ParseException e) { - errorMessage = "';' expected after 'break' keyword"; - errorLevel = ERROR; - throw e; - } - ] + [ breakToken = BreakStatement() ] { try { if (breakToken == null) { @@ -1955,6 +1953,22 @@ void SwitchStatement() : } } +Token BreakStatement() : +{ + final Token token; +} +{ + token = [ Expression() ] + try { + + } catch (ParseException e) { + errorMessage = "';' expected after 'break' keyword"; + errorLevel = ERROR; + throw e; + } + {return token;} +} + int SwitchLabel() : { final Token token; @@ -2100,7 +2114,7 @@ void WhileStatement0(final int start, final int end) : throw e; } try { - ( | "?>") + ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) } catch (ParseException e) { errorMessage = "';' expected after 'endwhile' keyword"; errorLevel = ERROR; @@ -2115,7 +2129,7 @@ void DoStatement() : { Statement() Condition("while") try { - ( | "?>") + ( | {PHPParserTokenManager.SwitchTo(PHPParserTokenManager.DEFAULT);}) } catch (ParseException e) { errorMessage = "';' expected"; errorLevel = ERROR; @@ -2237,19 +2251,6 @@ void StatementExpressionList() : StatementExpression() ( StatementExpression() )* } -void BreakStatement() : -{} -{ - [ ] - try { - - } catch (ParseException e) { - errorMessage = "';' expected after 'break' statement"; - errorLevel = ERROR; - throw e; - } -} - void ContinueStatement() : {} { diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java b/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java index eeb62cf..d1008b0 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserConstants.java @@ -278,7 +278,6 @@ public interface PHPParserConstants { "\"<<=\"", "\">>=\"", "", - "\"?>\"", }; } diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java index 9ebeabe..063404c 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java @@ -32,14 +32,12 @@ static private final int jjMoveStringLiteralDfa0_0() switch(curChar) { case 60: - return jjMoveStringLiteralDfa1_0(0xeL, 0x0L); - case 63: - return jjMoveStringLiteralDfa1_0(0x0L, 0x800L); + return jjMoveStringLiteralDfa1_0(0xeL); default : return 1; } } -static private final int jjMoveStringLiteralDfa1_0(long active0, long active2) +static private final int jjMoveStringLiteralDfa1_0(long active0) { try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { @@ -47,25 +45,20 @@ static private final int jjMoveStringLiteralDfa1_0(long active0, long active2) } switch(curChar) { - case 62: - if ((active2 & 0x800L) != 0L) - return jjStopAtPos(1, 139); - break; case 63: if ((active0 & 0x2L) != 0L) { jjmatchedKind = 1; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_0(active0, 0xcL, active2, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0xcL); default : return 2; } - return 2; } -static private final int jjMoveStringLiteralDfa2_0(long old0, long active0, long old2, long active2) +static private final int jjMoveStringLiteralDfa2_0(long old0, long active0) { - if (((active0 &= old0) | (active2 &= old2)) == 0L) + if (((active0 &= old0)) == 0L) return 2; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { @@ -1755,7 +1748,7 @@ null, null, null, null, null, null, null, null, null, "\50", "\51", "\173", "\17 "\57\75", "\46\75", "\174\75", "\136\75", "\56\75", "\45\75", "\176\75", "\100", "\44", "\41", "\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", "\74\74\75", -"\76\76\75", null, "\77\76", }; +"\76\76\75", null, }; public static final String[] lexStateNames = { "DEFAULT", "PHPPARSING", @@ -1769,10 +1762,10 @@ public static final int[] jjnewLexState = { -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, }; static final long[] jjtoToken = { - 0xfffffffffff0001fL, 0xffffffffff8fa3ffL, 0xfffL, + 0xfffffffffff0001fL, 0xffffffffff8fa3ffL, 0x7ffL, }; static final long[] jjtoSkip = { 0x7ffe0L, 0x0L, 0x0L, -- 1.7.1