Menu
▾
▴
[ jEdit-commits ] SF.net SVN: jedit:[24330] plugins/PHPParser/trunk
|
From: <kp...@us...> - 2016-02-11 09:24:29
|
Revision: 24330
http://sourceforge.net/p/jedit/svn/24330
Author: kpouer
Date: 2016-02-11 09:24:26 +0000 (Thu, 11 Feb 2016)
Log Message:
-----------
Support syntax to create arrays without keys ex: [1,2,3,4]
Modified Paths:
--------------
plugins/PHPParser/trunk/docs/PHPParser.html
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/ArrayVariableDeclaration.java
plugins/PHPParser/trunk/src/net/sourceforge/phpdt/internal/compiler/ast/NumberLiteral.java
plugins/PHPParser/trunk/test/gatchan/phpparser/parser/PHPParserTester.java
Modified: plugins/PHPParser/trunk/docs/PHPParser.html
===================================================================
--- plugins/PHPParser/trunk/docs/PHPParser.html 2016-02-11 04:14:20 UTC (rev 24329)
+++ plugins/PHPParser/trunk/docs/PHPParser.html 2016-02-11 09:24:26 UTC (rev 24330)
@@ -99,6 +99,7 @@
<li>2.0.6</li>
<li>Bugs fixed</li>
<ul>
+ <li>Support syntax to create arrays without keys ex: [1,2,3,4]</li>
<li>Fix a bug preventing class access with "interface" named field (#1771)</li>
<li>Fix some parsing issue</li>
</ul>
Modified: plugins/PHPParser/trunk/src/gatchan/phpparser/parser/PHPParser.java
===================================================================
--- plugins/PHPParser/trunk/src/gatchan/phpparser/parser/PHPParser.java 2016-02-11 04:14:20 UTC (rev 24329)
+++ plugins/PHPParser/trunk/src/gatchan/phpparser/parser/PHPParser.java 2016-02-11 09:24:26 UTC (rev 24330)
@@ -426,6 +426,7 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
case SEMICOLON:
case LBRACE:
;
@@ -538,6 +539,7 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
case SEMICOLON:
case LBRACE:
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -698,6 +700,7 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
case SEMICOLON:
case LBRACE:
;
@@ -777,6 +780,7 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
case SEMICOLON:
case LBRACE:
BlockStatement();
@@ -875,6 +879,7 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
case SEMICOLON:
case LBRACE:
;
@@ -951,6 +956,7 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
case SEMICOLON:
case LBRACE:
BlockStatement();
@@ -1044,6 +1050,7 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
case SEMICOLON:
case LBRACE:
;
@@ -1120,6 +1127,7 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
case SEMICOLON:
case LBRACE:
BlockStatement();
@@ -2548,15 +2556,9 @@
var = Variable();
label_19:
while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case CLASSACCESS:
- case STATICCLASSACCESS:
- case LBRACKET:
- case LBRACE:
+ if (jj_2_1(2)) {
;
- break;
- default:
- jj_la1[50] = jj_gen;
+ } else {
break label_19;
}
var = VariableSuffix(var);
@@ -2635,7 +2637,7 @@
variable = new Variable(token);
break;
default:
- jj_la1[51] = jj_gen;
+ jj_la1[50] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2649,7 +2651,7 @@
//{{{ VariableInitializer()
final public Expression VariableInitializer() throws ParseException {
Expression expr;
- if (jj_2_1(2)) {
+ if (jj_2_2(2)) {
expr = Literal();
{if (true) return expr;}
} else {
@@ -2666,7 +2668,7 @@
operator = jj_consume_token(MINUS);
break;
default:
- jj_la1[52] = jj_gen;
+ jj_la1[51] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2678,7 +2680,7 @@
value = jj_consume_token(FLOATING_POINT_LITERAL);
break;
default:
- jj_la1[53] = jj_gen;
+ jj_la1[52] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2686,6 +2688,7 @@
operator);}
break;
case ARRAY:
+ case LBRACKET:
//{{{ array
expr = ArrayDeclarator();
{if (true) return expr;}
@@ -2757,7 +2760,7 @@
;
break;
default:
- jj_la1[54] = jj_gen;
+ jj_la1[53] = jj_gen;
break label_20;
}
expr = VariableSuffix(expr);
@@ -2767,14 +2770,14 @@
expr = VariableDeclaratorId();
break;
default:
- jj_la1[55] = jj_gen;
+ jj_la1[54] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
{if (true) return expr;}
break;
default:
- jj_la1[56] = jj_gen;
+ jj_la1[55] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2789,33 +2792,36 @@
//{{{ Arrays
-//{{{ ArrayVariable()
+//{{{ ArrayVariable() method
final public ArrayVariableDeclaration ArrayVariable() throws ParseException {
-Expression expr,expr2;
-Token arrayAssignToken;
+ Expression expr;
+ Expression expr2;
+ Token arrayAssignToken;
expr = Expression();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ARRAYASSIGN:
arrayAssignToken = jj_consume_token(ARRAYASSIGN);
expr2 = Expression();
- int sourceEnd,endLine,endColumn;
- if (expr2 == null) {
- sourceEnd = arrayAssignToken.sourceEnd;
- endLine = arrayAssignToken.endLine;
- endColumn = arrayAssignToken.endColumn;
- } else {
- sourceEnd = expr2.getSourceEnd();
- endLine = expr2.getEndLine();
- endColumn = expr2.getEndColumn();
- }
-
- {if (true) return new ArrayVariableDeclaration(expr,expr2,expr.getSourceStart(),sourceEnd,expr.getBeginLine(),endLine,expr.getBeginColumn(),endColumn);}
+ int sourceEnd,endLine,endColumn;
+ if (expr2 == null)
+ {
+ sourceEnd = arrayAssignToken.sourceEnd;
+ endLine = arrayAssignToken.endLine;
+ endColumn = arrayAssignToken.endColumn;
+ }
+ else
+ {
+ sourceEnd = expr2.getSourceEnd();
+ endLine = expr2.getEndLine();
+ endColumn = expr2.getEndColumn();
+ }
+ {if (true) return new ArrayVariableDeclaration(expr,expr2,expr.getSourceStart(),sourceEnd,expr.getBeginLine(),endLine,expr.getBeginColumn(),endColumn);}
break;
default:
- jj_la1[57] = jj_gen;
+ jj_la1[56] = jj_gen;
;
}
- {if (true) return new ArrayVariableDeclaration(expr,expr.getSourceEnd(),expr.getBeginLine(),expr.getEndLine(),expr.getBeginColumn(),expr.getEndColumn());}
+ {if (true) return new ArrayVariableDeclaration(expr,expr.getSourceEnd(),expr.getBeginLine(),expr.getEndLine(),expr.getBeginColumn(),expr.getEndColumn());}
throw new Error("Missing return statement in function");
}
@@ -2869,11 +2875,12 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
expr = ArrayVariable();
list.add(expr);
label_21:
while (true) {
- if (jj_2_2(2)) {
+ if (jj_2_3(2)) {
;
} else {
break label_21;
@@ -2884,7 +2891,7 @@
}
break;
default:
- jj_la1[58] = jj_gen;
+ jj_la1[57] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2893,7 +2900,7 @@
list.add(null);
break;
default:
- jj_la1[59] = jj_gen;
+ jj_la1[58] = jj_gen;
;
}
jj_consume_token(RPAREN);
@@ -2948,7 +2955,7 @@
functionDeclaration.setBodyColumnEnd(semicolon.endColumn);
break;
default:
- jj_la1[60] = jj_gen;
+ jj_la1[59] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2987,7 +2994,7 @@
}
break;
default:
- jj_la1[61] = jj_gen;
+ jj_la1[60] = jj_gen;
;
}
methodHeader = new MethodHeader(namespace,
@@ -3039,7 +3046,7 @@
reference = jj_consume_token(BIT_AND);
break;
default:
- jj_la1[62] = jj_gen;
+ jj_la1[61] = jj_gen;
;
}
try
@@ -3112,7 +3119,7 @@
functionIdentifier = jj_consume_token(NULL);
break;
default:
- jj_la1[63] = jj_gen;
+ jj_la1[62] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -3214,7 +3221,7 @@
methodIdentifier = jj_consume_token(CLONE);
break;
default:
- jj_la1[64] = jj_gen;
+ jj_la1[63] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -3277,7 +3284,7 @@
constantIdentifier = jj_consume_token(INTEGER);
break;
default:
- jj_la1[65] = jj_gen;
+ jj_la1[64] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -3329,7 +3336,7 @@
;
break;
default:
- jj_la1[66] = jj_gen;
+ jj_la1[65] = jj_gen;
break label_22;
}
jj_consume_token(COMMA);
@@ -3343,7 +3350,7 @@
}
break;
default:
- jj_la1[67] = jj_gen;
+ jj_la1[66] = jj_gen;
;
}
try {
@@ -3437,13 +3444,13 @@
startColumn = typeToken.beginColumn;
break;
default:
- jj_la1[68] = jj_gen;
+ jj_la1[67] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[69] = jj_gen;
+ jj_la1[68] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -3457,7 +3464,7 @@
}
break;
default:
- jj_la1[70] = jj_gen;
+ jj_la1[69] = jj_gen;
;
}
variableDeclaration = VariableDeclaratorNoSuffix();
@@ -3540,7 +3547,7 @@
token = jj_consume_token(OBJECT);
break;
default:
- jj_la1[71] = jj_gen;
+ jj_la1[70] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -3600,6 +3607,7 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
try {
expr = ConditionalExpression();
} catch (ParseException e) {
@@ -3619,7 +3627,7 @@
}
break;
default:
- jj_la1[72] = jj_gen;
+ jj_la1[71] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -3634,7 +3642,7 @@
Expression expr;
Expression initializer;
Token assignOperator;
- if (jj_2_3(2147483647)) {
+ if (jj_2_4(2147483647)) {
expr = prefixedPrimaryExpression();
assignOperator = AssignmentOperator();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -3679,13 +3687,14 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
initializer = assignment();
break;
case FUNCTION:
initializer = closureDeclaration();
break;
default:
- jj_la1[73] = jj_gen;
+ jj_la1[72] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -3745,10 +3754,11 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
expr = InclusiveOrExpression();
break;
default:
- jj_la1[74] = jj_gen;
+ jj_la1[73] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -3801,10 +3811,11 @@
case DOLLAR:
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
+ case LBRACKET:
expr = primaryExpression();
break;
default:
- jj_la1[75] = jj_gen;
+ jj_la1[74] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -3867,7 +3878,7 @@
assignOperator = jj_consume_token(TILDEEQUAL);
break;
default:
- jj_la1[76] = jj_gen;
+ jj_la1[75] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -3933,18 +3944,19 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
expr2 = Expression();
jj_consume_token(COLON);
expr3 = Expression();
break;
default:
- jj_la1[77] = jj_gen;
+ jj_la1[76] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[78] = jj_gen;
+ jj_la1[77] = jj_gen;
;
}
if (expr3 == null)
@@ -3974,7 +3986,7 @@
;
break;
default:
- jj_la1[79] = jj_gen;
+ jj_la1[78] = jj_gen;
break label_23;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -3988,7 +4000,7 @@
orToken = jj_consume_token(XOR);
break;
default:
- jj_la1[80] = jj_gen;
+ jj_la1[79] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4030,7 +4042,7 @@
;
break;
default:
- jj_la1[81] = jj_gen;
+ jj_la1[80] = jj_gen;
break label_24;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -4041,7 +4053,7 @@
andToken = jj_consume_token(_ANDL);
break;
default:
- jj_la1[82] = jj_gen;
+ jj_la1[81] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4082,7 +4094,7 @@
;
break;
default:
- jj_la1[83] = jj_gen;
+ jj_la1[82] = jj_gen;
break label_25;
}
dotToken = jj_consume_token(DOT);
@@ -4123,7 +4135,7 @@
;
break;
default:
- jj_la1[84] = jj_gen;
+ jj_la1[83] = jj_gen;
break label_26;
}
bitOrToken = jj_consume_token(BIT_OR);
@@ -4164,7 +4176,7 @@
;
break;
default:
- jj_la1[85] = jj_gen;
+ jj_la1[84] = jj_gen;
break label_27;
}
bitXorToken = jj_consume_token(BIT_XOR);
@@ -4206,7 +4218,7 @@
;
break;
default:
- jj_la1[86] = jj_gen;
+ jj_la1[85] = jj_gen;
break label_28;
}
bitAndToken = jj_consume_token(BIT_AND);
@@ -4255,7 +4267,7 @@
;
break;
default:
- jj_la1[87] = jj_gen;
+ jj_la1[86] = jj_gen;
break label_29;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -4275,7 +4287,7 @@
token = jj_consume_token(TRIPLEEQUAL);
break;
default:
- jj_la1[88] = jj_gen;
+ jj_la1[87] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4376,7 +4388,7 @@
expr2 = VariableDeclaratorId();
break;
default:
- jj_la1[89] = jj_gen;
+ jj_la1[88] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4402,7 +4414,7 @@
expr.getBeginColumn(),endColumn);
break;
default:
- jj_la1[90] = jj_gen;
+ jj_la1[89] = jj_gen;
;
}
{if (true) return expr;}
@@ -4427,7 +4439,7 @@
;
break;
default:
- jj_la1[91] = jj_gen;
+ jj_la1[90] = jj_gen;
break label_30;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -4444,7 +4456,7 @@
token = jj_consume_token(GE);
break;
default:
- jj_la1[92] = jj_gen;
+ jj_la1[91] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4487,7 +4499,7 @@
;
break;
default:
- jj_la1[93] = jj_gen;
+ jj_la1[92] = jj_gen;
break label_31;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -4501,7 +4513,7 @@
shiftToken = jj_consume_token(RUNSIGNEDSHIFT);
break;
default:
- jj_la1[94] = jj_gen;
+ jj_la1[93] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4543,7 +4555,7 @@
;
break;
default:
- jj_la1[95] = jj_gen;
+ jj_la1[94] = jj_gen;
break label_32;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -4554,7 +4566,7 @@
token = jj_consume_token(MINUS);
break;
default:
- jj_la1[96] = jj_gen;
+ jj_la1[95] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4606,7 +4618,7 @@
;
break;
default:
- jj_la1[97] = jj_gen;
+ jj_la1[96] = jj_gen;
break label_33;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -4620,7 +4632,7 @@
token = jj_consume_token(REMAINDER);
break;
default:
- jj_la1[98] = jj_gen;
+ jj_la1[97] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4720,10 +4732,11 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
expr = UnaryExpressionNoPrefix();
break;
default:
- jj_la1[99] = jj_gen;
+ jj_la1[98] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4790,10 +4803,11 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
expr = UnaryExpressionNoPrefix();
break;
default:
- jj_la1[100] = jj_gen;
+ jj_la1[99] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4856,10 +4870,11 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
expr = UnaryExpressionNotPlusMinus();
break;
default:
- jj_la1[101] = jj_gen;
+ jj_la1[100] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4883,7 +4898,7 @@
prefix = jj_consume_token(MINUS_MINUS);
break;
default:
- jj_la1[102] = jj_gen;
+ jj_la1[101] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4897,7 +4912,7 @@
//{{{ UnaryExpressionNotPlusMinus()
final public Expression UnaryExpressionNotPlusMinus() throws ParseException {
Expression expr;
- if (jj_2_4(2147483647)) {
+ if (jj_2_5(2147483647)) {
expr = CastExpression();
{if (true) return expr;}
} else {
@@ -4927,6 +4942,7 @@
case DOLLAR:
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
+ case LBRACKET:
expr = PostfixExpression();
{if (true) return expr;}
break;
@@ -4962,7 +4978,7 @@
{if (true) return expr;}
break;
default:
- jj_la1[103] = jj_gen;
+ jj_la1[102] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4996,7 +5012,7 @@
type = new ConstantIdentifier(arrayToken);
break;
default:
- jj_la1[104] = jj_gen;
+ jj_la1[103] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5031,13 +5047,13 @@
token = jj_consume_token(MINUS_MINUS);
break;
default:
- jj_la1[105] = jj_gen;
+ jj_la1[104] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[106] = jj_gen;
+ jj_la1[105] = jj_gen;
;
}
if (token == null)
@@ -5082,7 +5098,7 @@
bitAndToken = jj_consume_token(BIT_AND);
break;
default:
- jj_la1[107] = jj_gen;
+ jj_la1[106] = jj_gen;
;
}
expr = refPrimaryExpression(bitAndToken);
@@ -5091,6 +5107,7 @@
expr = cloning();
break;
case ARRAY:
+ case LBRACKET:
expr = ArrayDeclarator();
break;
case LIST:
@@ -5103,7 +5120,7 @@
expr = IncludeExpression();
break;
default:
- jj_la1[108] = jj_gen;
+ jj_la1[107] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5132,7 +5149,7 @@
;
break;
default:
- jj_la1[109] = jj_gen;
+ jj_la1[108] = jj_gen;
break label_34;
}
expr = suffix(expr);
@@ -5179,7 +5196,7 @@
expr = Variable();
break;
default:
- jj_la1[110] = jj_gen;
+ jj_la1[109] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5208,7 +5225,7 @@
expr = arrayDeclarator(expr);
break;
default:
- jj_la1[111] = jj_gen;
+ jj_la1[110] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5229,7 +5246,7 @@
token = jj_consume_token(NAMESPACE_NAME);
break;
default:
- jj_la1[112] = jj_gen;
+ jj_la1[111] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5250,7 +5267,7 @@
token = jj_consume_token(IDENTIFIER);
break;
default:
- jj_la1[113] = jj_gen;
+ jj_la1[112] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5271,7 +5288,7 @@
token = jj_consume_token(IDENTIFIER);
break;
default:
- jj_la1[114] = jj_gen;
+ jj_la1[113] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5327,7 +5344,7 @@
expr = VariableDeclaratorId();
break;
default:
- jj_la1[115] = jj_gen;
+ jj_la1[114] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5399,7 +5416,7 @@
}
break;
default:
- jj_la1[116] = jj_gen;
+ jj_la1[115] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5418,15 +5435,55 @@
final public ArrayInitializer ArrayDeclarator() throws ParseException {
ArrayVariableDeclaration[] vars;
Token arrayToken;
- arrayToken = jj_consume_token(ARRAY);
- vars = ArrayInitializer();
- {if (true) return new ArrayInitializer(vars,
- arrayToken.sourceStart,
- token.sourceEnd,
- arrayToken.beginLine,
- token.endLine,
- arrayToken.beginColumn,
- token.endColumn);}
+ Token lbracketToken;
+ Token rbracketToken;
+ Expression expr;
+ List<ArrayVariableDeclaration> varList = new ArrayList<ArrayVariableDeclaration>();
+ int i = 0;
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case ARRAY:
+ arrayToken = jj_consume_token(ARRAY);
+ vars = ArrayInitializer();
+ {if (true) return new ArrayInitializer(vars,
+ arrayToken.sourceStart,
+ token.sourceEnd,
+ arrayToken.beginLine,
+ token.endLine,
+ arrayToken.beginColumn,
+ token.endColumn);}
+ break;
+ case LBRACKET:
+ lbracketToken = jj_consume_token(LBRACKET);
+ expr = Expression();
+ varList.add(new ArrayVariableDeclaration(i++,expr));
+ label_35:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case COMMA:
+ ;
+ break;
+ default:
+ jj_la1[116] = jj_gen;
+ break label_35;
+ }
+ jj_consume_token(COMMA);
+ expr = Expression();
+ varList.add(new ArrayVariableDeclaration(i++,expr));
+ }
+ rbracketToken = jj_consume_token(RBRACKET);
+ {if (true) return new ArrayInitializer(varList.toArray(new ArrayVariableDeclaration[varList.size()]),
+ lbracketToken.sourceStart,
+ rbracketToken.sourceEnd,
+ lbracketToken.beginLine,
+ rbracketToken.endLine,
+ lbracketToken.beginColumn,
+ rbracketToken.endColumn);}
+ break;
+ default:
+ jj_la1[117] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
throw new Error("Missing return statement in function");
}
@@ -5465,7 +5522,7 @@
abstractVariable = arrayDeclarator(prefix);
break;
default:
- jj_la1[117] = jj_gen;
+ jj_la1[118] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5537,7 +5594,7 @@
try {
methodIdentifier = methodIdentifier();
expr2 = new ConstantIdentifier(methodIdentifier);
- if (jj_2_5(2147483647)) {
+ if (jj_2_6(2147483647)) {
ArgumentList args;
args = arguments();
arguments = new FunctionCall(expr, true, expr2, args);
@@ -5564,7 +5621,7 @@
}
break;
default:
- jj_la1[118] = jj_gen;
+ jj_la1[119] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5642,7 +5699,7 @@
try {
methodIdentifier = methodIdentifier();
expression = new ConstantIdentifier(methodIdentifier);
- if (jj_2_6(2147483647)) {
+ if (jj_2_7(2147483647)) {
ArgumentList args;
args = arguments();
expression = new FunctionCall(prefix, false, expression, args);
@@ -5686,7 +5743,7 @@
token = jj_consume_token(FINAL);
break;
default:
- jj_la1[119] = jj_gen;
+ jj_la1[120] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5696,7 +5753,7 @@
expression = Variable();
break;
default:
- jj_la1[120] = jj_gen;
+ jj_la1[121] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5767,10 +5824,11 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
expression = Expression();
break;
default:
- jj_la1[121] = jj_gen;
+ jj_la1[122] = jj_gen;
;
}
try {
@@ -5824,10 +5882,11 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
expression = Expression();
break;
default:
- jj_la1[122] = jj_gen;
+ jj_la1[123] = jj_gen;
;
}
try {
@@ -5837,7 +5896,7 @@
}
break;
default:
- jj_la1[123] = jj_gen;
+ jj_la1[124] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5914,7 +5973,7 @@
{if (true) return stringLiteral;}
break;
default:
- jj_la1[124] = jj_gen;
+ jj_la1[125] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -6014,7 +6073,7 @@
Token identifier;
boolean hasDollar = false;
start = jj_consume_token(DOUBLEQUOTE);
- label_35:
+ label_36:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case DOLLARBRACE:
@@ -6023,8 +6082,8 @@
;
break;
default:
- jj_la1[125] = jj_gen;
- break label_35;
+ jj_la1[126] = jj_gen;
+ break label_36;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IDENTIFIER:
@@ -6045,7 +6104,7 @@
hasDollar = true;
break;
default:
- jj_la1[126] = jj_gen;
+ jj_la1[127] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -6058,7 +6117,7 @@
end = jj_consume_token(DOUBLEQUOTE2);
break;
default:
- jj_la1[127] = jj_gen;
+ jj_la1[128] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -6129,10 +6188,11 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
args = ArgumentList();
break;
default:
- jj_la1[128] = jj_gen;
+ jj_la1[129] = jj_gen;
;
}
try {
@@ -6194,15 +6254,15 @@
List<Expression> list = new ArrayList<Expression>();
arg = _argument();
list.add(arg);
- label_36:
+ label_37:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
;
break;
default:
- jj_la1[129] = jj_gen;
- break label_36;
+ jj_la1[130] = jj_gen;
+ break label_37;
}
jj_consume_token(COMMA);
try {
@@ -6266,13 +6326,14 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
arg = Expression();
break;
case FUNCTION:
arg = closureDeclaration();
break;
default:
- jj_la1[130] = jj_gen;
+ jj_la1[131] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -6290,9 +6351,9 @@
*/
final public Statement StatementNoBreak() throws ParseException {
Statement statement;
- if (jj_2_7(2)) {
+ if (jj_2_8(2)) {
statement = expressionStatement();
- } else if (jj_2_8(2)) {
+ } else if (jj_2_9(2)) {
statement = labeledStatement();
} else {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -6349,7 +6410,7 @@
currentSegment.add((Outlineable)statement);
break;
default:
- jj_la1[131] = jj_gen;
+ jj_la1[132] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -6403,15 +6464,15 @@
block = Block();
catchClause = catchClause();
catches.add(catchClause);
- label_37:
+ label_38:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case CATCH:
;
break;
default:
- jj_la1[132] = jj_gen;
- break label_37;
+ jj_la1[133] = jj_gen;
+ break label_38;
}
catchClause = catchClause();
catches.add(catchClause);
@@ -6571,15 +6632,15 @@
constToken = jj_consume_token(CONST);
constant = _const();
constList.add(constant);
- label_38:
+ label_39:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
;
break;
default:
- jj_la1[133] = jj_gen;
- break label_38;
+ jj_la1[134] = jj_gen;
+ break label_39;
}
jj_consume_token(COMMA);
try {
@@ -6774,6 +6835,7 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
case SEMICOLON:
case LBRACE:
statement = StatementNoBreak();
@@ -6782,7 +6844,7 @@
statement = BreakStatement();
break;
default:
- jj_la1[134] = jj_gen;
+ jj_la1[135] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -6812,15 +6874,15 @@
htmlStart = phpEnd.sourceEnd;
htmlLineStart = phpEnd.endLine;
htmlColumnStart = phpEnd.endColumn;
- label_39:
+ label_40:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PHPECHOSTART:
;
break;
default:
- jj_la1[135] = jj_gen;
- break label_39;
+ jj_la1[136] = jj_gen;
+ break label_40;
}
phpEchoBlock();
}
@@ -6833,7 +6895,7 @@
jj_consume_token(PHPSTARTSHORT);
break;
default:
- jj_la1[136] = jj_gen;
+ jj_la1[137] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -6879,7 +6941,7 @@
token = jj_consume_token(INCLUDE_ONCE);
break;
default:
- jj_la1[137] = jj_gen;
+ jj_la1[138] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -6913,6 +6975,7 @@
case DOLLAR:
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
+ case LBRACKET:
expr = primaryExpression();
break;
case NULL:
@@ -6947,7 +7010,7 @@
}
break;
default:
- jj_la1[138] = jj_gen;
+ jj_la1[139] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -7049,7 +7112,7 @@
column = expr.getBeginColumn();
break;
default:
- jj_la1[139] = jj_gen;
+ jj_la1[140] = jj_gen;
;
}
if (expr == null)
@@ -7066,15 +7129,15 @@
jj_input_stream.getBeginColumn(),
jj_input_stream.getEndColumn()));
}
- label_40:
+ label_41:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
;
break;
default:
- jj_la1[140] = jj_gen;
- break label_40;
+ jj_la1[141] = jj_gen;
+ break label_41;
}
try {
token = jj_consume_token(COMMA);
@@ -7103,7 +7166,7 @@
column = expr.getBeginColumn();
break;
default:
- jj_la1[141] = jj_gen;
+ jj_la1[142] = jj_gen;
;
}
}
@@ -7158,15 +7221,15 @@
expr = Expression();
if (expr != null)
expressions.add(expr);
- label_41:
+ label_42:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
;
break;
default:
- jj_la1[142] = jj_gen;
- break label_41;
+ jj_la1[143] = jj_gen;
+ break label_42;
}
jj_consume_token(COMMA);
expr = Expression();
@@ -7247,15 +7310,15 @@
pos = expr.getSourceEnd()+1;
line = expr.getEndLine();
column = expr.getEndColumn();
- label_42:
+ label_43:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
;
break;
default:
- jj_la1[143] = jj_gen;
- break label_42;
+ jj_la1[144] = jj_gen;
+ break label_43;
}
jj_consume_token(COMMA);
expr = Variable();
@@ -7302,15 +7365,15 @@
pos = expr.getSourceEnd()+1;
line=expr.getEndLine();
column=expr.getEndColumn();
- label_43:
+ label_44:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
;
break;
default:
- jj_la1[144] = jj_gen;
- break label_43;
+ jj_la1[145] = jj_gen;
+ break label_44;
}
jj_consume_token(COMMA);
expr = VariableDeclarator();
@@ -7458,7 +7521,7 @@
endColumn = token.endColumn;
fireParseError("'{' expected","{",e.currentToken);
}
- label_44:
+ label_45:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PHPEND:
@@ -7523,13 +7586,14 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
case SEMICOLON:
case LBRACE:
;
break;
default:
- jj_la1[145] = jj_gen;
- break label_44;
+ jj_la1[146] = jj_gen;
+ break label_45;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ABSTRACT:
@@ -7593,6 +7657,7 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
case SEMICOLON:
case LBRACE:
//{{{ BlockStatement()
@@ -7623,7 +7688,7 @@
}
break;
default:
- jj_la1[146] = jj_gen;
+ jj_la1[147] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -7710,6 +7775,7 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
case SEMICOLON:
case LBRACE:
try {
@@ -7756,7 +7822,7 @@
break;
default:
- jj_la1[147] = jj_gen;
+ jj_la1[148] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -7828,6 +7894,7 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
case SEMICOLON:
case LBRACE:
statement = StatementNoBreak();
@@ -7844,7 +7911,7 @@
break;
default:
- jj_la1[148] = jj_gen;
+ jj_la1[149] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -7863,15 +7930,15 @@
Expression var;
var = Expression();
list.add(var);
- label_45:
+ label_46:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
;
break;
default:
- jj_la1[149] = jj_gen;
- break label_45;
+ jj_la1[150] = jj_gen;
+ break label_46;
}
jj_consume_token(COMMA);
var = Expression();
@@ -7992,7 +8059,7 @@
cases = switchStatementColon(switchToken.sourceStart, switchToken.sourceEnd);
break;
default:
- jj_la1[150] = jj_gen;
+ jj_la1[151] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -8017,7 +8084,7 @@
int pos;
token = jj_consume_token(LBRACE);
pos = token.sourceEnd;
- label_46:
+ label_47:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case CASE:
@@ -8025,8 +8092,8 @@
;
break;
default:
- jj_la1[151] = jj_gen;
- break label_46;
+ jj_la1[152] = jj_gen;
+ break label_47;
}
cas = switchLabel0();
cases.add(cas);
@@ -8079,7 +8146,7 @@
token.endLine,
token.beginColumn,
token.endColumn));
- label_47:
+ label_48:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case CASE:
@@ -8087,8 +8154,8 @@
;
break;
default:
- jj_la1[152] = jj_gen;
- break label_47;
+ jj_la1[153] = jj_gen;
+ break label_48;
}
cas = switchLabel0();
cases.add(cas);
@@ -8141,7 +8208,7 @@
List<Statement> stmts = new ArrayList<Statement>();
int start = token.next.sourceStart;
expr = SwitchLabel();
- label_48:
+ label_49:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PHPEND:
@@ -8205,13 +8272,14 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
case SEMICOLON:
case LBRACE:
;
break;
default:
- jj_la1[153] = jj_gen;
- break label_48;
+ jj_la1[154] = jj_gen;
+ break label_49;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ABSTRACT:
@@ -8273,6 +8341,7 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
case SEMICOLON:
case LBRACE:
statement = BlockStatementNoBreak();
@@ -8287,7 +8356,7 @@
stmts.add(statement);
break;
default:
- jj_la1[154] = jj_gen;
+ jj_la1[155] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -8370,7 +8439,7 @@
token));
break;
default:
- jj_la1[155] = jj_gen;
+ jj_la1[156] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -8411,7 +8480,7 @@
{if (true) return null;}
break;
default:
- jj_la1[156] = jj_gen;
+ jj_la1[157] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -8472,11 +8541,12 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
expression = Expression();
pos = expression.getSourceEnd()+1;
break;
default:
- jj_la1[157] = jj_gen;
+ jj_la1[158] = jj_gen;
;
}
try {
@@ -8562,7 +8632,7 @@
final public List<Statement> statementList() throws ParseException {
List<Statement> list = new ArrayList<Statement>();
Statement statement;
- label_49:
+ label_50:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PHPEND:
@@ -8622,13 +8692,14 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
case SEMICOLON:
case LBRACE:
;
break;
default:
- jj_la1[158] = jj_gen;
- break label_49;
+ jj_la1[159] = jj_gen;
+ break label_50;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case TRY:
@@ -8687,6 +8758,7 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
case SEMICOLON:
case LBRACE:
statement = Statement();
@@ -8698,7 +8770,7 @@
list.add(statement);
break;
default:
- jj_la1[159] = jj_gen;
+ jj_la1[160] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -8728,15 +8800,15 @@
case COLON:
colonToken = jj_consume_token(COLON);
stmts = statementList();
- label_50:
+ label_51:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ELSEIF:
;
break;
default:
- jj_la1[160] = jj_gen;
- break label_50;
+ jj_la1[161] = jj_gen;
+ break label_51;
}
elseifStatement = elseIfStatementColon();
elseIfList.add(elseifStatement);
@@ -8746,7 +8818,7 @@
elseStatement = elseStatementColon();
break;
default:
- jj_la1[161] = jj_gen;
+ jj_la1[162] = jj_gen;
;
}
fireParseMessage(new PHPParseMessageEvent(INFO,
@@ -8867,6 +8939,7 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
case SEMICOLON:
case LBRACE:
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -8926,6 +8999,7 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
case SEMICOLON:
case LBRACE:
stmt = Statement();
@@ -8934,19 +9008,19 @@
stmt = htmlBlock();
break;
default:
- jj_la1[162] = jj_gen;
+ jj_la1[163] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- label_51:
+ label_52:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ELSEIF:
;
break;
default:
- jj_la1[163] = jj_gen;
- break label_51;
+ jj_la1[164] = jj_gen;
+ break label_52;
}
elseifStatement = elseIfStatement();
elseIfList.add(elseifStatement);
@@ -8975,7 +9049,7 @@
}
break;
default:
- jj_la1[164] = jj_gen;
+ jj_la1[165] = jj_gen;
;
}
elseIfs = new ElseIf[elseIfList.size()];
@@ -8992,7 +9066,7 @@
endColumn);}
break;
default:
- jj_la1[165] = jj_gen;
+ jj_la1[166] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -9208,13 +9282,14 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
case SEMICOLON:
case LBRACE:
statement = Statement();
{if (true) return statement;}
break;
default:
- jj_la1[166] = jj_gen;
+ jj_la1[167] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -9389,6 +9464,7 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
case SEMICOLON:
case LBRACE:
try {
@@ -9476,7 +9552,7 @@
}
break;
default:
- jj_la1[167] = jj_gen;
+ jj_la1[168] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -9561,10 +9637,11 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
initializations = ForInit();
break;
default:
- jj_la1[168] = jj_gen;
+ jj_la1[169] = jj_gen;
;
}
jj_consume_token(SEMICOLON);
@@ -9611,10 +9688,11 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
condition = Expression();
break;
default:
- jj_la1[169] = jj_gen;
+ jj_la1[170] = jj_gen;
;
}
jj_consume_token(SEMICOLON);
@@ -9661,10 +9739,11 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
increments = StatementExpressionList();
break;
default:
- jj_la1[170] = jj_gen;
+ jj_la1[171] = jj_gen;
;
}
jj_consume_token(RPAREN);
@@ -9725,6 +9804,7 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
case SEMICOLON:
case LBRACE:
action = Statement();
@@ -9806,7 +9886,7 @@
endColumn);}
break;
default:
- jj_la1[171] = jj_gen;
+ jj_la1[172] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -9818,7 +9898,7 @@
//{{{ ForInit()
final public Expression[] ForInit() throws ParseException {
Expression[] exprs;
- if (jj_2_9(2147483647)) {
+ if (jj_2_10(2147483647)) {
exprs = LocalVariableDeclaration();
{if (true) return exprs;}
} else {
@@ -9865,11 +9945,12 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
exprs = StatementExpressionList();
{if (true) return exprs;}
break;
default:
- jj_la1[172] = jj_gen;
+ jj_la1[173] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -9886,15 +9967,15 @@
Expression expr;
expr = Expression();
list.add(expr);
- label_52:
+ label_53:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
;
break;
default:
- jj_la1[173] = jj_gen;
- break label_52;
+ jj_la1[174] = jj_gen;
+ break label_53;
}
jj_consume_token(COMMA);
Expression();
@@ -9957,10 +10038,11 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
expr = Expression();
break;
default:
- jj_la1[174] = jj_gen;
+ jj_la1[175] = jj_gen;
;
}
try {
@@ -10051,13 +10133,14 @@
case IDENTIFIER:
case NAMESPACE_IDENTIFIER:
case LPAREN:
+ case LBRACKET:
expr = Expression();
end = expr.getSourceEnd();
endLine = expr.getEndLine();
endColumn = expr.getEndColumn();
break;
default:
- jj_la1[175] = jj_gen;
+ jj_la1[176] = jj_gen;
;
}
try {
@@ -10159,25 +10242,14 @@
finally { jj_save(8, xla); }
}
- private boolean jj_3R_309() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_342()) {
- jj_scanpos = xsp;
- if (jj_3R_343()) {
- jj_scanpos = xsp;
- if (jj_3R_344()) return true;
- }
- }
- return false;
+ private boolean jj_2_10(int xla) {
+ jj_la = xla; jj_lastpos = jj_scanpos = token;
+ try { return !jj_3_10(); }
+ catch(LookaheadSuccess ls) { return true; }
+ finally { jj_save(9, xla); }
}
- private boolean jj_3R_214() {
- if (jj_3R_226()) return true;
- return false;
- }
-
- private boolean jj_3R_74() {
+ private boolean jj_3R_79() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(85)) {
@@ -10208,276 +10280,260 @@
return false;
}
- private boolean jj_3R_213() {
- if (jj_3R_225()) return true;
+ private boolean jj_3R_66() {
+ if (jj_scan_token(INTEGER_LITERAL)) return true;
return false;
}
- private boolean jj_3R_234() {
- if (jj_3R_247()) return true;
+ private boolean jj_3R_55() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_66()) {
+ jj_scanpos = xsp;
+ if (jj_3R_67()) {
+ jj_scanpos = xsp;
+ if (jj_3R_68()) {
+ jj_scanpos = xsp;
+ if (jj_3R_69()) {
+ jj_scanpos = xsp;
+ if (jj_3R_70()) {
+ jj_scanpos = xsp;
+ if (jj_3R_71()) {
+ jj_scanpos = xsp;
+ if (jj_3R_72()) {
+ jj_scanpos = xsp;
+ if (jj_3R_73()) return true;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
return false;
}
- private boolean jj_3R_212() {
- if (jj_3R_224()) return true;
+ private boolean jj_3R_287() {
+ if (jj_3R_311()) return true;
return false;
}
- private boolean jj_3R_233() {
- if (jj_3R_246()) return true;
+ private boolean jj_3R_214() {
+ if (jj_3R_226()) return true;
return false;
}
- private boolean jj_3R_284() {
- if (jj_3R_308()) return true;
- return false;
- }
-
- private boolean jj_3R_283() {
+ private boolean jj_3R_286() {
if (jj_scan_token(BANG)) return true;
- if (jj_3R_309()) return true;
- return false;
- }
-
- private boolean jj_3R_77() {
- if (jj_scan_token(HEREDOCSTARTTOKEN)) return true;
- if (jj_scan_token(IDENTIFIER)) return true;
- return false;
- }
-
- private boolean jj_3R_386() {
- if (jj_scan_token(ELSEIF)) return true;
if (jj_3R_312()) return true;
- if (jj_scan_token(COLON)) return true;
- if (jj_3R_353()) return true;
return false;
}
- private boolean jj_3R_282() {
+ private boolean jj_3R_285() {
if (jj_scan_token(TILDE)) return true;
- if (jj_3R_254()) return true;
+ if (jj_3R_257()) return true;
return false;
}
- private boolean jj_3R_281() {
+ private boolean jj_3R_284() {
if (jj_scan_token(AT)) return true;
- if (jj_3R_254()) return true;
+ if (jj_3R_257()) return true;
return false;
}
- private boolean jj_3R_223() {
+ private boolean jj_3R_205() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_233()) {
+ if (jj_3R_214()) {
jj_scanpos = xsp;
- if (jj_3R_234()) return true;
+ if (jj_3R_215()) {
+ jj_scanpos = xsp;
+ if (jj_3R_216()) {
+ jj_scanpos = xsp;
+ if (jj_3R_217()) return true;
}
+ }
+ }
return false;
}
- private boolean jj_3R_68() {
- if (jj_3R_78()) return true;
- return false;
- }
-
- private boolean jj_3R_254() {
+ private boolean jj_3R_257() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_281()) {
+ if (jj_3R_284()) {
jj_scanpos = xsp;
- if (jj_3R_282()) {
+ if (jj_3R_285()) {
jj_scanpos = xsp;
- if (jj_3R_283()) {
+ if (jj_3R_286()) {
jj_scanpos = xsp;
- if (jj_3R_284()) return true;
+ if (jj_3R_287()) return true;
}
}
}
return false;
}
- private boolean jj_3R_67() {
- if (jj_3R_77()) return true;
+ private boolean jj_3R_375() {
+ if (jj_scan_token(ELSE)) return true;
+ if (jj_3R_226()) return true;
return false;
}
- private boolean jj_3R_66() {
- if (jj_scan_token(NULL)) return true;
+ private boolean jj_3R_374() {
+ if (jj_3R_391()) return true;
return false;
}
- private boolean jj_3R_65() {
- if (jj_scan_token(FALSE)) return true;
+ private boolean jj_3R_373() {
+ if (jj_3R_206()) return true;
return false;
}
- private boolean jj_3R_64() {
- if (jj_scan_token(TRUE)) return true;
+ private boolean jj_3R_372() {
+ if (jj_3R_226()) return true;
return false;
}
- private boolean jj_3R_63() {
- if (jj_scan_token(STRING_LITERAL)) return true;
+ private boolean jj_3R_245() {
+ if (jj_3R_257()) return true;
return false;
}
- private boolean jj_3R_62() {
- if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
+ private boolean jj_3R_357() {
+ if (jj_scan_token(ASSIGN)) return true;
+ if (jj_3R_225()) return true;
return false;
}
- private boolean jj_3R_61() {
- if (jj_scan_token(INTEGER_LITERAL)) return true;
- return false;
- }
-
- private boolean jj_3R_53() {
+ private boolean jj_3R_351() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_61()) {
+ if (jj_3R_372()) {
jj_scanpos = xsp;
- if (jj_3R_62()) {
- jj_scanpos = xsp;
- if (jj_3R_63()) {
- jj_scanpos = xsp;
- if (jj_3R_64()) {
- jj_scanpos = xsp;
- if (jj_3R_65()) {
- jj_scanpos = xsp;
- if (jj_3R_66()) {
- jj_scanpos = xsp;
- if (jj_3R_67()) {
- jj_scanpos = xsp;
- if (jj_3R_68()) return true;
+ if (jj_3R_373()) return true;
}
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_3R_374()) { jj_scanpos = xsp; break; }
}
- }
- }
- }
- }
- }
+ xsp = jj_scanpos;
+ if (jj_3R_375()) jj_scanpos = xsp;
return false;
}
- private boolean jj_3R_354() {
- if (jj_scan_token(ASSIGN)) return true;
- if (jj_3R_222()) return true;
- return false;
- }
-
- private boolean jj_3R_236() {
+ private boolean jj_3R_239() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(32)) jj_scanpos = xsp;
- if (jj_3R_248()) return true;
- if (jj_3R_250()) return true;
+ if (jj_3R_251()) return true;
+ if (jj_3R_253()) return true;
return false;
}
- private boolean jj_3R_242() {
- if (jj_3R_254()) return true;
+ private boolean jj_3R_110() {
+ if (jj_3R_74()) return true;
return false;
}
- private boolean jj_3R_211() {
- if (jj_3R_223()) return true;
- return false;
- }
-
- private boolean jj_3R_325() {
- if (jj_3R_120()) return true;
+ private boolean jj_3R_98() {
+ if (jj_scan_token(LBRACE)) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_354()) jj_scanpos = xsp;
+ if (jj_3R_110()) jj_scanpos = xsp;
+ if (jj_scan_token(RBRACE)) return true;
return false;
}
- private boolean jj_3R_202() {
+ private boolean jj_3R_328() {
+ if (jj_3R_142()) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_211()) {
- jj_scanpos = xsp;
- if (jj_3R_212()) {
- jj_scanpos = xsp;
- if (jj_3R_213()) {
- jj_scanpos = xsp;
- if (jj_3R_214()) return true;
- }
- }
- }
+ if (jj_3R_357()) jj_scanpos = xsp;
return false;
}
- private boolean jj_3R_372() {
- if (jj_scan_token(ELSE)) return true;
- if (jj_3R_223()) return true;
+ private boolean jj_3R_109() {
+ if (jj_3R_74()) return true;
return false;
}
- private boolean jj_3R_371() {
- if (jj_3R_388()) return true;
+ private boolean jj_3R_203() {
+ if (jj_scan_token(BIT_AND)) return true;
return false;
}
- private boolean jj_3R_200() {
- if (jj_scan_token(BIT_AND)) return true;
+ private boolean jj_3R_97() {
+ if (jj_scan_token(LBRACKET)) return true;
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_109()) jj_scanpos = xsp;
+ if (jj_scan_token(RBRACKET)) return true;
return false;
}
- private boolean jj_3R_370() {
- if (jj_3R_203()) return true;
+ private boolean jj_3R_199() {
+ if (jj_3R_206()) return true;
return false;
}
- private boolean jj_3R_369() {
- if (jj_3R_223()) return true;
+ private boolean jj_3R_84() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_97()) {
+ jj_scanpos = xsp;
+ if (jj_3R_98()) return true;
+ }
return false;
}
- private boolean jj_3R_224() {
+ private boolean jj_3R_227() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_235()) {
+ if (jj_3R_238()) {
jj_scanpos = xsp;
- if (jj_3R_236()) return true;
+ if (jj_3R_239()) return true;
}
return false;
}
- private boolean jj_3R_235() {
+ private boolean jj_3R_238() {
if (jj_scan_token(ABSTRACT)) return true;
- if (jj_3R_248()) return true;
- if (jj_3R_249()) return true;
+ if (jj_3R_251()) return true;
+ if (jj_3R_252()) return true;
return false;
}
- private boolean jj_3R_207() {
+ private boolean jj_3R_210() {
if (jj_scan_token(ARRAY)) return true;
return false;
}
- private boolean jj_3R_348() {
+ private boolean jj_3R_303() {
+ if (jj_scan_token(DEFINE)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ if (jj_3R_74()) return true;
+ if (jj_scan_token(COMMA)) return true;
+ if (jj_3R_74()) return true;
+ if (jj_scan_token(RPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_193() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_369()) {
+ if (jj_3R_198()) {
jj_scanpos = xsp;
- if (jj_3R_370()) return true;
+ if (jj_3R_199()) return true;
}
- while (true) {
- xsp = jj_scanpos;
- if (jj_3R_371()) { jj_scanpos = xsp; break; }
- }
- xsp = jj_scanpos;
- if (jj_3R_372()) jj_scanpos = xsp;
return false;
}
- private boolean jj_3R_175() {
- if (jj_3R_69()) return true;
+ private boolean jj_3R_198() {
+ if (jj_3R_205()) return true;
return false;
}
- private boolean jj_3R_243() {
+ private boolean jj_3R_246() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(105)) {
@@ -10487,155 +10543,72 @@
if (jj_scan_token(111)) return true;
}
}
- if (jj_3R_242()) return true;
+ if (jj_3R_245()) return true;
return false;
}
- private boolean jj_3R_163() {
- if (jj_scan_token(LBRACE)) return true;
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_175()) jj_scanpos = xsp;
- if (jj_scan_token(RBRACE)) return true;
+ private boolean jj_3R_94() {
+ if (jj_3R_108()) return true;
return false;
}
- private boolean jj_3R_199() {
+ private boolean jj_3R_326() {
+ if (jj_3R_74()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_202() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_206()) {
+ if (jj_3R_209()) {
jj_scanpos = xsp;
- if (jj_3R_207()) return true;
+ if (jj_3R_210()) return true;
}
return false;
}
- private boolean jj_3R_206() {
- if (jj_3R_221()) return true;
+ private boolean jj_3R_209() {
+ if (jj_3R_224()) return true;
return false;
}
- private boolean jj_3R_174() {
- if (jj_3R_69()) return true;
- return false;
- }
-
- private boolean jj_3R_162() {
- if (jj_scan_token(LBRACKET)) return true;
+ private boolean jj_3R_297() {
+ if (jj_scan_token(RETURN)) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_174()) jj_scanpos = xsp;
- if (jj_scan_token(RBRACKET)) return true;
+ if (jj_3R_326()) jj_scanpos = xsp;
+ if (jj_scan_token(SEMICOLON)) return true;
return false;
}
...
[truncated message content] |