From: <kp...@us...> - 2011-10-30 19:43:41
|
Revision: 20177 http://jedit.svn.sourceforge.net/jedit/?rev=20177&view=rev Author: kpouer Date: 2011-10-30 19:43:34 +0000 (Sun, 30 Oct 2011) Log Message: ----------- Fixed use namespace syntax when declaring multiple namespaces (#3428773) Modified Paths: -------------- plugins/PHPParser/trunk/PHPParser.props plugins/PHPParser/trunk/docs/PHPParser.html plugins/PHPParser/trunk/src/gatchan/phpparser/PHPParserPlugin.java plugins/PHPParser/trunk/src/gatchan/phpparser/parser/PHPParser.java plugins/PHPParser/trunk/src/gatchan/phpparser/parser/PHPParser.jj plugins/PHPParser/trunk/src/net/sourceforge/phpdt/internal/compiler/ast/UseNamespace.java Modified: plugins/PHPParser/trunk/PHPParser.props =================================================================== --- plugins/PHPParser/trunk/PHPParser.props 2011-10-30 19:30:37 UTC (rev 20176) +++ plugins/PHPParser/trunk/PHPParser.props 2011-10-30 19:43:34 UTC (rev 20177) @@ -4,7 +4,7 @@ plugin.gatchan.phpparser.PHPParserPlugin.activate=defer plugin.gatchan.phpparser.PHPParserPlugin.name=PHPParserPlugin plugin.gatchan.phpparser.PHPParserPlugin.author=Matthieu Casanova -plugin.gatchan.phpparser.PHPParserPlugin.version=1.4.1 +plugin.gatchan.phpparser.PHPParserPlugin.version=1.4.2 plugin.gatchan.phpparser.PHPParserPlugin.docs=docs/PHPParser.html plugin.gatchan.phpparser.PHPParserPlugin.usePluginHome=true plugin.gatchan.phpparser.PHPParserPlugin.description=PHPParser is a plugin that parses php buffer and helps you developing php Modified: plugins/PHPParser/trunk/docs/PHPParser.html =================================================================== --- plugins/PHPParser/trunk/docs/PHPParser.html 2011-10-30 19:30:37 UTC (rev 20176) +++ plugins/PHPParser/trunk/docs/PHPParser.html 2011-10-30 19:43:34 UTC (rev 20177) @@ -12,7 +12,7 @@ <tr> <td valign="top" style="font-weight:bold;font-size:x-large">PHP Parser</td> <td align="right" valign="top" style="font-size:small"> - <span style="font-weight:bold">Version 1.4.1 (Oct 18, 2011)</span><br> + <span style="font-weight:bold">Version 1.4.2 (Oct 30, 2011)</span><br> Matthieu Casanova <cho...@gm...> </td> </tr> @@ -97,6 +97,13 @@ <h2>History</h2> <ul> + <li>1.4.2</li> + <ul> + <li>Bugs fixed</li> + <ul> + <li>Fixed use namespace syntax when declaring multiple namespaces (#3428773)</li> + </ul> + </ul> <li>1.4.1</li> <ul> <li>Bugs fixed</li> Modified: plugins/PHPParser/trunk/src/gatchan/phpparser/PHPParserPlugin.java =================================================================== --- plugins/PHPParser/trunk/src/gatchan/phpparser/PHPParserPlugin.java 2011-10-30 19:30:37 UTC (rev 20176) +++ plugins/PHPParser/trunk/src/gatchan/phpparser/PHPParserPlugin.java 2011-10-30 19:43:34 UTC (rev 20177) @@ -20,6 +20,9 @@ */ package gatchan.phpparser; +import java.util.ArrayList; +import java.util.Collection; + import common.gui.itemfinder.ItemFinderWindow; import gatchan.phpparser.project.ProjectManager; import gatchan.phpparser.project.itemfinder.PHPItem; @@ -47,6 +50,12 @@ @Override public void start() { + Collection<String> tata = new ArrayList<String>(); + tata.add("aa"); + tata.add("bb"); + tata.add("cc"); + tata.add("dd"); + System.out.println(TextUtilities.join(tata, ", ")); projectManager = ProjectManager.getInstance(); itemFinder = new PHPItemFinder(); itemFinderWindow = new ItemFinderWindow<PHPItem>(itemFinder); Modified: plugins/PHPParser/trunk/src/gatchan/phpparser/parser/PHPParser.java =================================================================== --- plugins/PHPParser/trunk/src/gatchan/phpparser/parser/PHPParser.java 2011-10-30 19:30:37 UTC (rev 20176) +++ plugins/PHPParser/trunk/src/gatchan/phpparser/parser/PHPParser.java 2011-10-30 19:43:34 UTC (rev 20177) @@ -1181,7 +1181,7 @@ int sourceEnd; int endLine; int endColumn; - String namespaceName; + List<ConstantIdentifier> list = new ArrayList<ConstantIdentifier>(); //{{{ <USE> useToken = jj_consume_token(USE); sourceEnd = useToken.sourceEnd; @@ -1189,7 +1189,7 @@ endColumn = useToken.endColumn; try { namespaceNameToken = namespaceIdentifier(); - namespaceName = namespaceNameToken.image; + list.add(new ConstantIdentifier(namespaceNameToken)); sourceEnd = namespaceNameToken.sourceEnd; endLine = namespaceNameToken.endLine; endColumn = namespaceNameToken.endColumn; @@ -1199,6 +1199,26 @@ namespaceName = SYNTAX_ERROR_CHAR; } } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case COMMA: + jj_consume_token(COMMA); + try { + namespaceNameToken = namespaceIdentifier(); + list.add(new ConstantIdentifier(namespaceNameToken)); + sourceEnd = namespaceNameToken.sourceEnd; + endLine = namespaceNameToken.endLine; + endColumn = namespaceNameToken.endColumn; + } catch (ParseException e) { + fireParseError("namespace expected",";",e.currentToken.next); + { + namespaceName = SYNTAX_ERROR_CHAR; + } + } + break; + default: + jj_la1[13] = jj_gen; + ; + } try { semicolon = jj_consume_token(SEMICOLON); sourceEnd = semicolon.sourceEnd; @@ -1207,7 +1227,7 @@ } catch (ParseException e) { fireParseError("; expected",";",e.currentToken.next); } - {if (true) return new UseNamespace(namespaceName, + {if (true) return new UseNamespace(list, useToken.sourceStart, sourceEnd, useToken.beginLine, @@ -1251,7 +1271,7 @@ ; break; default: - jj_la1[13] = jj_gen; + jj_la1[14] = jj_gen; break label_5; } jj_consume_token(COMMA); @@ -1260,7 +1280,7 @@ } break; default: - jj_la1[14] = jj_gen; + jj_la1[15] = jj_gen; ; } interfaceDeclaration = new InterfaceDeclaration(namespace, @@ -1290,7 +1310,7 @@ ; break; default: - jj_la1[15] = jj_gen; + jj_la1[16] = jj_gen; break label_6; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1315,7 +1335,7 @@ } break; default: - jj_la1[16] = jj_gen; + jj_la1[17] = jj_gen; ; } break; @@ -1333,18 +1353,18 @@ } break; default: - jj_la1[17] = jj_gen; + jj_la1[18] = jj_gen; ; } break; default: - jj_la1[18] = jj_gen; + jj_la1[19] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[19] = jj_gen; + jj_la1[20] = jj_gen; ; } methodDeclaration = interfaceMethodDeclaration(modifiers); @@ -1358,7 +1378,7 @@ } break; default: - jj_la1[20] = jj_gen; + jj_la1[21] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1395,7 +1415,7 @@ ; break; default: - jj_la1[21] = jj_gen; + jj_la1[22] = jj_gen; break label_7; } token = jj_consume_token(COMMA); @@ -1535,7 +1555,7 @@ finalToken = jj_consume_token(FINAL); break; default: - jj_la1[22] = jj_gen; + jj_la1[23] = jj_gen; ; } classHeader = classHeader(finalToken); @@ -1562,7 +1582,7 @@ {if (true) return classDeclaration;} break; default: - jj_la1[23] = jj_gen; + jj_la1[24] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1601,7 +1621,7 @@ superclassName = jj_consume_token(OBJECT); break; default: - jj_la1[24] = jj_gen; + jj_la1[25] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1613,7 +1633,7 @@ } break; default: - jj_la1[25] = jj_gen; + jj_la1[26] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1634,7 +1654,7 @@ ; break; default: - jj_la1[26] = jj_gen; + jj_la1[27] = jj_gen; break label_8; } jj_consume_token(COMMA); @@ -1647,7 +1667,7 @@ } break; default: - jj_la1[27] = jj_gen; + jj_la1[28] = jj_gen; ; } int end,endLine,endColumn; @@ -1726,7 +1746,7 @@ ; break; default: - jj_la1[28] = jj_gen; + jj_la1[29] = jj_gen; break label_9; } classBodyDeclaration(classDeclaration); @@ -1784,7 +1804,7 @@ ; break; default: - jj_la1[29] = jj_gen; + jj_la1[30] = jj_gen; break label_10; } abstractClassBodyDeclaration(classDeclaration); @@ -1851,7 +1871,7 @@ ; break; default: - jj_la1[30] = jj_gen; + jj_la1[31] = jj_gen; break label_11; } modifier = commonModifiers(); @@ -1875,7 +1895,7 @@ ; break; default: - jj_la1[31] = jj_gen; + jj_la1[32] = jj_gen; break label_12; } modifier = methodModifiers(); @@ -1890,7 +1910,7 @@ ; break; default: - jj_la1[32] = jj_gen; + jj_la1[33] = jj_gen; break label_13; } modifier = commonModifiers(); @@ -1902,7 +1922,7 @@ classDeclaration.addMethod(method); break; default: - jj_la1[33] = jj_gen; + jj_la1[34] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1919,7 +1939,7 @@ } break; default: - jj_la1[34] = jj_gen; + jj_la1[35] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1947,7 +1967,7 @@ token = jj_consume_token(PRIVATE); break; default: - jj_la1[35] = jj_gen; + jj_la1[36] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1968,7 +1988,7 @@ token = jj_consume_token(ABSTRACT); break; default: - jj_la1[36] = jj_gen; + jj_la1[37] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2015,7 +2035,7 @@ ; break; default: - jj_la1[37] = jj_gen; + jj_la1[38] = jj_gen; break label_14; } modifier = commonModifiers(); @@ -2039,7 +2059,7 @@ ; break; default: - jj_la1[38] = jj_gen; + jj_la1[39] = jj_gen; break label_15; } modifier = methodModifiers(); @@ -2054,7 +2074,7 @@ ; break; default: - jj_la1[39] = jj_gen; + jj_la1[40] = jj_gen; break label_16; } modifier = commonModifiers(); @@ -2066,7 +2086,7 @@ classDeclaration.addMethod(method); break; default: - jj_la1[40] = jj_gen; + jj_la1[41] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2085,7 +2105,7 @@ } break; default: - jj_la1[41] = jj_gen; + jj_la1[42] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2140,7 +2160,7 @@ ; break; default: - jj_la1[42] = jj_gen; + jj_la1[43] = jj_gen; break label_17; } jj_consume_token(COMMA); @@ -2235,7 +2255,7 @@ rbrace.endColumn); break; default: - jj_la1[43] = jj_gen; + jj_la1[44] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2269,7 +2289,7 @@ } break; default: - jj_la1[44] = jj_gen; + jj_la1[45] = jj_gen; ; } setTypeFromScope(variable); @@ -2343,7 +2363,7 @@ rbrace.endColumn); break; default: - jj_la1[45] = jj_gen; + jj_la1[46] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2377,7 +2397,7 @@ } break; default: - jj_la1[46] = jj_gen; + jj_la1[47] = jj_gen; ; } setTypeFromScope(variable); @@ -2443,7 +2463,7 @@ } break; default: - jj_la1[47] = jj_gen; + jj_la1[48] = jj_gen; ; } if (assignToken == null) @@ -2497,7 +2517,7 @@ ; break; default: - jj_la1[48] = jj_gen; + jj_la1[49] = jj_gen; break label_18; } var = VariableSuffix(var); @@ -2576,7 +2596,7 @@ variable = new Variable(token); break; default: - jj_la1[49] = jj_gen; + jj_la1[50] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2607,7 +2627,7 @@ operator = jj_consume_token(MINUS); break; default: - jj_la1[50] = jj_gen; + jj_la1[51] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2619,7 +2639,7 @@ value = jj_consume_token(FLOATING_POINT_LITERAL); break; default: - jj_la1[51] = jj_gen; + jj_la1[52] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2698,7 +2718,7 @@ ; break; default: - jj_la1[52] = jj_gen; + jj_la1[53] = jj_gen; break label_19; } expr = VariableSuffix(expr); @@ -2708,14 +2728,14 @@ expr = VariableDeclaratorId(); break; default: - jj_la1[53] = jj_gen; + jj_la1[54] = jj_gen; jj_consume_token(-1); throw new ParseException(); } {if (true) return expr;} break; default: - jj_la1[54] = jj_gen; + jj_la1[55] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2753,7 +2773,7 @@ {if (true) return new ArrayVariableDeclaration(expr,expr2,expr.getSourceStart(),sourceEnd,expr.getBeginLine(),endLine,expr.getBeginColumn(),endColumn);} break; default: - jj_la1[55] = jj_gen; + jj_la1[56] = jj_gen; ; } {if (true) return new ArrayVariableDeclaration(expr,expr.getSourceEnd(),expr.getBeginLine(),expr.getEndLine(),expr.getBeginColumn(),expr.getEndColumn());} @@ -2825,7 +2845,7 @@ } break; default: - jj_la1[56] = jj_gen; + jj_la1[57] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2834,7 +2854,7 @@ list.add(null); break; default: - jj_la1[57] = jj_gen; + jj_la1[58] = jj_gen; ; } jj_consume_token(RPAREN); @@ -2888,7 +2908,7 @@ functionDeclaration.setBodyColumnEnd(semicolon.endColumn); break; default: - jj_la1[58] = jj_gen; + jj_la1[59] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2924,7 +2944,7 @@ } break; default: - jj_la1[59] = jj_gen; + jj_la1[60] = jj_gen; ; } methodHeader = new MethodHeader(namespace, @@ -2976,7 +2996,7 @@ reference = jj_consume_token(BIT_AND); break; default: - jj_la1[60] = jj_gen; + jj_la1[61] = jj_gen; ; } try @@ -3049,7 +3069,7 @@ functionIdentifier = jj_consume_token(NULL); break; default: - jj_la1[61] = jj_gen; + jj_la1[62] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3151,7 +3171,7 @@ methodIdentifier = jj_consume_token(CLONE); break; default: - jj_la1[62] = jj_gen; + jj_la1[63] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3214,7 +3234,7 @@ constantIdentifier = jj_consume_token(INTEGER); break; default: - jj_la1[63] = jj_gen; + jj_la1[64] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3281,7 +3301,7 @@ ; break; default: - jj_la1[64] = jj_gen; + jj_la1[65] = jj_gen; break label_21; } jj_consume_token(COMMA); @@ -3295,7 +3315,7 @@ } break; default: - jj_la1[65] = jj_gen; + jj_la1[66] = jj_gen; ; } try { @@ -3439,13 +3459,13 @@ startColumn = typeToken.beginColumn; break; default: - jj_la1[66] = jj_gen; + jj_la1[67] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[67] = jj_gen; + jj_la1[68] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3459,7 +3479,7 @@ } break; default: - jj_la1[68] = jj_gen; + jj_la1[69] = jj_gen; ; } variableDeclaration = VariableDeclaratorNoSuffix(); @@ -3542,7 +3562,7 @@ token = jj_consume_token(OBJECT); break; default: - jj_la1[69] = jj_gen; + jj_la1[70] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3621,7 +3641,7 @@ } break; default: - jj_la1[70] = jj_gen; + jj_la1[71] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3687,7 +3707,7 @@ initializer = closureDeclaration(); break; default: - jj_la1[71] = jj_gen; + jj_la1[72] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3750,7 +3770,7 @@ expr = InclusiveOrExpression(); break; default: - jj_la1[72] = jj_gen; + jj_la1[73] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3806,7 +3826,7 @@ expr = PrimaryExpression(); break; default: - jj_la1[73] = jj_gen; + jj_la1[74] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3869,7 +3889,7 @@ assignOperator = jj_consume_token(TILDEEQUAL); break; default: - jj_la1[74] = jj_gen; + jj_la1[75] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3940,13 +3960,13 @@ expr3 = Expression(); break; default: - jj_la1[75] = jj_gen; + jj_la1[76] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[76] = jj_gen; + jj_la1[77] = jj_gen; ; } if (expr3 == null) @@ -3976,7 +3996,7 @@ ; break; default: - jj_la1[77] = jj_gen; + jj_la1[78] = jj_gen; break label_22; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3990,7 +4010,7 @@ orToken = jj_consume_token(XOR); break; default: - jj_la1[78] = jj_gen; + jj_la1[79] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4032,7 +4052,7 @@ ; break; default: - jj_la1[79] = jj_gen; + jj_la1[80] = jj_gen; break label_23; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4043,7 +4063,7 @@ andToken = jj_consume_token(_ANDL); break; default: - jj_la1[80] = jj_gen; + jj_la1[81] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4084,7 +4104,7 @@ ; break; default: - jj_la1[81] = jj_gen; + jj_la1[82] = jj_gen; break label_24; } dotToken = jj_consume_token(DOT); @@ -4125,7 +4145,7 @@ ; break; default: - jj_la1[82] = jj_gen; + jj_la1[83] = jj_gen; break label_25; } bitOrToken = jj_consume_token(BIT_OR); @@ -4166,7 +4186,7 @@ ; break; default: - jj_la1[83] = jj_gen; + jj_la1[84] = jj_gen; break label_26; } bitXorToken = jj_consume_token(BIT_XOR); @@ -4208,7 +4228,7 @@ ; break; default: - jj_la1[84] = jj_gen; + jj_la1[85] = jj_gen; break label_27; } bitAndToken = jj_consume_token(BIT_AND); @@ -4257,7 +4277,7 @@ ; break; default: - jj_la1[85] = jj_gen; + jj_la1[86] = jj_gen; break label_28; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4277,7 +4297,7 @@ token = jj_consume_token(TRIPLEEQUAL); break; default: - jj_la1[86] = jj_gen; + jj_la1[87] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4374,7 +4394,7 @@ expr2 = VariableDeclaratorId(); break; default: - jj_la1[87] = jj_gen; + jj_la1[88] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4400,7 +4420,7 @@ expr.getBeginColumn(),endColumn); break; default: - jj_la1[88] = jj_gen; + jj_la1[89] = jj_gen; ; } {if (true) return expr;} @@ -4425,7 +4445,7 @@ ; break; default: - jj_la1[89] = jj_gen; + jj_la1[90] = jj_gen; break label_29; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4442,7 +4462,7 @@ token = jj_consume_token(GE); break; default: - jj_la1[90] = jj_gen; + jj_la1[91] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4485,7 +4505,7 @@ ; break; default: - jj_la1[91] = jj_gen; + jj_la1[92] = jj_gen; break label_30; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4499,7 +4519,7 @@ shiftToken = jj_consume_token(RUNSIGNEDSHIFT); break; default: - jj_la1[92] = jj_gen; + jj_la1[93] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4541,7 +4561,7 @@ ; break; default: - jj_la1[93] = jj_gen; + jj_la1[94] = jj_gen; break label_31; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4552,7 +4572,7 @@ token = jj_consume_token(MINUS); break; default: - jj_la1[94] = jj_gen; + jj_la1[95] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4604,7 +4624,7 @@ ; break; default: - jj_la1[95] = jj_gen; + jj_la1[96] = jj_gen; break label_32; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4618,7 +4638,7 @@ token = jj_consume_token(REMAINDER); break; default: - jj_la1[96] = jj_gen; + jj_la1[97] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4767,7 +4787,7 @@ expr = UnaryExpressionNoPrefix(); break; default: - jj_la1[97] = jj_gen; + jj_la1[98] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4837,7 +4857,7 @@ expr = UnaryExpressionNoPrefix(); break; default: - jj_la1[98] = jj_gen; + jj_la1[99] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4903,7 +4923,7 @@ expr = UnaryExpressionNotPlusMinus(); break; default: - jj_la1[99] = jj_gen; + jj_la1[100] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4927,7 +4947,7 @@ prefix = jj_consume_token(MINUS_MINUS); break; default: - jj_la1[100] = jj_gen; + jj_la1[101] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5006,7 +5026,7 @@ {if (true) return expr;} break; default: - jj_la1[101] = jj_gen; + jj_la1[102] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5040,7 +5060,7 @@ type = new ConstantIdentifier(arrayToken); break; default: - jj_la1[102] = jj_gen; + jj_la1[103] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5075,13 +5095,13 @@ token = jj_consume_token(MINUS_MINUS); break; default: - jj_la1[103] = jj_gen; + jj_la1[104] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[104] = jj_gen; + jj_la1[105] = jj_gen; ; } if (token == null) @@ -5126,7 +5146,7 @@ bitAndToken = jj_consume_token(BIT_AND); break; default: - jj_la1[105] = jj_gen; + jj_la1[106] = jj_gen; ; } expr = refPrimaryExpression(bitAndToken); @@ -5147,7 +5167,7 @@ expr = IncludeExpression(); break; default: - jj_la1[106] = jj_gen; + jj_la1[107] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5211,7 +5231,7 @@ expr = Variable(); break; default: - jj_la1[107] = jj_gen; + jj_la1[108] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5226,7 +5246,7 @@ ; break; default: - jj_la1[108] = jj_gen; + jj_la1[109] = jj_gen; break label_33; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -5247,14 +5267,14 @@ expr = arrayDeclarator(expr); break; default: - jj_la1[109] = jj_gen; + jj_la1[110] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } break; default: - jj_la1[110] = jj_gen; + jj_la1[111] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5278,7 +5298,7 @@ {if (true) return new ConstantIdentifier(token);} break; default: - jj_la1[111] = jj_gen; + jj_la1[112] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5298,7 +5318,7 @@ token = jj_consume_token(IDENTIFIER); break; default: - jj_la1[112] = jj_gen; + jj_la1[113] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5355,7 +5375,7 @@ expr = VariableDeclaratorId(); break; default: - jj_la1[113] = jj_gen; + jj_la1[114] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5403,7 +5423,7 @@ expr = new FunctionCall(expr,args); break; default: - jj_la1[114] = jj_gen; + jj_la1[115] = jj_gen; ; } expr = new ClassInstantiation(expr, @@ -5445,7 +5465,7 @@ } break; default: - jj_la1[115] = jj_gen; + jj_la1[116] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5511,7 +5531,7 @@ abstractVariable = arrayDeclarator(prefix); break; default: - jj_la1[116] = jj_gen; + jj_la1[117] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5610,7 +5630,7 @@ } break; default: - jj_la1[117] = jj_gen; + jj_la1[118] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5709,7 +5729,7 @@ expression = Variable(); break; default: - jj_la1[118] = jj_gen; + jj_la1[119] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5783,7 +5803,7 @@ expression = Expression(); break; default: - jj_la1[119] = jj_gen; + jj_la1[120] = jj_gen; ; } try { @@ -5840,7 +5860,7 @@ expression = Expression(); break; default: - jj_la1[120] = jj_gen; + jj_la1[121] = jj_gen; ; } try { @@ -5850,7 +5870,7 @@ } break; default: - jj_la1[121] = jj_gen; + jj_la1[122] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5927,7 +5947,7 @@ {if (true) return stringLiteral;} break; default: - jj_la1[122] = jj_gen; + jj_la1[123] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6036,7 +6056,7 @@ ; break; default: - jj_la1[123] = jj_gen; + jj_la1[124] = jj_gen; break label_34; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -6058,7 +6078,7 @@ hasDollar = true; break; default: - jj_la1[124] = jj_gen; + jj_la1[125] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6071,7 +6091,7 @@ end = jj_consume_token(DOUBLEQUOTE2); break; default: - jj_la1[125] = jj_gen; + jj_la1[126] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6145,7 +6165,7 @@ args = ArgumentList(); break; default: - jj_la1[126] = jj_gen; + jj_la1[127] = jj_gen; ; } try { @@ -6214,7 +6234,7 @@ ; break; default: - jj_la1[127] = jj_gen; + jj_la1[128] = jj_gen; break label_35; } jj_consume_token(COMMA); @@ -6285,7 +6305,7 @@ arg = closureDeclaration(); break; default: - jj_la1[128] = jj_gen; + jj_la1[129] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6359,7 +6379,7 @@ currentSegment.add((Outlineable)statement); break; default: - jj_la1[129] = jj_gen; + jj_la1[130] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6420,7 +6440,7 @@ ; break; default: - jj_la1[130] = jj_gen; + jj_la1[131] = jj_gen; break label_36; } catchClause = catchClause(); @@ -6588,7 +6608,7 @@ ; break; default: - jj_la1[131] = jj_gen; + jj_la1[132] = jj_gen; break label_37; } jj_consume_token(COMMA); @@ -6791,7 +6811,7 @@ statement = BreakStatement(); break; default: - jj_la1[132] = jj_gen; + jj_la1[133] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6828,7 +6848,7 @@ ; break; default: - jj_la1[133] = jj_gen; + jj_la1[134] = jj_gen; break label_38; } phpEchoBlock(); @@ -6842,7 +6862,7 @@ jj_consume_token(PHPSTARTSHORT); break; default: - jj_la1[134] = jj_gen; + jj_la1[135] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6888,7 +6908,7 @@ token = jj_consume_token(INCLUDE_ONCE); break; default: - jj_la1[135] = jj_gen; + jj_la1[136] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6956,7 +6976,7 @@ } break; default: - jj_la1[136] = jj_gen; + jj_la1[137] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7055,7 +7075,7 @@ column = expr.getBeginColumn(); break; default: - jj_la1[137] = jj_gen; + jj_la1[138] = jj_gen; ; } if (expr == null) @@ -7067,7 +7087,7 @@ ; break; default: - jj_la1[138] = jj_gen; + jj_la1[139] = jj_gen; break label_39; } try { @@ -7097,7 +7117,7 @@ column = expr.getBeginColumn(); break; default: - jj_la1[139] = jj_gen; + jj_la1[140] = jj_gen; ; } } @@ -7159,7 +7179,7 @@ ; break; default: - jj_la1[140] = jj_gen; + jj_la1[141] = jj_gen; break label_40; } jj_consume_token(COMMA); @@ -7248,7 +7268,7 @@ ; break; default: - jj_la1[141] = jj_gen; + jj_la1[142] = jj_gen; break label_41; } jj_consume_token(COMMA); @@ -7303,7 +7323,7 @@ ; break; default: - jj_la1[142] = jj_gen; + jj_la1[143] = jj_gen; break label_42; } jj_consume_token(COMMA); @@ -7480,7 +7500,7 @@ ; break; default: - jj_la1[143] = jj_gen; + jj_la1[144] = jj_gen; break label_43; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -7574,7 +7594,7 @@ } break; default: - jj_la1[144] = jj_gen; + jj_la1[145] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7706,7 +7726,7 @@ break; default: - jj_la1[145] = jj_gen; + jj_la1[146] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7793,7 +7813,7 @@ break; default: - jj_la1[146] = jj_gen; + jj_la1[147] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7819,7 +7839,7 @@ ; break; default: - jj_la1[147] = jj_gen; + jj_la1[148] = jj_gen; break label_44; } jj_consume_token(COMMA); @@ -7941,7 +7961,7 @@ cases = switchStatementColon(switchToken.sourceStart, switchToken.sourceEnd); break; default: - jj_la1[148] = jj_gen; + jj_la1[149] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7974,7 +7994,7 @@ ; break; default: - jj_la1[149] = jj_gen; + jj_la1[150] = jj_gen; break label_45; } cas = switchLabel0(); @@ -8036,7 +8056,7 @@ ; break; default: - jj_la1[150] = jj_gen; + jj_la1[151] = jj_gen; break label_46; } cas = switchLabel0(); @@ -8158,7 +8178,7 @@ ; break; default: - jj_la1[151] = jj_gen; + jj_la1[152] = jj_gen; break label_47; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -8234,7 +8254,7 @@ stmts.add(statement); break; default: - jj_la1[152] = jj_gen; + jj_la1[153] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8317,7 +8337,7 @@ token)); break; default: - jj_la1[153] = jj_gen; + jj_la1[154] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8358,7 +8378,7 @@ {if (true) return null;} break; default: - jj_la1[154] = jj_gen; + jj_la1[155] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8423,7 +8443,7 @@ pos = expression.getSourceEnd()+1; break; default: - jj_la1[155] = jj_gen; + jj_la1[156] = jj_gen; ; } try { @@ -8572,7 +8592,7 @@ ; break; default: - jj_la1[156] = jj_gen; + jj_la1[157] = jj_gen; break label_48; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -8642,7 +8662,7 @@ list.add(statement); break; default: - jj_la1[157] = jj_gen; + jj_la1[158] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8680,7 +8700,7 @@ ; break; default: - jj_la1[158] = jj_gen; + jj_la1[159] = jj_gen; break label_49; } elseifStatement = ElseIfStatementColon(); @@ -8691,7 +8711,7 @@ elseStatement = elseStatementColon(); break; default: - jj_la1[159] = jj_gen; + jj_la1[160] = jj_gen; ; } fireParseMessage(new PHPParseMessageEvent(INFO, @@ -8877,7 +8897,7 @@ stmt = htmlBlock(); break; default: - jj_la1[160] = jj_gen; + jj_la1[161] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -8888,7 +8908,7 @@ ; break; default: - jj_la1[161] = jj_gen; + jj_la1[162] = jj_gen; break label_50; } elseifStatement = ElseIfStatement(); @@ -8918,7 +8938,7 @@ } break; default: - jj_la1[162] = jj_gen; + jj_la1[163] = jj_gen; ; } elseIfs = new ElseIf[elseIfList.size()]; @@ -8935,7 +8955,7 @@ endColumn);} break; default: - jj_la1[163] = jj_gen; + jj_la1[164] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9155,7 +9175,7 @@ {if (true) return statement;} break; default: - jj_la1[164] = jj_gen; + jj_la1[165] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9416,7 +9436,7 @@ } break; default: - jj_la1[165] = jj_gen; + jj_la1[166] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9504,7 +9524,7 @@ initializations = ForInit(); break; default: - jj_la1[166] = jj_gen; + jj_la1[167] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -9554,7 +9574,7 @@ condition = Expression(); break; default: - jj_la1[167] = jj_gen; + jj_la1[168] = jj_gen; ; } jj_consume_token(SEMICOLON); @@ -9604,7 +9624,7 @@ increments = StatementExpressionList(); break; default: - jj_la1[168] = jj_gen; + jj_la1[169] = jj_gen; ; } jj_consume_token(RPAREN); @@ -9745,7 +9765,7 @@ endColumn);} break; default: - jj_la1[169] = jj_gen; + jj_la1[170] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9808,7 +9828,7 @@ {if (true) return exprs;} break; default: - jj_la1[170] = jj_gen; + jj_la1[171] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9832,7 +9852,7 @@ ; break; default: - jj_la1[171] = jj_gen; + jj_la1[172] = jj_gen; break label_51; } jj_consume_token(COMMA); @@ -9899,7 +9919,7 @@ expr = Expression(); break; default: - jj_la1[172] = jj_gen; + jj_la1[173] = jj_gen; ; } try { @@ -9996,7 +10016,7 @@ endColumn = expr.getEndColumn(); break; default: - jj_la1[173] = jj_gen; + jj_la1[174] = jj_gen; ; } try { @@ -10098,125 +10118,6 @@ finally { jj_save(8, xla); } } - private boolean jj_3R_166() { - if (jj_3R_123()) return true; - return false; - } - - private boolean jj_3_3() { - if (jj_3R_54()) return true; - if (jj_3R_55()) return true; - return false; - } - - private boolean jj_3R_141() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_152()) { - jj_scanpos = xsp; - if (jj_3R_153()) { - jj_scanpos = xsp; - if (jj_3R_154()) return true; - } - } - return false; - } - - private boolean jj_3R_335() { - if (jj_3R_358()) return true; - return false; - } - - private boolean jj_3R_334() { - if (jj_3R_357()) return true; - return false; - } - - private boolean jj_3R_76() { - if (jj_scan_token(DOUBLEQUOTE)) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_80()) { jj_scanpos = xsp; break; } - } - xsp = jj_scanpos; - if (jj_scan_token(127)) { - jj_scanpos = xsp; - if (jj_scan_token(130)) return true; - } - return false; - } - - private boolean jj_3R_333() { - if (jj_scan_token(MINUS)) return true; - if (jj_3R_250()) return true; - return false; - } - - private boolean jj_3R_332() { - if (jj_scan_token(PLUS)) return true; - if (jj_3R_250()) return true; - return false; - } - - private boolean jj_3R_136() { - if (jj_3R_54()) return true; - if (jj_3R_55()) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_166()) { - jj_scanpos = xsp; - if (jj_3R_167()) return true; - } - return false; - } - - private boolean jj_3R_270() { - if (jj_scan_token(IMPLEMENTS)) return true; - if (jj_scan_token(IDENTIFIER)) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_295()) { jj_scanpos = xsp; break; } - } - return false; - } - - private boolean jj_3R_284() { - if (jj_scan_token(DO)) return true; - if (jj_3R_219()) return true; - if (jj_scan_token(WHILE)) return true; - if (jj_3R_306()) return true; - if (jj_scan_token(SEMICOLON)) return true; - return false; - } - - private boolean jj_3R_302() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_332()) { - jj_scanpos = xsp; - if (jj_3R_333()) { - jj_scanpos = xsp; - if (jj_3R_334()) { - jj_scanpos = xsp; - if (jj_3R_335()) return true; - } - } - } - return false; - } - - private boolean jj_3R_123() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_136()) { - jj_scanpos = xsp; - if (jj_3R_137()) return true; - } - return false; - } - private boolean jj_3R_338() { if (jj_3R_302()) return true; return false; @@ -12619,16 +12520,6 @@ return false; } - private boolean jj_3R_223() { - if (jj_scan_token(PHPECHOSTART)) return true; - if (jj_3R_68()) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_scan_token(145)) jj_scanpos = xsp; - if (jj_scan_token(PHPEND)) return true; - return false; - } - private boolean jj_3R_83() { Token xsp; xsp = jj_scanpos; @@ -12711,6 +12602,16 @@ return false; } + private boolean jj_3R_223() { + if (jj_scan_token(PHPECHOSTART)) return true; + if (jj_3R_68()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_scan_token(145)) jj_scanpos = xsp; + if (jj_scan_token(PHPEND)) return true; + return false; + } + private boolean jj_3R_245() { if (jj_scan_token(LBRACE)) return true; Token xsp; @@ -13205,6 +13106,125 @@ return false; } + private boolean jj_3R_166() { + if (jj_3R_123()) return true; + return false; + } + + private boolean jj_3_3() { + if (jj_3R_54()) return true; + if (jj_3R_55()) return true; + return false; + } + + private boolean jj_3R_141() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_152()) { + jj_scanpos = xsp; + if (jj_3R_153()) { + jj_scanpos = xsp; + if (jj_3R_154()) return true; + } + } + return false; + } + + private boolean jj_3R_335() { + if (jj_3R_358()) return true; + return false; + } + + private boolean jj_3R_334() { + if (jj_3R_357()) return true; + return false; + } + + private boolean jj_3R_76() { + if (jj_scan_token(DOUBLEQUOTE)) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_80()) { jj_scanpos = xsp; break; } + } + xsp = jj_scanpos; + if (jj_scan_token(127)) { + jj_scanpos = xsp; + if (jj_scan_token(130)) return true; + } + return false; + } + + private boolean jj_3R_333() { + if (jj_scan_token(MINUS)) return true; + if (jj_3R_250()) return true; + return false; + } + + private boolean jj_3R_332() { + if (jj_scan_token(PLUS)) return true; + if (jj_3R_250()) return true; + return false; + } + + private boolean jj_3R_136() { + if (jj_3R_54()) return true; + if (jj_3R_55()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_166()) { + jj_scanpos = xsp; + if (jj_3R_167()) return true; + } + return false; + } + + private boolean jj_3R_270() { + if (jj_scan_token(IMPLEMENTS)) return true; + if (jj_scan_token(IDENTIFIER)) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_295()) { jj_scanpos = xsp; break; } + } + return false; + } + + private boolean jj_3R_284() { + if (jj_scan_token(DO)) return true; + if (jj_3R_219()) return true; + if (jj_scan_token(WHILE)) return true; + if (jj_3R_306()) return true; + if (jj_scan_token(SEMICOLON)) return true; + return false; + } + + private boolean jj_3R_302() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_332()) { + jj_scanpos = xsp; + if (jj_3R_333()) { + jj_scanpos = xsp; + if (jj_3R_334()) { + jj_scanpos = xsp; + if (jj_3R_335()) return true; + } + } + } + return false; + } + + private boolean jj_3R_123() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_136()) { + jj_scanpos = xsp; + if (jj_3R_137()) return true; + } + return false; + } + /** Generated Token Manager. */ public PHPParserTokenManager token_source; SimpleCharStream jj_input_stream; @@ -13216,7 +13236,7 @@ private Token jj_scanpos, jj_lastpos; private int jj_la; private int jj_gen; - final private int[] jj_la1 = new int[174]; + final private int[] jj_la1 = new int[175]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -13232,22 +13252,22 @@ jj_la1_init_5(); } private static void jj_la1_init_0() { - jj_la1_0 = new int[] {0x6000001e,0x6,0x6,0x6000001e,0x0,0x60000000,0x60000000,0x60000000,0x60000000,0x60000000,0x60000000,0x0,0x0,0x0,0x0,0x4000000,0x0,0x4000000,0x4000000,0x4000000,0x4000000,0x0,0x0,0x20000000,0x0,0x0,0x0,0x80000000,0x3c000000,0x3c000000,0x1c000000,0x20000000,0x1c000000,0x20000000,0x3c000000,0x1c000000,0x20000000,0x1c000000,0x20000000,0x1c000000,0x20000000,0x3c000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x60000010,0x60000010,0x60000000,0x20000000,0x0,0x0,0x0,0x0,0x20000010,0x20000010,0x0,0x0,0x0,0x10,0x10,0x0,0x0,0x10,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_0 = new int[] {0x6000001e,0x6,0x6,0x6000001e,0x0,0x60000000,0x60000000,0x60000000,0x60000000,0x60000000,0x60000000,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x4000000,0x4000000,0x4000000,0x4000000,0x0,0x0,0x20000000,0x0,0x0,0x0,0x80000000,0x3c000000,0x3c000000,0x1c000000,0x20000000,0x1c000000,0x20000000,0x3c000000,0x1c000000,0x20000000,0x1c000000,0x20000000,0x1c000000,0x20000000,0x3c000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x60000010,0x60000010,0x60000000,0x20000000,0x0,0x0,0x0,0x0,0x20000010,0x20000010,0x0,0x0,0x0,0x10,0x10,0x0,0x0,0x10,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; } private static void jj_la1_init_1() { - jj_la1_1 = new int[] {0xeb7ff2fb,0x0,0x0,0xeb7ff2fb,0x0,0xeb7ff2fb,0xeb7ff2fb,0xeb7ff2bb,0xeb7ff2bb,0xeb7ff2bb,0xeb7ff2bb,0x0,0x0,0x0,0x10000000,0x1400020,0x400000,0x0,0x400000,0x400000,0x1400020,0x0,0x1,0x11,0x0,0x10000000,0x0,0x0,0x1400121,0x1400121,0x400000,0x1,0x400000,0x21,0x1400121,0x400000,0x1,0x400000,0x1,0x400000,0x21,0x1400121,0x0,0xc4002f30,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc4002f30,0xc4003f30,0x0,0xc05ed000,0x0,0x0,0x80,0x0,0x0,0xc4002f30,0x0,0x0,0xc4003f30,0xc4003f30,0xc4003f30,0x0,0x0,0xc05ed000,0xc05e5020,0xc05e5000,0xc05e5000,0x0,0xc05ed000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc4002f30,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc05e5000,0xc05e5000,0xc05e5000,0x0,0xc05e5000,0x1000,0x0,0x0,0x0,0xc05e5000,0x400000,0x0,0x0,0x40400000,0x0,0x0,0xc4002f30,0x0,0x0,0x0,0xc4002f30,0xc4006f30,0xc05ed000,0xc05ed000,0x0,0x0,0x0,0x0,0x0,0xc05ed020,0x0,0xc05ed020,0x2a61020a,0x4,0x0,0xea7ff20a,0x0,0x0,0x1e0000,0xc05e5000,0x0,0x0,0x0,0x0,0x0,0x0,0xea7ff23b,0xea7ff23b,0xea7ff23b,0xea7fd23b,0x0,0x0,0x4800000,0x4800000,0xea7ff23b,0xea7ff23b,0x0,0x4800000,0xc05ed000,0xea7ff20a,0xea7ff20a,0x400,0x800,0xea7ff20a,0x400,0x800,0xea7ff20a,0xea7ff20a,0xea7ff20a,0xc05ed000,0xc05ed000,0xc05ed000,0xea7ff20a,0xc05ed000,0x0,0xc05ed000,0xc05ed000,}; + jj_la1_1 = new int[] {0xeb7ff2fb,0x0,0x0,0xeb7ff2fb,0x0,0xeb7ff2fb,0xeb7ff2fb,0xeb7ff2bb,0xeb7ff2bb,0xeb7ff2bb,0xeb7ff2bb,0x0,0x0,0x0,0x0,0x10000000,0x1400020,0x400000,0x0,0x400000,0x400000,0x1400020,0x0,0x1,0x11,0x0,0x10000000,0x0,0x0,0x1400121,0x1400121,0x400000,0x1,0x400000,0x21,0x1400121,0x400000,0x1,0x400000,0x1,0x400000,0x21,0x1400121,0x0,0xc4002f30,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc4002f30,0xc4003f30,0x0,0xc05ed000,0x0,0x0,0x80,0x0,0x0,0xc4002f30,0x0,0x0,0xc4003f30,0xc4003f30,0xc4003f30,0x0,0x0,0xc05ed000,0xc05e5020,0xc05e5000,0xc05e5000,0x0,0xc05ed000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc4002f30,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc05e5000,0xc05e5000,0xc05e5000,0x0,0xc05e5000,0x1000,0x0,0x0,0x0,0xc05e5000,0x400000,0x0,0x0,0x40400000,0x0,0x0,0xc4002f30,0x0,0x0,0x0,0xc4002f30,0xc4006f30,0xc05ed000,0xc05ed000,0x0,0x0,0x0,0x0,0x0,0xc05ed020,0x0,0xc05ed020,0x2a61020a,0x4,0x0,0xea7ff20a,0x0,0x0,0x1e0000,0xc05e5000,0x0,0x0,0x0,0x0,0x0,0x0,0xea7ff23b,0xea7ff23b,0xea7ff23b,0xea7fd23b,0x0,0x0,0x4800000,0x4800000,0xea7ff23b,0xea7ff23b,0x0,0x4800000,0xc05ed000,0xea7ff20a,0xea7ff20a,0x400,0x800,0xea7ff20a,0x400,0x800,0xea7ff20a,0xea7ff20a,0xea7ff20a,0xc05ed000,0xc05ed000,0xc05ed000,0xea7ff20a,0xc05ed000,0x0,0xc05ed000,0xc05ed000,}; } private static void jj_la1_init_2() { - jj_la1_2 = new int[] {0xffefe107,0x0,0x0,0xffefe107,0x0,0xffefe107,0xffefe107,0xffefe107,0xffefe107,0xffefe107,0xffefe107,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fefe000,0x0,0x0,0x0,0x0,0xc00,0x0,0x0,0x0,0xc00,0x3fefe000,0x3fefe000,0x1000,0xffefe000,0x0,0x0,0x0,0x0,0x8000,0x3fefe000,0x3fe36000,0x0,0x3fefe000,0x3fefe000,0x3fefe000,0x0,0x3fe00000,0xffefe000,0xffefe000,0xffefe000,0xffe36000,0x0,0xffefe000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fefe000,0x100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffefe000,0xffefe000,0x3fefe000,0x0,0x3fefe000,0x3fe00000,0x0,0x0,0x0,0x3fe36000,0x3fe36000,0xc00,0xc00,0x3fe36000,0x0,0x0,0x3fefe000,0x0,0x0,0xc00,0x3fefe000,0x3fefe000,0xffefe000,0xffefe000,0x0,0xc8000,0x0,0x0,0x0,0xffefe000,0x0,0xffefe000,0x2107,0x0,0x0,0xffefe107,0x0,0x0,0x0,0x3fefe000,0x0,0x0,0x0,0x0,0x0,0x0,0xffefe107,0xffefe107,0xffefe107,0xffefe107,0x0,0x0,0x0,0x0,0xffefe107,0xffefe107,0x0,0x0,0xffefe000,0xffefe107,0xffefe107,0x0,0x0,0xffefe107,0x0,0x0,0xffefe107,0xffefe107,0xffefe107,0xffefe000,0xffefe000,0xffefe000,0xffefe107,0xffefe000,0x0,0xffefe000,0xffefe000,}; + jj_la1_2 = new int[] {0xffefe107,0x0,0x0,0xffefe107,0x0,0xffefe107,0xffefe107,0xffefe107,0xffefe107,0xffefe107,0xffefe107,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fefe000,0x0,0x0,0x0,0x0,0xc00,0x0,0x0,0x0,0xc00,0x3fefe000,0x3fefe000,0x1000,0xffefe000,0x0,0x0,0x0,0x0,0x8000,0x3fefe000,0x3fe36000,0x0,0x3fefe000,0x3fefe000,0x3fefe000,0x0,0x3fe00000,0xffefe000,0xffefe000,0xffefe000,0xffe36000,0x0,0xffefe000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fefe000,0x100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffefe000,0xffefe000,0x3fefe000,0x0,0x3fefe000,0x3fe00000,0x0,0x0,0x0,0x3fe36000,0x3fe36000,0xc00,0xc00,0x3fe36000,0x0,0x0,0x3fefe000,0x0,0x0,0xc00,0x3fefe000,0x3fefe000,0xffefe000,0xffefe000,0x0,0xc8000,0x0,0x0,0x0,0xffefe000,0x0,0xffefe000,0x2107,0x0,0x0,0xffefe107,0x0,0x0,0x0,0x3fefe000,0x0,0x0,0x0,0x0,0x0,0x0,0xffefe107,0xffefe107,0xffefe107,0xffefe107,0x0,0x0,0x0,0x0,0xffefe107,0xffefe107,0x0,0x0,0xffefe000,0xffefe107,0xffefe107,0x0,0x0,0xffefe107,0x0,0x0,0xffefe107,0xffefe107,0xffefe107,0xffefe000,0xffefe000,0xffefe000,0xffefe107,0xffefe000,0x0,0xffefe000,0xffefe000,}; } private static void jj_la1_init_3() { - jj_la1_3 = new int[] {0x944011e1,0x0,0x0,0x944011e1,0x0,0x944011e1,0x944011e1,0x944011e1,0x944011e1,0x944011e1,0x944011e1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x4400000,0x0,0x0,0x180,0x0,0x944011e1,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x1000,0x0,0x944011e1,0x944011e1,0x944011e1,0x1001,0x0,0x944011e5,0x2,0x180008,0x180008,0x200010,0x200010,0x0,0x2000,0x4000,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x70000,0x70000,0x180,0x180,0x8600,0x8600,0x944011e1,0x944011e0,0x944011e0,0x60,0x94401000,0x0,0x60,0x60,0x1000,0x1000,0x0,0x0,0x0,0x0,0x800,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x944011e1,0x944011e1,0x0,0x94400000,0x0,0x0,0x80000000,0x944011e1,0x0,0x944011e1,0x0,0x0,0x0,0x944011e1,0x0,0x0,0x0,0x94401000,0x0,0x0,0x0,0x0,0x0,0x0,0x944011e1,0x944011e1,0x944011e1,0x944011e1,0x0,0x4,0x0,0x0,0x944011e1,0x944011e1,0x4,0x0,0x944011e1,0x944011e1,0x944011e1,0x0,0x0,0x944011e1,0x0,0x0,0x944011e5,0x944011e5,0x944011e5,0x944011e1,0x944011e1,0x944011e1,0x944011e5,0x944011e1,0x0,0x944011e1,0x944011e1,}; + jj_la1_3 = new int[] {0x944011e1,0x0,0x0,0x944011e1,0x0,0x944011e1,0x944011e1,0x944011e1,0x944011e1,0x944011e1,0x944011e1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x4400000,0x0,0x0,0x180,0x0,0x944011e1,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x1000,0x0,0x944011e1,0x944011e1,0x944011e1,0x1001,0x0,0x944011e5,0x2,0x180008,0x180008,0x200010,0x200010,0x0,0x2000,0x4000,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x70000,0x70000,0x180,0x180,0x8600,0x8600,0x944011e1,0x944011e0,0x944011e0,0x60,0x94401000,0x0,0x60,0x60,0x1000,0x1000,0x0,0x0,0x0,0x0,0x800,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x944011e1,0x944011e1,0x0,0x94400000,0x0,0x0,0x80000000,0x944011e1,0x0,0x944011e1,0x0,0x0,0x0,0x944011e1,0x0,0x0,0x0,0x94401000,0x0,0x0,0x0,0x0,0x0,0x0,0x944011e1,0x944011e1,0x944011e1,0x944011e1,0x0,0x4,0x0,0x0,0x944011e1,0x944011e1,0x4,0x0,0x944011e1,0x944011e1,0x944011e1,0x0,0x0,0x944011e1,0x0,0x0,0x944011e5,0x944011e5,0x944011e5,0x944011e1,0x944011e1,0x944011e1,0x944011e5,0x944011e1,0x0,0x944011e1,0x944011e1,}; } private static void jj_la1_init_4() { - jj_la1_4 = new int[] {0x121038,0x0,0x0,0x121038,0x20000,0x121038,0x121038,0x121038,0x121038,0x121038,0x121038,0x120000,0x100000,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x20,0x0,0x40000,0x0,0x10,0x10,0x0,0x0,0x0,0x10,0x10,0x0,0x0,0x0,0x0,0x0,0x10,0x10,0x40000,0x100020,0x40000000,0x100020,0x40000000,0x40000000,0x108000,0x100030,0x0,0x0,0x108000,0x30,0x30,0x0,0x1038,0x40000,0x120000,0x0,0x0,0x20,0x20,0x20,0x40000,0x30,0x20,0x20,0x0,0x0,0x1038,0x1038,0x1038,0x30,0xc0000000,0x1038,0x0,0x0,0x0,0x0,0x0,0x80000,0x0,0x0,0x0,0x3c800000,0x3c800000,0x30,0x0,0x3600000,0x3600000,0x0,0x0,0x0,0x0,0x0,0x0,0x1038,0x1038,0x1038,0x0,0x1038,0x0,0x0,0x0,0x0,0x30,0x30,0x109000,0x109000,0x30,0x0,0x220,0x30,0x1000,0x1010,0x108000,0x30,0x100030,0x1038,0x1038,0x108000,0x8,0x23,0x23,0x4,0x1038,0x40000,0x1038,0x120000,0x0,0x40000,0x121038,0x0,0x0,0x0,0x1038,0x10,0x40000,0x10,0x40000,0x40000,0x40000,0x121038,0x121038,0x121038,0x121038,0x40000,0x100000,0x0,0x0,0x121038,0x121038,0x20000,0x0,0x1038,0x121038,0x121038,0x0,0x0,0x121038,0x0,0x0,0x121038,0x121038,0x121038,0x1038,0x1038,0x1038,0x121038,0x1038,0x40000,0x1038,0x1038,}; + jj_la1_4 = new int[] {0x121038,0x0,0x0,0x121038,0x20000,0x121038,0x121038,0x121038,0x121038,0x121038,0x121038,0x120000,0x100000,0x40000,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x20,0x0,0x40000,0x0,0x10,0x10,0x0,0x0,0x0,0x10,0x10,0x0,0x0,0x0,0x0,0x0,0x10,0x10,0x40000,0x100020,0x40000000,0x100020,0x40000000,0x40000000,0x108000,0x100030,0x0,0x0,0x108000,0x30,0x30,0x0,0x1038,0x40000,0x120000,0x0,0x0,0x20,0x20,0x20,0x40000,0x30,0x20,0x20,0x0,0x0,0x1038,0x1038,0x1038,0x30,0xc0000000,0x1038,0x0,0x0,0x0,0x0,0x0,0x80000,0x0,0x0,0x0,0x3c800000,0x3c800000,0x30,0x0,0x3600000,0x3600000,0x0,0x0,0x0,0x0,0x0,0x0,0x1038,0x1038,0x1038,0x0,0x1038,0x0,0x0,0x0,0x0,0x30,0x30,0x109000,0x109000,0x30,0x0,0x220,0x30,0x1000,0x1010,0x108000,0x30,0x100030,0x1038,0x1038,0x108000,0x8,0x23,0x23,0x4,0x1038,0x40000,0x1038,0x120000,0x0,0x40000,0x121038,0x0,0x0,0x0,0x1038,0x10,0x40000,0x10,0x40000,0x40000,0x40000,0x121038,0x121038,0x121038,0x121038,0x40000,0x100000,0x0,0x0,0x121038,0x121038,0x20000,0x0,0x1038,0x121038,0x121038,0x0,0x0,0x121038,0x0,0x0,0x121038,0x121038,0x121038,0x1038,0x1038,0x1038,0x121038,0x1038,0x40000,0x1038,0x1038,}; } private static void jj_la1_init_5() { - jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7ff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7ff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; } final private JJCalls[] jj_2_rtns = new JJCalls[9]; private boolean jj_rescan = false; @@ -13264,7 +13284,7 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 174; i++) jj_la1[i] = ... [truncated message content] |