You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by by...@apache.org on 2009/01/19 11:59:29 UTC
svn commit: r735657 [1/2] - in
/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser:
Parser.java Parser.jj ParserConstants.java ParserTokenManager.java
ParserTreeConstants.java
Author: byron
Date: Mon Jan 19 02:59:28 2009
New Revision: 735657
URL: http://svn.apache.org/viewvc?rev=735657&view=rev
Log:
VELOCITY-668 Run javacc for changes to Parser.jjt
Modified:
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserConstants.java
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java
Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java?rev=735657&r1=735656&r2=735657&view=diff
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java Mon Jan 19 02:59:28 2009
@@ -2666,97 +2666,142 @@
}
}
- private boolean jj_2_1(int xla) {
+ final private boolean jj_2_1(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
try { return !jj_3_1(); }
catch(LookaheadSuccess ls) { return true; }
finally { jj_save(0, xla); }
}
- private boolean jj_2_2(int xla) {
+ final private boolean jj_2_2(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
try { return !jj_3_2(); }
catch(LookaheadSuccess ls) { return true; }
finally { jj_save(1, xla); }
}
- private boolean jj_2_3(int xla) {
+ final private boolean jj_2_3(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
try { return !jj_3_3(); }
catch(LookaheadSuccess ls) { return true; }
finally { jj_save(2, xla); }
}
- private boolean jj_2_4(int xla) {
+ final private boolean jj_2_4(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
try { return !jj_3_4(); }
catch(LookaheadSuccess ls) { return true; }
finally { jj_save(3, xla); }
}
- private boolean jj_2_5(int xla) {
+ final private boolean jj_2_5(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
try { return !jj_3_5(); }
catch(LookaheadSuccess ls) { return true; }
finally { jj_save(4, xla); }
}
- private boolean jj_2_6(int xla) {
+ final private boolean jj_2_6(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
try { return !jj_3_6(); }
catch(LookaheadSuccess ls) { return true; }
finally { jj_save(5, xla); }
}
- private boolean jj_2_7(int xla) {
+ final private boolean jj_2_7(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
try { return !jj_3_7(); }
catch(LookaheadSuccess ls) { return true; }
finally { jj_save(6, xla); }
}
- private boolean jj_2_8(int xla) {
+ final private boolean jj_2_8(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
try { return !jj_3_8(); }
catch(LookaheadSuccess ls) { return true; }
finally { jj_save(7, xla); }
}
- private boolean jj_2_9(int xla) {
+ final private boolean jj_2_9(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
try { return !jj_3_9(); }
catch(LookaheadSuccess ls) { return true; }
finally { jj_save(8, xla); }
}
- private boolean jj_2_10(int xla) {
+ final 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_2_11(int xla) {
+ final private boolean jj_2_11(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
try { return !jj_3_11(); }
catch(LookaheadSuccess ls) { return true; }
finally { jj_save(10, xla); }
}
- private boolean jj_2_12(int xla) {
+ final private boolean jj_2_12(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
try { return !jj_3_12(); }
catch(LookaheadSuccess ls) { return true; }
finally { jj_save(11, xla); }
}
- private boolean jj_3R_97() {
+ final private boolean jj_3R_64() {
+ if (jj_scan_token(WORD)) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_60() {
+ if (jj_scan_token(IDENTIFIER)) return true;
+ return false;
+ }
+
+ final private boolean jj_3_10() {
+ if (jj_3R_33()) return true;
+ return false;
+ }
+
+ final private boolean jj_3_4() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_scan_token(31)) jj_scanpos = xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_27()) jj_scanpos = xsp;
+ if (jj_3R_28()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_31() {
+ if (jj_3R_40()) return true;
+ return false;
+ }
+
+ final private boolean jj_3_8() {
+ if (jj_3R_33()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_74() {
+ if (jj_3R_73()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_65() {
+ if (jj_scan_token(STRING_LITERAL)) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_97() {
if (jj_scan_token(COMMA)) return true;
if (jj_3R_29()) return true;
return false;
}
- private boolean jj_3_12() {
+ final private boolean jj_3_12() {
if (jj_scan_token(LBRACKET)) return true;
Token xsp;
xsp = jj_scanpos;
@@ -2772,47 +2817,47 @@
return false;
}
- private boolean jj_3R_71() {
+ final private boolean jj_3R_71() {
if (jj_scan_token(FALSE)) return true;
return false;
}
- private boolean jj_3R_40() {
+ final private boolean jj_3R_40() {
if (jj_scan_token(INTEGER_LITERAL)) return true;
return false;
}
- private boolean jj_3R_63() {
+ final private boolean jj_3R_63() {
if (jj_3R_73()) return true;
return false;
}
- private boolean jj_3R_88() {
+ final private boolean jj_3R_88() {
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_30() {
+ final private boolean jj_3R_30() {
if (jj_3R_24()) return true;
return false;
}
- private boolean jj_3R_87() {
+ final private boolean jj_3R_87() {
if (jj_3R_71()) return true;
return false;
}
- private boolean jj_3R_70() {
+ final private boolean jj_3R_70() {
if (jj_scan_token(TRUE)) return true;
return false;
}
- private boolean jj_3R_86() {
+ final private boolean jj_3R_86() {
if (jj_3R_70()) return true;
return false;
}
- private boolean jj_3_9() {
+ final private boolean jj_3_9() {
if (jj_scan_token(DOT)) return true;
Token xsp;
xsp = jj_scanpos;
@@ -2827,37 +2872,37 @@
return false;
}
- private boolean jj_3R_85() {
+ final private boolean jj_3R_85() {
if (jj_3R_69()) return true;
return false;
}
- private boolean jj_3R_67() {
+ final private boolean jj_3R_67() {
if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
return false;
}
- private boolean jj_3R_84() {
+ final private boolean jj_3R_84() {
if (jj_3R_68()) return true;
return false;
}
- private boolean jj_3R_83() {
+ final private boolean jj_3R_83() {
if (jj_3R_67()) return true;
return false;
}
- private boolean jj_3R_82() {
+ final private boolean jj_3R_82() {
if (jj_3R_66()) return true;
return false;
}
- private boolean jj_3R_81() {
+ final private boolean jj_3R_81() {
if (jj_3R_40()) return true;
return false;
}
- private boolean jj_3_7() {
+ final private boolean jj_3_7() {
if (jj_scan_token(DOT)) return true;
Token xsp;
xsp = jj_scanpos;
@@ -2872,7 +2917,7 @@
return false;
}
- private boolean jj_3R_61() {
+ final private boolean jj_3R_61() {
if (jj_3R_29()) return true;
Token xsp;
while (true) {
@@ -2882,12 +2927,12 @@
return false;
}
- private boolean jj_3R_80() {
+ final private boolean jj_3R_80() {
if (jj_3R_24()) return true;
return false;
}
- private boolean jj_3R_39() {
+ final private boolean jj_3R_39() {
if (jj_scan_token(LCURLY)) return true;
if (jj_scan_token(IDENTIFIER)) return true;
Token xsp;
@@ -2903,12 +2948,12 @@
return false;
}
- private boolean jj_3R_79() {
+ final private boolean jj_3R_79() {
if (jj_3R_65()) return true;
return false;
}
- private boolean jj_3R_72() {
+ final private boolean jj_3R_72() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(31)) jj_scanpos = xsp;
@@ -2944,7 +2989,7 @@
return false;
}
- private boolean jj_3R_38() {
+ final private boolean jj_3R_38() {
if (jj_scan_token(IDENTIFIER)) return true;
Token xsp;
while (true) {
@@ -2958,7 +3003,7 @@
return false;
}
- private boolean jj_3R_24() {
+ final private boolean jj_3R_24() {
Token xsp;
xsp = jj_scanpos;
if (jj_3R_38()) {
@@ -2968,7 +3013,7 @@
return false;
}
- private boolean jj_3R_35() {
+ final private boolean jj_3R_35() {
Token xsp;
xsp = jj_scanpos;
if (jj_3_11()) {
@@ -2978,7 +3023,7 @@
return false;
}
- private boolean jj_3_11() {
+ final private boolean jj_3_11() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(31)) jj_scanpos = xsp;
@@ -2987,19 +3032,19 @@
return false;
}
- private boolean jj_3R_62() {
+ final private boolean jj_3R_62() {
if (jj_3R_72()) return true;
return false;
}
- private boolean jj_3R_73() {
+ final private boolean jj_3R_73() {
if (jj_scan_token(INDEX_LBRACKET)) return true;
if (jj_3R_91()) return true;
if (jj_scan_token(INDEX_RBRACKET)) return true;
return false;
}
- private boolean jj_3_6() {
+ final private boolean jj_3_6() {
if (jj_scan_token(LBRACKET)) return true;
Token xsp;
xsp = jj_scanpos;
@@ -3015,7 +3060,7 @@
return false;
}
- private boolean jj_3R_33() {
+ final private boolean jj_3R_33() {
if (jj_3R_60()) return true;
if (jj_scan_token(LPAREN)) return true;
Token xsp;
@@ -3025,57 +3070,57 @@
return false;
}
- private boolean jj_3R_59() {
+ final private boolean jj_3R_59() {
if (jj_3R_67()) return true;
return false;
}
- private boolean jj_3R_58() {
+ final private boolean jj_3R_58() {
if (jj_3R_24()) return true;
return false;
}
- private boolean jj_3R_57() {
+ final private boolean jj_3R_57() {
if (jj_3R_71()) return true;
return false;
}
- private boolean jj_3R_56() {
+ final private boolean jj_3R_56() {
if (jj_3R_70()) return true;
return false;
}
- private boolean jj_3R_55() {
+ final private boolean jj_3R_55() {
if (jj_3R_69()) return true;
return false;
}
- private boolean jj_3R_54() {
+ final private boolean jj_3R_54() {
if (jj_3R_68()) return true;
return false;
}
- private boolean jj_3R_53() {
+ final private boolean jj_3R_53() {
if (jj_3R_66()) return true;
return false;
}
- private boolean jj_3R_52() {
+ final private boolean jj_3R_52() {
if (jj_3R_40()) return true;
return false;
}
- private boolean jj_3R_51() {
+ final private boolean jj_3R_51() {
if (jj_3R_65()) return true;
return false;
}
- private boolean jj_3_2() {
+ final private boolean jj_3_2() {
if (jj_scan_token(DOUBLE_ESCAPE)) return true;
return false;
}
- private boolean jj_3R_29() {
+ final private boolean jj_3R_29() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(31)) jj_scanpos = xsp;
@@ -3110,7 +3155,7 @@
return false;
}
- private boolean jj_3R_100() {
+ final private boolean jj_3R_100() {
if (jj_scan_token(COMMA)) return true;
if (jj_3R_29()) return true;
if (jj_scan_token(COLON)) return true;
@@ -3118,48 +3163,48 @@
return false;
}
- private boolean jj_3R_96() {
+ final private boolean jj_3R_96() {
if (jj_3R_24()) return true;
return false;
}
- private boolean jj_3R_95() {
+ final private boolean jj_3R_95() {
if (jj_3R_71()) return true;
return false;
}
- private boolean jj_3R_94() {
+ final private boolean jj_3R_94() {
if (jj_3R_70()) return true;
return false;
}
- private boolean jj_3R_93() {
+ final private boolean jj_3R_93() {
if (jj_3R_40()) return true;
return false;
}
- private boolean jj_3R_92() {
+ final private boolean jj_3R_92() {
if (jj_3R_65()) return true;
return false;
}
- private boolean jj_3R_99() {
+ final private boolean jj_3R_99() {
if (jj_3R_40()) return true;
return false;
}
- private boolean jj_3R_76() {
+ final private boolean jj_3R_76() {
if (jj_3R_40()) return true;
return false;
}
- private boolean jj_3R_101() {
+ final private boolean jj_3R_101() {
if (jj_scan_token(COMMA)) return true;
if (jj_3R_29()) return true;
return false;
}
- private boolean jj_3R_91() {
+ final private boolean jj_3R_91() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(31)) jj_scanpos = xsp;
@@ -3182,22 +3227,22 @@
return false;
}
- private boolean jj_3R_98() {
+ final private boolean jj_3R_98() {
if (jj_3R_24()) return true;
return false;
}
- private boolean jj_3R_26() {
+ final private boolean jj_3R_26() {
if (jj_3R_40()) return true;
return false;
}
- private boolean jj_3R_75() {
+ final private boolean jj_3R_75() {
if (jj_3R_24()) return true;
return false;
}
- private boolean jj_3R_78() {
+ final private boolean jj_3R_78() {
if (jj_3R_29()) return true;
Token xsp;
while (true) {
@@ -3207,7 +3252,7 @@
return false;
}
- private boolean jj_3R_66() {
+ final private boolean jj_3R_66() {
if (jj_scan_token(LBRACKET)) return true;
Token xsp;
xsp = jj_scanpos;
@@ -3233,12 +3278,12 @@
return false;
}
- private boolean jj_3R_25() {
+ final private boolean jj_3R_25() {
if (jj_3R_24()) return true;
return false;
}
- private boolean jj_3R_69() {
+ final private boolean jj_3R_69() {
if (jj_scan_token(LBRACKET)) return true;
Token xsp;
xsp = jj_scanpos;
@@ -3247,19 +3292,19 @@
return false;
}
- private boolean jj_3_1() {
+ final private boolean jj_3_1() {
if (jj_3R_24()) return true;
return false;
}
- private boolean jj_3R_77() {
+ final private boolean jj_3R_77() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(31)) jj_scanpos = xsp;
return false;
}
- private boolean jj_3_5() {
+ final private boolean jj_3_5() {
if (jj_3R_29()) return true;
if (jj_scan_token(COLON)) return true;
if (jj_3R_29()) return true;
@@ -3271,7 +3316,7 @@
return false;
}
- private boolean jj_3R_68() {
+ final private boolean jj_3R_68() {
if (jj_scan_token(LEFT_CURLEY)) return true;
Token xsp;
xsp = jj_scanpos;
@@ -3287,17 +3332,17 @@
return false;
}
- private boolean jj_3R_50() {
+ final private boolean jj_3R_50() {
if (jj_3R_71()) return true;
return false;
}
- private boolean jj_3R_49() {
+ final private boolean jj_3R_49() {
if (jj_3R_70()) return true;
return false;
}
- private boolean jj_3_3() {
+ final private boolean jj_3_3() {
if (jj_scan_token(LBRACKET)) return true;
Token xsp;
xsp = jj_scanpos;
@@ -3313,47 +3358,47 @@
return false;
}
- private boolean jj_3R_48() {
+ final private boolean jj_3R_48() {
if (jj_3R_69()) return true;
return false;
}
- private boolean jj_3R_47() {
+ final private boolean jj_3R_47() {
if (jj_3R_68()) return true;
return false;
}
- private boolean jj_3R_46() {
+ final private boolean jj_3R_46() {
if (jj_3R_67()) return true;
return false;
}
- private boolean jj_3R_90() {
+ final private boolean jj_3R_90() {
if (jj_3R_73()) return true;
return false;
}
- private boolean jj_3R_45() {
+ final private boolean jj_3R_45() {
if (jj_3R_66()) return true;
return false;
}
- private boolean jj_3R_89() {
+ final private boolean jj_3R_89() {
if (jj_3R_73()) return true;
return false;
}
- private boolean jj_3R_37() {
+ final private boolean jj_3R_37() {
if (jj_3R_40()) return true;
return false;
}
- private boolean jj_3R_44() {
+ final private boolean jj_3R_44() {
if (jj_3R_40()) return true;
return false;
}
- private boolean jj_3R_27() {
+ final private boolean jj_3R_27() {
if (jj_scan_token(COMMA)) return true;
Token xsp;
xsp = jj_scanpos;
@@ -3361,32 +3406,32 @@
return false;
}
- private boolean jj_3R_43() {
+ final private boolean jj_3R_43() {
if (jj_3R_65()) return true;
return false;
}
- private boolean jj_3R_34() {
+ final private boolean jj_3R_34() {
if (jj_3R_60()) return true;
return false;
}
- private boolean jj_3R_42() {
+ final private boolean jj_3R_42() {
if (jj_3R_64()) return true;
return false;
}
- private boolean jj_3R_36() {
+ final private boolean jj_3R_36() {
if (jj_3R_24()) return true;
return false;
}
- private boolean jj_3R_41() {
+ final private boolean jj_3R_41() {
if (jj_3R_24()) return true;
return false;
}
- private boolean jj_3R_28() {
+ final private boolean jj_3R_28() {
Token xsp;
xsp = jj_scanpos;
if (jj_3R_41()) {
@@ -3420,89 +3465,41 @@
return false;
}
- private boolean jj_3R_32() {
+ final private boolean jj_3R_32() {
if (jj_3R_60()) return true;
return false;
}
- private boolean jj_3R_64() {
- if (jj_scan_token(WORD)) return true;
- return false;
- }
-
- private boolean jj_3R_60() {
- if (jj_scan_token(IDENTIFIER)) return true;
- return false;
- }
-
- private boolean jj_3_10() {
- if (jj_3R_33()) return true;
- return false;
- }
-
- private boolean jj_3_4() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_scan_token(31)) jj_scanpos = xsp;
- xsp = jj_scanpos;
- if (jj_3R_27()) jj_scanpos = xsp;
- if (jj_3R_28()) return true;
- return false;
- }
-
- private boolean jj_3R_31() {
- if (jj_3R_40()) return true;
- return false;
- }
-
- private boolean jj_3_8() {
- if (jj_3R_33()) return true;
- return false;
- }
-
- private boolean jj_3R_74() {
- if (jj_3R_73()) return true;
- return false;
- }
-
- private boolean jj_3R_65() {
- if (jj_scan_token(STRING_LITERAL)) return true;
- return false;
- }
-
- /** Generated Token Manager. */
public ParserTokenManager token_source;
- /** Current token. */
- public Token token;
- /** Next token. */
- public Token jj_nt;
+ public Token token, jj_nt;
private int jj_ntk;
private Token jj_scanpos, jj_lastpos;
private int jj_la;
+ public boolean lookingAhead = false;
+ private boolean jj_semLA;
private int jj_gen;
final private int[] jj_la1 = new int[69];
static private int[] jj_la1_0;
static private int[] jj_la1_1;
static private int[] jj_la1_2;
static {
- jj_la1_init_0();
- jj_la1_init_1();
- jj_la1_init_2();
+ jj_la1_0();
+ jj_la1_1();
+ jj_la1_2();
}
- private static void jj_la1_init_0() {
+ private static void jj_la1_0() {
jj_la1_0 = new int[] {0x1de06c00,0x0,0x1de06c00,0x2000000,0xc200000,0x0,0x108,0x0,0x80000000,0x80000000,0x80000000,0x20,0x80000000,0x1de06c00,0x20,0x80000000,0x200,0x20,0x80000108,0x80000000,0x0,0x80000000,0x80000000,0x0,0x80000000,0x80000000,0x0,0x80000000,0x80000000,0x0,0x108,0x80000000,0x20,0x80000108,0x2,0x0,0x2,0x2,0x0,0x2,0x0,0x1800c00,0x80000000,0x1de06c00,0x0,0x0,0x0,0x1de06c00,0x80000000,0x1de06c00,0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x80000508,0x80000000,0x0,0x508,0x80000000,};
}
- private static void jj_la1_init_1() {
+ private static void jj_la1_1() {
jj_la1_1 = new int[] {0xc6900001,0x900000,0xc6000001,0x0,0x0,0x42000001,0x4000006,0xc0000000,0x0,0x0,0x0,0x0,0x0,0xc6900001,0x0,0x0,0x0,0x0,0x6000007,0x0,0x2000000,0x0,0x0,0x2000000,0x0,0x0,0x2000007,0x0,0x0,0x2000001,0x4000006,0x0,0x0,0x6000007,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6000001,0x0,0xc6900001,0x200000,0x200000,0x400000,0xc6900001,0x0,0xc6900001,0x0,0x0,0x8,0x400,0x200,0x18000,0x18000,0x7800,0x7800,0x30,0x30,0x1c0,0x1c0,0x0,0x6000007,0x0,0x2000001,0x4000006,0x0,};
}
- private static void jj_la1_init_2() {
+ private static void jj_la1_2() {
jj_la1_2 = new int[] {0x278,0x0,0x270,0x0,0x0,0x28,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x278,0x0,0x0,0x40,0x0,0x28,0x0,0x28,0x0,0x0,0x28,0x0,0x0,0x28,0x0,0x0,0x0,0x28,0x0,0x0,0x28,0x0,0x8,0x0,0x0,0x8,0x0,0x28,0x270,0x0,0x278,0x0,0x0,0x0,0x278,0x0,0x278,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x28,0x0,0x28,0x0,0x0,};
}
final private JJCalls[] jj_2_rtns = new JJCalls[12];
private boolean jj_rescan = false;
private int jj_gc = 0;
- /** Constructor with user supplied CharStream. */
public Parser(CharStream stream) {
token_source = new ParserTokenManager(stream);
token = new Token();
@@ -3512,7 +3509,6 @@
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
- /** Reinitialise. */
public void ReInit(CharStream stream) {
token_source.ReInit(stream);
token = new Token();
@@ -3523,7 +3519,6 @@
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
- /** Constructor with generated Token Manager. */
public Parser(ParserTokenManager tm) {
token_source = tm;
token = new Token();
@@ -3533,7 +3528,6 @@
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
- /** Reinitialise. */
public void ReInit(ParserTokenManager tm) {
token_source = tm;
token = new Token();
@@ -3544,7 +3538,7 @@
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
- private Token jj_consume_token(int kind) throws ParseException {
+ final private Token jj_consume_token(int kind) throws ParseException {
Token oldToken;
if ((oldToken = token).next != null) token = token.next;
else token = token.next = token_source.getNextToken();
@@ -3570,7 +3564,7 @@
static private final class LookaheadSuccess extends java.lang.Error { }
final private LookaheadSuccess jj_ls = new LookaheadSuccess();
- private boolean jj_scan_token(int kind) {
+ final private boolean jj_scan_token(int kind) {
if (jj_scanpos == jj_lastpos) {
jj_la--;
if (jj_scanpos.next == null) {
@@ -3591,8 +3585,6 @@
return false;
}
-
-/** Get the next Token. */
final public Token getNextToken() {
if (token.next != null) token = token.next;
else token = token.next = token_source.getNextToken();
@@ -3601,9 +3593,8 @@
return token;
}
-/** Get the specific Token. */
final public Token getToken(int index) {
- Token t = token;
+ Token t = lookingAhead ? jj_scanpos : token;
for (int i = 0; i < index; i++) {
if (t.next != null) t = t.next;
else t = t.next = token_source.getNextToken();
@@ -3611,14 +3602,14 @@
return t;
}
- private int jj_ntk() {
+ final private int jj_ntk() {
if ((jj_nt=token.next) == null)
return (jj_ntk = (token.next=token_source.getNextToken()).kind);
else
return (jj_ntk = jj_nt.kind);
}
- private java.util.List jj_expentries = new java.util.ArrayList();
+ private java.util.Vector jj_expentries = new java.util.Vector();
private int[] jj_expentry;
private int jj_kind = -1;
private int[] jj_lasttokens = new int[100];
@@ -3633,26 +3624,31 @@
for (int i = 0; i < jj_endpos; i++) {
jj_expentry[i] = jj_lasttokens[i];
}
- jj_entries_loop: for (java.util.Iterator it = jj_expentries.iterator(); it.hasNext();) {
- int[] oldentry = (int[])(it.next());
+ boolean exists = false;
+ for (java.util.Enumeration e = jj_expentries.elements(); e.hasMoreElements();) {
+ int[] oldentry = (int[])(e.nextElement());
if (oldentry.length == jj_expentry.length) {
+ exists = true;
for (int i = 0; i < jj_expentry.length; i++) {
if (oldentry[i] != jj_expentry[i]) {
- continue jj_entries_loop;
+ exists = false;
+ break;
}
}
- jj_expentries.add(jj_expentry);
- break jj_entries_loop;
+ if (exists) break;
}
}
+ if (!exists) jj_expentries.addElement(jj_expentry);
if (pos != 0) jj_lasttokens[(jj_endpos = pos) - 1] = kind;
}
}
- /** Generate ParseException. */
public ParseException generateParseException() {
- jj_expentries.clear();
+ jj_expentries.removeAllElements();
boolean[] la1tokens = new boolean[74];
+ for (int i = 0; i < 74; i++) {
+ la1tokens[i] = false;
+ }
if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
@@ -3676,7 +3672,7 @@
if (la1tokens[i]) {
jj_expentry = new int[1];
jj_expentry[0] = i;
- jj_expentries.add(jj_expentry);
+ jj_expentries.addElement(jj_expentry);
}
}
jj_endpos = 0;
@@ -3684,23 +3680,20 @@
jj_add_error_token(0, 0);
int[][] exptokseq = new int[jj_expentries.size()][];
for (int i = 0; i < jj_expentries.size(); i++) {
- exptokseq[i] = (int[])jj_expentries.get(i);
+ exptokseq[i] = (int[])jj_expentries.elementAt(i);
}
return new ParseException(token, exptokseq, tokenImage);
}
- /** Enable tracing. */
final public void enable_tracing() {
}
- /** Disable tracing. */
final public void disable_tracing() {
}
- private void jj_rescan_token() {
+ final private void jj_rescan_token() {
jj_rescan = true;
for (int i = 0; i < 12; i++) {
- try {
JJCalls p = jj_2_rtns[i];
do {
if (p.gen > jj_gen) {
@@ -3722,12 +3715,11 @@
}
p = p.next;
} while (p != null);
- } catch(LookaheadSuccess ls) { }
}
jj_rescan = false;
}
- private void jj_save(int index, int xla) {
+ final private void jj_save(int index, int xla) {
JJCalls p = jj_2_rtns[index];
while (p.gen > jj_gen) {
if (p.next == null) { p = p.next = new JJCalls(); break; }
Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj?rev=735657&r1=735656&r2=735657&view=diff
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj Mon Jan 19 02:59:28 2009
@@ -1,4 +1,4 @@
-/*@bgen(jjtree) Generated By:JJTree: Do not edit this line. C:\java\apache\velocity\head\src\java\org\apache\velocity\runtime\parser\Parser.jj */
+/*@bgen(jjtree) Generated By:JJTree: Do not edit this line. /Users/bfoster/open/velocity/src/java/org/apache/velocity/runtime/parser/Parser.jj */
/*@egen*//*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -15,7 +15,7 @@
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
*/
/*
@@ -23,39 +23,14 @@
* to always have to page past it... :)
*/
options
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+{
/**
* The parser must be non-static in order for the
* above option to work, otherwise the parser value
* is passed in as null, which isn't all the useful ;)
*/
- STATIC=false;
-
-
-
-
-
-
-
-
-
+ STATIC=false;
/**
* Declare that we are accepting unicode input and
@@ -254,7 +229,7 @@
String strDirective = strImage.substring(iLast + 1);
boolean bRecognizedDirective = false;
-
+
// we don't have to call substring method all the time in this method
String dirTag = strDirective.substring(1);
if (dirTag.charAt(0) == '{')
@@ -356,7 +331,7 @@
private int rparen = 0;
List stateStack = new ArrayList(50);
-
+
public boolean debugPrint = false;
private boolean inReference;
@@ -411,7 +386,7 @@
if( debugPrint )
System.out.println(" (" + stateStack.size() + ") pushing cur state : " +
curLexState );
-
+
ParserState s = new ParserState();
s.lparen = lparen;
s.rparen = rparen;
@@ -445,13 +420,13 @@
/**
* Holds the state of the parsing process.
*/
- private class ParserState
+ private static class ParserState
{
int lparen;
int rparen;
int lexstate;
}
-
+
/**
* handles the dropdown logic when encountering a RPAREN
*/
@@ -525,7 +500,7 @@
stateStackPush();
SwitchTo(REFINDEX);
}
-
+
}
<REFINDEX>
@@ -534,7 +509,7 @@
<INDEX_RBRACKET: "]">
{
stateStackPop();
- }
+ }
}
@@ -761,7 +736,7 @@
SwitchTo( IN_TEXTBLOCK );
}
}
-
+
| <"#**" ~["#"]>
{
if (!inComment)
@@ -782,7 +757,7 @@
SwitchTo( IN_MULTI_LINE_COMMENT );
}
}
-
+
| <HASH : "#" >
{
if (! inComment)
@@ -1121,7 +1096,7 @@
* | re stateStack.
* |-- > REFMOD2 : state switch to when the LPAREN is encountered.
* again, this is a switch, not a push.
- *
+ *
* During the REFERENCE or REFMODIFIER lex states we will switch to
* REFINDEX if a bracket is encountered '['. for example: $foo[1]
* or $foo.bar[1], $foo.bar( "arg" )[1]
@@ -1615,7 +1590,7 @@
*/
jjtn000.setDirectiveName(directiveName);
-
+
if ( d == null)
{
if( directiveName.startsWith("@") )
@@ -1818,7 +1793,7 @@
|
[ <WHITESPACE> ]
)
-
+
/** note: need both tokens as they are generated in different states **/
( <RIGHT_CURLEY> | <RCURLY> )/*@bgen(jjtree)*/
} catch (Throwable jjte000) {
@@ -2146,7 +2121,7 @@
jjtree.closeNodeScope(jjtn000, true);
}
}
-/*@egen*/
+/*@egen*/
}
/* -----------------------------------------------------------------------
@@ -2253,7 +2228,7 @@
jjtree.closeNodeScope(jjtn001, true);
}
}
-/*@egen*/ /*@bgen(jjtree)*/
+/*@egen*//*@bgen(jjtree)*/
} catch (Throwable jjte000) {
if (jjtc000) {
jjtree.clearNodeScope(jjtn000);
@@ -2313,7 +2288,7 @@
jjtree.closeNodeScope(jjtn001, true);
}
}
-/*@egen*/ /*@bgen(jjtree)*/
+/*@egen*//*@bgen(jjtree)*/
} catch (Throwable jjte000) {
if (jjtc000) {
jjtree.clearNodeScope(jjtn000);
@@ -2504,7 +2479,7 @@
jjtree.closeNodeScope(jjtn001, 2);
}
}
-/*@egen*/ )*
+/*@egen*/ )*
}
@@ -2538,7 +2513,7 @@
jjtree.closeNodeScope(jjtn001, 2);
}
}
-/*@egen*/ )*
+/*@egen*/ )*
}
void EqualityExpression() : {}
Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserConstants.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserConstants.java?rev=735657&r1=735656&r2=735657&view=diff
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserConstants.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserConstants.java Mon Jan 19 02:59:28 2009
@@ -1,178 +1,91 @@
/* Generated By:JJTree&JavaCC: Do not edit this line. ParserConstants.java */
package org.apache.velocity.runtime.parser;
-
-/**
- * Token literal values and constants.
- * Generated by org.javacc.parser.OtherFilesGen#start()
- */
public interface ParserConstants {
- /** End of File. */
int EOF = 0;
- /** RegularExpression Id. */
int INDEX_LBRACKET = 1;
- /** RegularExpression Id. */
int INDEX_RBRACKET = 2;
- /** RegularExpression Id. */
int LBRACKET = 3;
- /** RegularExpression Id. */
int RBRACKET = 4;
- /** RegularExpression Id. */
int COMMA = 5;
- /** RegularExpression Id. */
int DOUBLEDOT = 6;
- /** RegularExpression Id. */
int COLON = 7;
- /** RegularExpression Id. */
int LEFT_CURLEY = 8;
- /** RegularExpression Id. */
int RIGHT_CURLEY = 9;
- /** RegularExpression Id. */
int LPAREN = 10;
- /** RegularExpression Id. */
int RPAREN = 11;
- /** RegularExpression Id. */
int REFMOD2_RPAREN = 12;
- /** RegularExpression Id. */
int ESCAPE_DIRECTIVE = 13;
- /** RegularExpression Id. */
int SET_DIRECTIVE = 14;
- /** RegularExpression Id. */
int DOLLAR = 15;
- /** RegularExpression Id. */
int DOLLARBANG = 16;
- /** RegularExpression Id. */
int HASH = 20;
- /** RegularExpression Id. */
int SINGLE_LINE_COMMENT_START = 21;
- /** RegularExpression Id. */
int DOUBLE_ESCAPE = 22;
- /** RegularExpression Id. */
int ESCAPE = 23;
- /** RegularExpression Id. */
int TEXT = 24;
- /** RegularExpression Id. */
int SINGLE_LINE_COMMENT = 25;
- /** RegularExpression Id. */
int FORMAL_COMMENT = 26;
- /** RegularExpression Id. */
int MULTI_LINE_COMMENT = 27;
- /** RegularExpression Id. */
int TEXTBLOCK = 28;
- /** RegularExpression Id. */
int WHITESPACE = 31;
- /** RegularExpression Id. */
int STRING_LITERAL = 32;
- /** RegularExpression Id. */
int TRUE = 33;
- /** RegularExpression Id. */
int FALSE = 34;
- /** RegularExpression Id. */
int NEWLINE = 35;
- /** RegularExpression Id. */
int MINUS = 36;
- /** RegularExpression Id. */
int PLUS = 37;
- /** RegularExpression Id. */
int MULTIPLY = 38;
- /** RegularExpression Id. */
int DIVIDE = 39;
- /** RegularExpression Id. */
int MODULUS = 40;
- /** RegularExpression Id. */
int LOGICAL_AND = 41;
- /** RegularExpression Id. */
int LOGICAL_OR = 42;
- /** RegularExpression Id. */
int LOGICAL_LT = 43;
- /** RegularExpression Id. */
int LOGICAL_LE = 44;
- /** RegularExpression Id. */
int LOGICAL_GT = 45;
- /** RegularExpression Id. */
int LOGICAL_GE = 46;
- /** RegularExpression Id. */
int LOGICAL_EQUALS = 47;
- /** RegularExpression Id. */
int LOGICAL_NOT_EQUALS = 48;
- /** RegularExpression Id. */
int LOGICAL_NOT = 49;
- /** RegularExpression Id. */
int EQUALS = 50;
- /** RegularExpression Id. */
int END = 51;
- /** RegularExpression Id. */
int IF_DIRECTIVE = 52;
- /** RegularExpression Id. */
int ELSEIF_DIRECTIVE = 53;
- /** RegularExpression Id. */
int ELSE_DIRECTIVE = 54;
- /** RegularExpression Id. */
int STOP_DIRECTIVE = 55;
- /** RegularExpression Id. */
int DIGIT = 56;
- /** RegularExpression Id. */
int INTEGER_LITERAL = 57;
- /** RegularExpression Id. */
int FLOATING_POINT_LITERAL = 58;
- /** RegularExpression Id. */
int EXPONENT = 59;
- /** RegularExpression Id. */
int LETTER = 60;
- /** RegularExpression Id. */
int DIRECTIVE_CHAR = 61;
- /** RegularExpression Id. */
int WORD = 62;
- /** RegularExpression Id. */
int BRACKETED_WORD = 63;
- /** RegularExpression Id. */
int ALPHA_CHAR = 64;
- /** RegularExpression Id. */
int ALPHANUM_CHAR = 65;
- /** RegularExpression Id. */
int IDENTIFIER_CHAR = 66;
- /** RegularExpression Id. */
int IDENTIFIER = 67;
- /** RegularExpression Id. */
int DOT = 68;
- /** RegularExpression Id. */
int LCURLY = 69;
- /** RegularExpression Id. */
int RCURLY = 70;
- /** RegularExpression Id. */
int REFERENCE_TERMINATOR = 71;
- /** RegularExpression Id. */
int DIRECTIVE_TERMINATOR = 72;
- /** RegularExpression Id. */
int EMPTY_INDEX = 73;
- /** Lexical state. */
int REFERENCE = 0;
- /** Lexical state. */
int REFMODIFIER = 1;
- /** Lexical state. */
int REFINDEX = 2;
- /** Lexical state. */
int DIRECTIVE = 3;
- /** Lexical state. */
int REFMOD2 = 4;
- /** Lexical state. */
int DEFAULT = 5;
- /** Lexical state. */
int REFMOD = 6;
- /** Lexical state. */
int PRE_DIRECTIVE = 7;
- /** Lexical state. */
int IN_TEXTBLOCK = 8;
- /** Lexical state. */
int IN_MULTI_LINE_COMMENT = 9;
- /** Lexical state. */
int IN_FORMAL_COMMENT = 10;
- /** Lexical state. */
int IN_SINGLE_LINE_COMMENT = 11;
- /** Literal token values. */
String[] tokenImage = {
"<EOF>",
"\"[\"",