[prev in list] [next in list] [prev in thread] [next in thread]
List: jedit-cvs
Subject: [ jEdit-CVS ] plugins/PHPParser/src/gatchan/phpparser/parser PHPParserTokenManager.java,1.60,1.61 PH
From: Matthieu Casanova <kpouer () users ! sourceforge ! net>
Date: 2006-03-27 13:40:32
Message-ID: E1FNrxR-00087R-99 () mail ! sourceforge ! net
[Download RAW message or body]
Update of /cvsroot/jedit/plugins/PHPParser/src/gatchan/phpparser/parser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17697/plugins/PHPParser/src/gatchan/phpparser/parser
Modified Files:
PHPParserTokenManager.java PHPParser.jj
PHPParserConstants.java PHPParser.java
Log Message:
bug 1458668 fixed
Index: PHPParser.java
===================================================================
RCS file: /cvsroot/jedit/plugins/PHPParser/src/gatchan/phpparser/parser/PHPParser.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- PHPParser.java 8 Mar 2006 08:17:49 -0000 1.76
+++ PHPParser.java 27 Mar 2006 13:40:30 -0000 1.77
@@ -7141,28 +7141,28 @@
//{{{ IF
//{{{ IfStatement()
final public IfStatement IfStatement() throws ParseException {
- final Expression condition;
- final IfStatement ifStatement;
- final Token ifToken;
+ Expression condition;
+ IfStatement ifStatement;
+ Token ifToken;
ifToken = jj_consume_token(IF);
condition = Condition("if");
- ifStatement = IfStatement0(condition,ifToken);
- {if (true) return ifStatement;}
+ ifStatement = ifStatementAction(condition,ifToken);
+ {if (true) return ifStatement;}
throw new Error("Missing return statement in function");
}
//}}}
-//{{{ IfStatement0(Expression condition, Token ifToken)
- final public IfStatement IfStatement0(Expression condition, Token ifToken) throws \
ParseException { +//{{{ ifStatementAction(Expression condition, Token ifToken)
+ final public IfStatement ifStatementAction(Expression condition, Token ifToken) \
throws ParseException { Statement statement = null;
- final Statement stmt;
- final Statement[] statementsArray;
+ Statement stmt;
+ Statement[] statementsArray;
ElseIf elseifStatement;
Else elseStatement = null;
- final ArrayList stmts;
- final ArrayList elseIfList = new ArrayList();
- final ElseIf[] elseIfs;
- final Token colonToken, elseToken;
+ ArrayList stmts;
+ ArrayList elseIfList = new ArrayList();
+ ElseIf[] elseIfs;
+ Token colonToken, elseToken;
int sourceEnd = 0;
int endColumn = 0;
int endLine = 0;
@@ -7295,11 +7295,11 @@
case LBRACE:
case SEMICOLON:
statement = Statement();
- stmts.add(statement);
+ stmts.add(statement);
break;
case PHPEND:
statement = htmlBlock();
- if (statement != null) stmts.add(statement);
+ if (statement != null) stmts.add(statement);
break;
default:
jj_la1[137] = jj_gen;
@@ -7937,8 +7937,8 @@
//{{{ WhileStatementAction(Token whileToken)
final public Statement WhileStatementAction(Token whileToken) throws \
ParseException { Statement statement;
- final ArrayList stmts = new ArrayList();
- final Token colonToken;
+ ArrayList stmts;
+ Token colonToken;
int end = 0;
int endLine = 0;
int endColumn = 0;
@@ -7946,9 +7946,11 @@
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COLON:
colonToken = jj_consume_token(COLON);
+ stmts = new ArrayList();
label_49:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case PHPEND:
case TRY:
case THROW:
case IF:
@@ -8011,8 +8013,75 @@
jj_la1[148] = jj_gen;
break label_49;
}
- statement = Statement();
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case TRY:
+ case THROW:
+ case IF:
+ case ARRAY:
+ case BREAK:
+ case LIST:
+ case PRINT:
+ case ECHO:
+ case INCLUDE:
+ case REQUIRE:
+ case INCLUDE_ONCE:
+ case REQUIRE_ONCE:
+ case GLOBAL:
+ case STATIC:
+ case CONTINUE:
+ case DO:
+ case FOR:
+ case NEW:
+ case RETURN:
+ case SWITCH:
+ case WHILE:
+ case FOREACH:
+ case DEFINE:
+ case GOTO:
+ case NULL:
+ case SUPER:
+ case THIS:
+ case TRUE:
+ case FALSE:
+ case STRING:
+ case OBJECT:
+ case BOOL:
+ case BOOLEAN:
+ case REAL:
+ case DOUBLE:
+ case FLOAT:
+ case INT:
+ case INTEGER:
+ case AT:
+ case BANG:
+ case TILDE:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
+ case PLUS:
+ case MINUS:
+ case BIT_AND:
+ case INTEGER_LITERAL:
+ case FLOATING_POINT_LITERAL:
+ case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case HEREDOCSTARTTOKEN:
+ case DOLLAR:
+ case IDENTIFIER:
+ case LPAREN:
+ case LBRACE:
+ case SEMICOLON:
+ statement = Statement();
stmts.add(statement);
+ break;
+ case PHPEND:
+ statement = htmlBlock();
+ if (statement != null) stmts.add(statement);
+ break;
+ default:
+ jj_la1[149] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
}
fireParseMessage(new PHPParseMessageEvent(INFO,
\
PHPParseMessageEvent.MESSAGE_WHILE_ENDWHILE_TAG, @@ -8108,7 +8177,7 @@
{if (true) return statement;}
break;
default:
- jj_la1[149] = jj_gen;
+ jj_la1[150] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -8418,7 +8487,7 @@
;
break;
default:
- jj_la1[150] = jj_gen;
+ jj_la1[151] = jj_gen;
break label_50;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -8487,7 +8556,7 @@
if (statement != null) list.add(statement);
break;
default:
- jj_la1[151] = jj_gen;
+ jj_la1[152] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -8560,7 +8629,7 @@
}
break;
default:
- jj_la1[152] = jj_gen;
+ jj_la1[153] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -8647,7 +8716,7 @@
initializations = ForInit();
break;
default:
- jj_la1[153] = jj_gen;
+ jj_la1[154] = jj_gen;
;
}
jj_consume_token(SEMICOLON);
@@ -8695,7 +8764,7 @@
condition = Expression();
break;
default:
- jj_la1[154] = jj_gen;
+ jj_la1[155] = jj_gen;
;
}
jj_consume_token(SEMICOLON);
@@ -8743,7 +8812,7 @@
increments = StatementExpressionList();
break;
default:
- jj_la1[155] = jj_gen;
+ jj_la1[156] = jj_gen;
;
}
jj_consume_token(RPAREN);
@@ -8881,7 +8950,7 @@
;
break;
default:
- jj_la1[156] = jj_gen;
+ jj_la1[157] = jj_gen;
break label_51;
}
action = Statement();
@@ -8951,7 +9020,7 @@
endColumn);}
break;
default:
- jj_la1[157] = jj_gen;
+ jj_la1[158] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -9011,7 +9080,7 @@
{if (true) return exprs;}
break;
default:
- jj_la1[158] = jj_gen;
+ jj_la1[159] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -9035,7 +9104,7 @@
;
break;
default:
- jj_la1[159] = jj_gen;
+ jj_la1[160] = jj_gen;
break label_52;
}
jj_consume_token(COMMA);
@@ -9099,7 +9168,7 @@
expr = Expression();
break;
default:
- jj_la1[160] = jj_gen;
+ jj_la1[161] = jj_gen;
;
}
try {
@@ -9198,7 +9267,7 @@
endColumn = expr.getEndColumn();
break;
default:
- jj_la1[161] = jj_gen;
+ jj_la1[162] = jj_gen;
;
}
try {
@@ -10156,6 +10225,11 @@
return false;
}
+ final private boolean jj_3_7() {
+ if (jj_3R_60()) return true;
+ return false;
+ }
+
final private boolean jj_3R_112() {
if (jj_3R_54()) return true;
Token xsp;
@@ -10195,11 +10269,6 @@
return false;
}
- final private boolean jj_3_7() {
- if (jj_3R_60()) return true;
- return false;
- }
-
final private boolean jj_3R_197() {
if (jj_scan_token(LPAREN)) return true;
if (jj_3R_69()) return true;
@@ -10686,7 +10755,7 @@
public boolean lookingAhead = false;
private boolean jj_semLA;
private int jj_gen;
- final private int[] jj_la1 = new int[162];
+ final private int[] jj_la1 = new int[163];
static private int[] jj_la1_0;
static private int[] jj_la1_1;
static private int[] jj_la1_2;
@@ -10702,22 +10771,22 @@
jj_la1_5();
}
private static void jj_la1_0() {
- jj_la1_0 = new int[] \
{0x6000001e,0x6,0x6,0x6000001e,0x0,0x60000000,0x0,0x0,0x4000000,0x4000000,0x0,0x200000 \
00,0x0,0x0,0x80000000,0x1c000000,0x3c000000,0x1c000000,0x0,0x1c000000,0x1c000000,0x200 \
00000,0x1c000000,0x20000000,0x1c000000,0x20000000,0x3c000000,0x0,0x0,0x1c000000,0x0,0x \
0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, \
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x \
0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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,0x \
0,0x0,0x60000010,0x60000010,0x60000000,0x20000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20 \
000010,0x20000010,0x0,0x0,0x0,0x10,0x10,0x0,0x0,0x10,0x0,0x0,0x10,0x10,0x10,0x10,0x10,0x0,0x0,0x10,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+ jj_la1_0 = new int[] \
{0x6000001e,0x6,0x6,0x6000001e,0x0,0x60000000,0x0,0x0,0x4000000,0x4000000,0x0,0x200000 \
00,0x0,0x0,0x80000000,0x1c000000,0x3c000000,0x1c000000,0x0,0x1c000000,0x1c000000,0x200 \
00000,0x1c000000,0x20000000,0x1c000000,0x20000000,0x3c000000,0x0,0x0,0x1c000000,0x0,0x \
0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, \
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x \
0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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,0x \
0,0x0,0x60000010,0x60000010,0x60000000,0x20000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20 \
000010,0x20000010,0x0,0x0,0x0,0x10,0x10,0x0,0x0,0x10,0x0,0x0,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x0,0x10,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
}
private static void jj_la1_1() {
- jj_la1_1 = new int[] \
{0xfa9ffcbb,0x0,0x0,0xfa9ffcbb,0x0,0xfa9ffcbb,0x0,0x4000000,0x20,0x0,0x1,0x11,0x400000 \
0,0x0,0x0,0x500060,0x500061,0x100000,0x400020,0x500060,0x100000,0x1,0x100000,0x1,0x100 \
000,0x400021,0x500061,0x0,0x400000,0x100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000400 \
,0x0,0x1007b400,0x0,0x0,0x0,0x10000000,0x0,0x0,0x10000400,0x10000400,0x10000400,0x0,0x \
0,0x1007b400,0x10079400,0x10079400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 \
,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10079400,0x10079400,0x10079400,0x0,0x10079400,0x400 \
,0x0,0x0,0x0,0x10079400,0x0,0x0,0x0,0x10000000,0x0,0x0,0x0,0x0,0x10000000,0x0,0x100010 \
00,0x1007b400,0x1007b400,0x0,0x0,0x0,0x0,0x0,0x1007b400,0x0,0xea98408a,0x4,0xfa9ffc8a, \
0x0,0x0,0x78000,0x10079400,0x0,0x0,0x0,0x0,0x0,0x0,0xfa9ffcbb,0xfa9ffcbb,0xfa9ffcbb,0x \
fa9ff4bb,0x0,0x0,0x0,0x0,0x10079400,0x0,0x1200000,0x1200000,0xfa9ffcbb,0xfa9ffcbb,0x0, \
0x1200000,0x1007b400,0xfa9ffc8a,0xfa9ffc8a,0x100,0x200,0xfa9ffc8a,0x100,0x200,0xfa9ffc8a,0xfa9ffc8a,0x
fa9ffc8a,0xfa9ffc8a,0xfa9ffc8a,0xfa9ffc8a,0xfa9ffc8a,0xfa9ffc8a,0xfa9ffc8a,0xfa9ffc8 \
a,0x1007b400,0x1007b400,0x1007b400,0xfa9ffc8a,0xfa9ffc8a,0x1007b400,0x0,0x1007b400,0x1007b400,};
+ jj_la1_1 = new int[] \
{0xfa9ffcbb,0x0,0x0,0xfa9ffcbb,0x0,0xfa9ffcbb,0x0,0x4000000,0x20,0x0,0x1,0x11,0x400000 \
0,0x0,0x0,0x500060,0x500061,0x100000,0x400020,0x500060,0x100000,0x1,0x100000,0x1,0x100 \
000,0x400021,0x500061,0x0,0x400000,0x100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000400 \
,0x0,0x1007b400,0x0,0x0,0x0,0x10000000,0x0,0x0,0x10000400,0x10000400,0x10000400,0x0,0x \
0,0x1007b400,0x10079400,0x10079400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 \
,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10079400,0x10079400,0x10079400,0x0,0x10079400,0x400 \
,0x0,0x0,0x0,0x10079400,0x0,0x0,0x0,0x10000000,0x0,0x0,0x0,0x0,0x10000000,0x0,0x100010 \
00,0x1007b400,0x1007b400,0x0,0x0,0x0,0x0,0x0,0x1007b400,0x0,0xea98408a,0x4,0xfa9ffc8a, \
0x0,0x0,0x78000,0x10079400,0x0,0x0,0x0,0x0,0x0,0x0,0xfa9ffcbb,0xfa9ffcbb,0xfa9ffcbb,0x \
fa9ff4bb,0x0,0x0,0x0,0x0,0x10079400,0x0,0x1200000,0x1200000,0xfa9ffcbb,0xfa9ffcbb,0x0, \
0x1200000,0x1007b400,0xfa9ffc8a,0xfa9ffc8a,0x100,0x200,0xfa9ffc8a,0x100,0x200,0xfa9ffc8a,0xfa9ffc8a,0x
fa9ffc8a,0xfa9ffc8a,0xfa9ffc8a,0xfa9ffc8a,0xfa9ffc8a,0xfa9ffc8a,0xfa9ffc8a,0xfa9ffc8 \
a,0xfa9ffc8a,0x1007b400,0x1007b400,0x1007b400,0xfa9ffc8a,0xfa9ffc8a,0x1007b400,0x0,0x1007b400,0x1007b400,};
}
private static void jj_la1_2() {
- jj_la1_2 = new int[] \
{0x3ffdfc20,0x0,0x0,0x3ffdfc20,0x0,0x3ffdfc20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, \
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0 \
x100,0x7fdec00,0x200,0x3ffdfc00,0x0,0x0,0x0,0x7fdec00,0x7fc6c00,0x0,0x7fdec00,0x7fdec0 \
0,0x7fdec00,0x0,0x7fc0000,0x3ffdfc00,0x3ffdfc00,0x3ffc6c00,0x0,0x40000000,0x0,0x0,0x0, \
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3ffdfc00,0x1ffdf \
c00,0x7fdfc00,0x0,0x7fdfc00,0x7fc0000,0x0,0x0,0x0,0x7fc6c00,0x100,0x0,0x0,0x7fc6c00,0x \
80,0x80,0x80,0x0,0x7fdec00,0x80,0x7fdec00,0x3ffdfc00,0x3ffdfc00,0x0,0x19000,0x0,0x0,0x \
0,0x3ffdfc00,0x0,0x420,0x0,0x3ffdfc20,0x0,0x0,0x0,0x7fdfc00,0x0,0x0,0x0,0x0,0x0,0x0,0x \
3ffdfc20,0x3ffdfc20,0x3ffdfc20,0x3ffdfc20,0x0,0x0,0x0,0x0,0x7fc6c00,0x80000000,0x0,0x0 \
,0x3ffdfc20,0x3ffdfc20,0x80000000,0x0,0x3ffdfc00,0x3ffdfc20,0x3ffdfc20,0x0,0x0,0x3ffdf \
c20,0x0,0x0,0xbffdfc20,0x3ffdfc20,0x3ffdfc20,0x3ffdfc20,0x3ffdfc20,0x3ffdfc20,0xbffdfc20,0x3ffdfc20,0x
3ffdfc20,0xbffdfc20,0x3ffdfc00,0x3ffdfc00,0x3ffdfc00,0x3ffdfc20,0xbffdfc20,0x3ffdfc00,0x0,0x3ffdfc00,0x3ffdfc00,};
+ jj_la1_2 = new int[] \
{0x3ffdfc20,0x0,0x0,0x3ffdfc20,0x0,0x3ffdfc20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, \
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0 \
x100,0x7fdec00,0x200,0x3ffdfc00,0x0,0x0,0x0,0x7fdec00,0x7fc6c00,0x0,0x7fdec00,0x7fdec0 \
0,0x7fdec00,0x0,0x7fc0000,0x3ffdfc00,0x3ffdfc00,0x3ffc6c00,0x0,0x40000000,0x0,0x0,0x0, \
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3ffdfc00,0x1ffdf \
c00,0x7fdfc00,0x0,0x7fdfc00,0x7fc0000,0x0,0x0,0x0,0x7fc6c00,0x100,0x0,0x0,0x7fc6c00,0x \
80,0x80,0x80,0x0,0x7fdec00,0x80,0x7fdec00,0x3ffdfc00,0x3ffdfc00,0x0,0x19000,0x0,0x0,0x \
0,0x3ffdfc00,0x0,0x420,0x0,0x3ffdfc20,0x0,0x0,0x0,0x7fdfc00,0x0,0x0,0x0,0x0,0x0,0x0,0x \
3ffdfc20,0x3ffdfc20,0x3ffdfc20,0x3ffdfc20,0x0,0x0,0x0,0x0,0x7fc6c00,0x80000000,0x0,0x0 \
,0x3ffdfc20,0x3ffdfc20,0x80000000,0x0,0x3ffdfc00,0x3ffdfc20,0x3ffdfc20,0x0,0x0,0x3ffdf \
c20,0x0,0x0,0xbffdfc20,0x3ffdfc20,0x3ffdfc20,0x3ffdfc20,0x3ffdfc20,0x3ffdfc20,0x3ffdfc20,0xbffdfc20,0x
3ffdfc20,0x3ffdfc20,0xbffdfc20,0x3ffdfc00,0x3ffdfc00,0x3ffdfc00,0x3ffdfc20,0xbffdfc20,0x3ffdfc00,0x0,0x3ffdfc00,0x3ffdfc00,};
}
private static void jj_la1_3() {
- jj_la1_3 = new int[] \
{0x1144013c,0x0,0x0,0x1144013c,0x0,0x1144013c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, \
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x440000,0 \
x440000,0x0,0x30,0x0,0x1144013c,0x0,0x0,0x100,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x11 \
44013c,0x1144013c,0x100,0x0,0x0,0x18001,0x18001,0x20002,0x20002,0x0,0x200,0x400,0x100, \
0x0,0x0,0x0,0x0,0x0,0x7000,0x7000,0x30,0x30,0x8c0,0x8c0,0x1144013c,0x1144013c,0x114401 \
3c,0xc,0x11440100,0x0,0xc,0xc,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, \
0x1144013c,0x1144013c,0x0,0x11440000,0x20000000,0x80000000,0x80000000,0x1144013c,0x0,0 \
x0,0x0,0x1144013c,0x0,0x0,0x0,0x11440100,0x0,0x0,0x0,0x0,0x0,0x0,0x1144013c,0x1144013c \
,0x1144013c,0x1144013c,0x0,0x0,0xc,0xc,0x10c,0x0,0x0,0x0,0x1144013c,0x1144013c,0x0,0x0 \
,0x1144013c,0x1144013c,0x1144013c,0x0,0x0,0x1144013c,0x0,0x0,0x1144013c,0x1144013c,0x1 \
144013c,0x1144013c,0x1144013c,0x1144013c,0x1144013c,0x1144013c,0x1144013c,0x1144013c,0x1144013c,0x1144
013c,0x1144013c,0x1144013c,0x1144013c,0x1144013c,0x0,0x1144013c,0x1144013c,};
+ jj_la1_3 = new int[] \
{0x1144013c,0x0,0x0,0x1144013c,0x0,0x1144013c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, \
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x440000,0 \
x440000,0x0,0x30,0x0,0x1144013c,0x0,0x0,0x100,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x11 \
44013c,0x1144013c,0x100,0x0,0x0,0x18001,0x18001,0x20002,0x20002,0x0,0x200,0x400,0x100, \
0x0,0x0,0x0,0x0,0x0,0x7000,0x7000,0x30,0x30,0x8c0,0x8c0,0x1144013c,0x1144013c,0x114401 \
3c,0xc,0x11440100,0x0,0xc,0xc,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, \
0x1144013c,0x1144013c,0x0,0x11440000,0x20000000,0x80000000,0x80000000,0x1144013c,0x0,0 \
x0,0x0,0x1144013c,0x0,0x0,0x0,0x11440100,0x0,0x0,0x0,0x0,0x0,0x0,0x1144013c,0x1144013c \
,0x1144013c,0x1144013c,0x0,0x0,0xc,0xc,0x10c,0x0,0x0,0x0,0x1144013c,0x1144013c,0x0,0x0 \
,0x1144013c,0x1144013c,0x1144013c,0x0,0x0,0x1144013c,0x0,0x0,0x1144013c,0x1144013c,0x1 \
144013c,0x1144013c,0x1144013c,0x1144013c,0x1144013c,0x1144013c,0x1144013c,0x1144013c,0x1144013c,0x1144
013c,0x1144013c,0x1144013c,0x1144013c,0x1144013c,0x1144013c,0x0,0x1144013c,0x1144013c,};
}
private static void jj_la1_4() {
- jj_la1_4 = new int[] \
{0x114380,0x0,0x0,0x114380,0x100000,0x114380,0x200000,0x0,0x0,0x0,0x0,0x0,0x0,0x200000 \
,0x0,0x100,0x100,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x100,0x100,0x200000,0x0,0x0,0x10 \
200,0x0,0x0,0x50000,0x10300,0x0,0x0,0x0,0x300,0x0,0x4380,0x200000,0x110000,0x0,0x200,0 \
x200,0x200000,0x300,0x200,0x200,0x0,0x0,0x4380,0x4380,0x300,0x0,0x0,0x0,0x0,0x0,0x0,0x \
400000,0x0,0x0,0x0,0xf2000000,0xf2000000,0x0,0xd800000,0xd800000,0x0,0x0,0x0,0x0,0x0,0 \
x0,0x4380,0x4380,0x4380,0x0,0x4380,0x0,0x0,0x0,0x0,0x300,0x0,0x4000,0x4000,0x300,0x540 \
00,0x54000,0x0,0x4000,0x300,0x50000,0x10300,0x4380,0x4380,0x50000,0x80,0x0,0x200,0x200 \
,0x4380,0x200000,0x110000,0x0,0x114380,0x0,0x0,0x0,0x4380,0x100,0x200000,0x100,0x20000 \
0,0x200000,0x200000,0x114380,0x114380,0x114380,0x114380,0x200000,0x0,0x0,0x0,0x300,0x1 \
0000,0x0,0x0,0x114380,0x114380,0x100000,0x0,0x4380,0x114380,0x114380,0x0,0x0,0x114380, \
0x0,0x0,0x114380,0x114380,0x114380,0x114380,0x114380,0x114380,0x114380,0x114380,0x114380,0x114380,0x43
80,0x4380,0x4380,0x114380,0x114380,0x4380,0x200000,0x4380,0x4380,};
+ jj_la1_4 = new int[] \
{0x114380,0x0,0x0,0x114380,0x100000,0x114380,0x200000,0x0,0x0,0x0,0x0,0x0,0x0,0x200000 \
,0x0,0x100,0x100,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x100,0x100,0x200000,0x0,0x0,0x10 \
200,0x0,0x0,0x50000,0x10300,0x0,0x0,0x0,0x300,0x0,0x4380,0x200000,0x110000,0x0,0x200,0 \
x200,0x200000,0x300,0x200,0x200,0x0,0x0,0x4380,0x4380,0x300,0x0,0x0,0x0,0x0,0x0,0x0,0x \
400000,0x0,0x0,0x0,0xf2000000,0xf2000000,0x0,0xd800000,0xd800000,0x0,0x0,0x0,0x0,0x0,0 \
x0,0x4380,0x4380,0x4380,0x0,0x4380,0x0,0x0,0x0,0x0,0x300,0x0,0x4000,0x4000,0x300,0x540 \
00,0x54000,0x0,0x4000,0x300,0x50000,0x10300,0x4380,0x4380,0x50000,0x80,0x0,0x200,0x200 \
,0x4380,0x200000,0x110000,0x0,0x114380,0x0,0x0,0x0,0x4380,0x100,0x200000,0x100,0x20000 \
0,0x200000,0x200000,0x114380,0x114380,0x114380,0x114380,0x200000,0x0,0x0,0x0,0x300,0x1 \
0000,0x0,0x0,0x114380,0x114380,0x100000,0x0,0x4380,0x114380,0x114380,0x0,0x0,0x114380, \
0x0,0x0,0x114380,0x114380,0x114380,0x114380,0x114380,0x114380,0x114380,0x114380,0x114380,0x114380,0x11
4380,0x4380,0x4380,0x4380,0x114380,0x114380,0x4380,0x200000,0x4380,0x4380,};
}
private static void jj_la1_5() {
- jj_la1_5 = new int[] \
{0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0 \
x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 \
,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1fff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x \
0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, \
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x \
0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0, \
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0 \
x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 \
,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1fff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x \
0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, \
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x \
0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0, \
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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[7];
private boolean jj_rescan = false;
@@ -10729,7 +10798,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 162; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 163; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -10739,7 +10808,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 162; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 163; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -10749,7 +10818,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 162; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 163; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -10759,7 +10828,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 162; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 163; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -10768,7 +10837,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 162; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 163; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -10777,7 +10846,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 162; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 163; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -10896,7 +10965,7 @@
la1tokens[jj_kind] = true;
jj_kind = -1;
}
- for (int i = 0; i < 162; i++) {
+ for (int i = 0; i < 163; i++) {
if (jj_la1[i] == jj_gen) {
for (int j = 0; j < 32; j++) {
if ((jj_la1_0[i] & (1<<j)) != 0) {
Index: PHPParser.jj
===================================================================
RCS file: /cvsroot/jedit/plugins/PHPParser/src/gatchan/phpparser/parser/PHPParser.jj,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- PHPParser.jj 8 Mar 2006 08:17:36 -0000 1.75
+++ PHPParser.jj 27 Mar 2006 13:40:30 -0000 1.76
@@ -5498,30 +5498,32 @@
IfStatement IfStatement() :
{
- final Expression condition;
- final IfStatement ifStatement;
- final Token ifToken;
+ Expression condition;
+ IfStatement ifStatement;
+ Token ifToken;
}
{
ifToken = <IF> condition = Condition("if")
- ifStatement = IfStatement0(condition,ifToken)
- {return ifStatement;}
+ ifStatement = ifStatementAction(condition,ifToken)
+ {
+ return ifStatement;
+ }
}
//}}}
-//{{{ IfStatement0(Expression condition, Token ifToken)
+//{{{ ifStatementAction(Expression condition, Token ifToken)
- IfStatement IfStatement0(Expression condition, Token ifToken) :
+IfStatement ifStatementAction(Expression condition, Token ifToken) :
{
Statement statement = null;
- final Statement stmt;
- final Statement[] statementsArray;
+ Statement stmt;
+ Statement[] statementsArray;
ElseIf elseifStatement;
Else elseStatement = null;
- final ArrayList stmts;
- final ArrayList elseIfList = new ArrayList();
- final ElseIf[] elseIfs;
- final Token colonToken, elseToken;
+ ArrayList stmts;
+ ArrayList elseIfList = new ArrayList();
+ ElseIf[] elseIfs;
+ Token colonToken, elseToken;
int sourceEnd = 0;
int endColumn = 0;
int endLine = 0;
@@ -5532,15 +5534,16 @@
{
stmts = new ArrayList();
}
- ( statement = Statement()
- {
- stmts.add(statement);
- }
+ (
+ statement = Statement()
+ {
+ stmts.add(statement);
+ }
|
- statement = htmlBlock()
- {
- if (statement != null) stmts.add(statement);
- }
+ statement = htmlBlock()
+ {
+ if (statement != null) stmts.add(statement);
+ }
)*
(elseifStatement = ElseIfStatementColon() {elseIfList.add(elseifStatement);})*
[elseStatement = ElseStatementColon()]
@@ -5761,8 +5764,8 @@
Statement WhileStatementAction(Token whileToken) :
{
Statement statement;
- final ArrayList stmts = new ArrayList();
- final Token colonToken;
+ ArrayList stmts;
+ Token colonToken;
int end = 0;
int endLine = 0;
int endColumn = 0;
@@ -5770,11 +5773,19 @@
}
{
colonToken = <COLON>
+ {
+ stmts = new ArrayList();
+ }
(
statement = Statement()
{
stmts.add(statement);
}
+ |
+ statement = htmlBlock()
+ {
+ if (statement != null) stmts.add(statement);
+ }
)*
{
fireParseMessage(new PHPParseMessageEvent(INFO,
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
jEdit-CVS mailing list
jEdit-CVS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jedit-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic