You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by wg...@apache.org on 2005/01/14 19:17:06 UTC
svn commit: r125193 - /jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/BUILD_README.txt /jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java /jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj
Author: wglass
Date: Fri Jan 14 10:17:02 2005
New Revision: 125193
URL: http://svn.apache.org/viewcvs?view=rev&rev=125193
Log:
used JavaCC 3.2 to change variable enumeration to e
Modified:
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/BUILD_README.txt
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj
Modified: jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/BUILD_README.txt
Url: http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/BUILD_README.txt?view=diff&rev=125193&p1=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/BUILD_README.txt&r1=125192&p2=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/BUILD_README.txt&r2=125193
==============================================================================
--- jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/BUILD_README.txt (original)
+++ jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/BUILD_README.txt Fri Jan 14 10:17:02 2005
@@ -22,3 +22,7 @@
-gmj
+
+5) Finally, note that in order to create code that will compile with JDK 1.5,
+you will need to use JavaCC 3.2 or later (replaces variable "enumeration" with "e". (WGH)
+
Modified: jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
Url: http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java?view=diff&rev=125193&p1=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java&r1=125192&p2=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java&r2=125193
==============================================================================
--- jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java (original)
+++ jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java Fri Jan 14 10:17:02 2005
@@ -2365,890 +2365,671 @@
final private boolean jj_2_1(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- boolean retval = !jj_3_1();
- jj_save(0, xla);
- return retval;
+ try { return !jj_3_1(); }
+ catch(LookaheadSuccess ls) { return true; }
+ finally { jj_save(0, xla); }
}
final private boolean jj_2_2(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- boolean retval = !jj_3_2();
- jj_save(1, xla);
- return retval;
+ try { return !jj_3_2(); }
+ catch(LookaheadSuccess ls) { return true; }
+ finally { jj_save(1, xla); }
}
final private boolean jj_2_3(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- boolean retval = !jj_3_3();
- jj_save(2, xla);
- return retval;
+ try { return !jj_3_3(); }
+ catch(LookaheadSuccess ls) { return true; }
+ finally { jj_save(2, xla); }
}
final private boolean jj_2_4(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- boolean retval = !jj_3_4();
- jj_save(3, xla);
- return retval;
+ try { return !jj_3_4(); }
+ catch(LookaheadSuccess ls) { return true; }
+ finally { jj_save(3, xla); }
}
final private boolean jj_2_5(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- boolean retval = !jj_3_5();
- jj_save(4, xla);
- return retval;
+ try { return !jj_3_5(); }
+ catch(LookaheadSuccess ls) { return true; }
+ finally { jj_save(4, xla); }
}
final private boolean jj_2_6(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- boolean retval = !jj_3_6();
- jj_save(5, xla);
- return retval;
+ try { return !jj_3_6(); }
+ catch(LookaheadSuccess ls) { return true; }
+ finally { jj_save(5, xla); }
}
final private boolean jj_2_7(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- boolean retval = !jj_3_7();
- jj_save(6, xla);
- return retval;
+ try { return !jj_3_7(); }
+ catch(LookaheadSuccess ls) { return true; }
+ finally { jj_save(6, xla); }
}
final private boolean jj_2_8(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- boolean retval = !jj_3_8();
- jj_save(7, xla);
- return retval;
+ try { return !jj_3_8(); }
+ catch(LookaheadSuccess ls) { return true; }
+ finally { jj_save(7, xla); }
}
final private boolean jj_2_9(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- boolean retval = !jj_3_9();
- jj_save(8, xla);
- return retval;
+ try { return !jj_3_9(); }
+ catch(LookaheadSuccess ls) { return true; }
+ finally { jj_save(8, xla); }
}
final private boolean jj_2_10(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- boolean retval = !jj_3_10();
- jj_save(9, xla);
- return retval;
+ try { return !jj_3_10(); }
+ catch(LookaheadSuccess ls) { return true; }
+ finally { jj_save(9, xla); }
}
final private boolean jj_2_11(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- boolean retval = !jj_3_11();
- jj_save(10, xla);
- return retval;
+ try { return !jj_3_11(); }
+ catch(LookaheadSuccess ls) { return true; }
+ finally { jj_save(10, xla); }
}
final private boolean jj_2_12(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
- boolean retval = !jj_3_12();
- jj_save(11, xla);
- return retval;
+ try { return !jj_3_12(); }
+ catch(LookaheadSuccess ls) { return true; }
+ finally { jj_save(11, xla); }
}
- final private boolean jj_3R_40() {
- if (jj_scan_token(WHITESPACE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_43() {
+ final private boolean jj_3R_35() {
if (jj_scan_token(NUMBER_LITERAL)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
final private boolean jj_3_4() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_25()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_26()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(26)) jj_scanpos = xsp;
+ if (jj_3R_23()) return true;
return false;
}
- final private boolean jj_3R_34() {
- if (jj_3R_63()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_29() {
+ if (jj_3R_53()) return true;
return false;
}
- final private boolean jj_3R_31() {
- if (jj_scan_token(WHITESPACE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_27() {
+ if (jj_3R_53()) return true;
return false;
}
final private boolean jj_3R_32() {
- if (jj_3R_63()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_39() {
- if (jj_3R_43()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_35()) return true;
return false;
}
- final private boolean jj_3R_38() {
+ final private boolean jj_3R_31() {
if (jj_3R_20()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_30() {
- if (jj_3R_43()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_26() {
+ if (jj_3R_35()) return true;
return false;
}
final private boolean jj_3_10() {
- if (jj_3R_33()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_28()) return true;
return false;
}
- final private boolean jj_3R_90() {
- if (jj_scan_token(COMMA)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_27()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3_8() {
+ if (jj_3R_28()) return true;
return false;
}
- final private boolean jj_3_8() {
- if (jj_3R_33()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_77() {
+ if (jj_scan_token(COMMA)) return true;
+ if (jj_3R_24()) return true;
return false;
}
final private boolean jj_3_2() {
if (jj_scan_token(DOUBLE_ESCAPE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_29() {
+ final private boolean jj_3R_25() {
if (jj_3R_20()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_72() {
+ final private boolean jj_3R_62() {
if (jj_scan_token(FALSE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_37() {
- if (jj_scan_token(WHITESPACE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_71() {
+ final private boolean jj_3R_61() {
if (jj_scan_token(TRUE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
final private boolean jj_3_9() {
if (jj_scan_token(DOT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
Token xsp;
xsp = jj_scanpos;
if (jj_3_10()) {
jj_scanpos = xsp;
- if (jj_3R_34()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_29()) return true;
+ }
return false;
}
- final private boolean jj_3R_64() {
- if (jj_3R_27()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_54() {
+ if (jj_3R_24()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_90()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_77()) { jj_scanpos = xsp; break; }
}
return false;
}
final private boolean jj_3_7() {
if (jj_scan_token(DOT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
Token xsp;
xsp = jj_scanpos;
if (jj_3_8()) {
jj_scanpos = xsp;
- if (jj_3R_32()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_24() {
- if (jj_scan_token(WHITESPACE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_27()) return true;
+ }
return false;
}
- final private boolean jj_3R_42() {
+ final private boolean jj_3R_34() {
if (jj_scan_token(LCURLY)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
if (jj_scan_token(IDENTIFIER)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
Token xsp;
while (true) {
xsp = jj_scanpos;
if (jj_3_9()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
}
if (jj_scan_token(RCURLY)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
final private boolean jj_3_12() {
if (jj_scan_token(LBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_37()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(26)) jj_scanpos = xsp;
xsp = jj_scanpos;
- if (jj_3R_38()) {
+ if (jj_3R_31()) {
jj_scanpos = xsp;
- if (jj_3R_39()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_32()) return true;
+ }
xsp = jj_scanpos;
- if (jj_3R_40()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(26)) jj_scanpos = xsp;
if (jj_scan_token(DOUBLEDOT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_28() {
- if (jj_scan_token(WHITESPACE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_41() {
+ final private boolean jj_3R_33() {
if (jj_scan_token(IDENTIFIER)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
Token xsp;
while (true) {
xsp = jj_scanpos;
if (jj_3_7()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
}
return false;
}
- final private boolean jj_3R_88() {
+ final private boolean jj_3R_76() {
if (jj_scan_token(LPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_87() {
- if (jj_3R_72()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
final private boolean jj_3R_20() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_41()) {
+ if (jj_3R_33()) {
jj_scanpos = xsp;
- if (jj_3R_42()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_34()) return true;
+ }
return false;
}
- final private boolean jj_3R_86() {
- if (jj_3R_71()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_75() {
+ if (jj_3R_62()) return true;
return false;
}
- final private boolean jj_3R_35() {
- if (jj_scan_token(WHITESPACE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_74() {
+ if (jj_3R_61()) return true;
return false;
}
- final private boolean jj_3R_85() {
- if (jj_3R_70()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_73() {
+ if (jj_3R_60()) return true;
return false;
}
- final private boolean jj_3R_84() {
- if (jj_3R_69()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_72() {
+ if (jj_3R_59()) return true;
return false;
}
- final private boolean jj_3R_83() {
- if (jj_3R_68()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_71() {
+ if (jj_3R_58()) return true;
return false;
}
- final private boolean jj_3R_82() {
+ final private boolean jj_3R_70() {
if (jj_3R_20()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_81() {
- if (jj_3R_43()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_69() {
+ if (jj_3R_35()) return true;
return false;
}
final private boolean jj_3_6() {
if (jj_scan_token(LBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_28()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(26)) jj_scanpos = xsp;
xsp = jj_scanpos;
- if (jj_3R_29()) {
+ if (jj_3R_25()) {
jj_scanpos = xsp;
- if (jj_3R_30()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_26()) return true;
+ }
xsp = jj_scanpos;
- if (jj_3R_31()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(26)) jj_scanpos = xsp;
if (jj_scan_token(DOUBLEDOT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_80() {
- if (jj_3R_67()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_33() {
- if (jj_3R_63()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_28() {
+ if (jj_3R_53()) return true;
if (jj_scan_token(LPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_64()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_54()) jj_scanpos = xsp;
if (jj_scan_token(REFMOD2_RPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_79() {
- if (jj_scan_token(WHITESPACE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_68() {
+ if (jj_3R_57()) return true;
return false;
}
- final private boolean jj_3R_73() {
+ final private boolean jj_3R_63() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_79()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(26)) jj_scanpos = xsp;
xsp = jj_scanpos;
- if (jj_3R_80()) {
+ if (jj_3R_68()) {
jj_scanpos = xsp;
- if (jj_3R_81()) {
+ if (jj_3R_69()) {
jj_scanpos = xsp;
- if (jj_3R_82()) {
+ if (jj_3R_70()) {
jj_scanpos = xsp;
- if (jj_3R_83()) {
+ if (jj_3R_71()) {
jj_scanpos = xsp;
- if (jj_3R_84()) {
+ if (jj_3R_72()) {
jj_scanpos = xsp;
- if (jj_3R_85()) {
+ if (jj_3R_73()) {
jj_scanpos = xsp;
- if (jj_3R_86()) {
+ if (jj_3R_74()) {
jj_scanpos = xsp;
- if (jj_3R_87()) {
+ if (jj_3R_75()) {
jj_scanpos = xsp;
- if (jj_3R_88()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_92() {
- if (jj_scan_token(WHITESPACE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_76()) return true;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
return false;
}
- final private boolean jj_3R_23() {
- if (jj_3R_43()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_22() {
+ if (jj_3R_35()) return true;
return false;
}
- final private boolean jj_3R_61() {
- if (jj_3R_43()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_52() {
+ if (jj_3R_35()) return true;
return false;
}
- final private boolean jj_3R_96() {
+ final private boolean jj_3R_80() {
if (jj_scan_token(COMMA)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_27()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_24()) return true;
if (jj_scan_token(COLON)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_27()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_24()) return true;
return false;
}
- final private boolean jj_3R_60() {
+ final private boolean jj_3R_51() {
if (jj_3R_20()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_59() {
- if (jj_3R_72()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_62() {
- if (jj_scan_token(WHITESPACE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_50() {
+ if (jj_3R_62()) return true;
return false;
}
- final private boolean jj_3R_58() {
- if (jj_3R_71()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_49() {
+ if (jj_3R_61()) return true;
return false;
}
- final private boolean jj_3R_36() {
+ final private boolean jj_3R_30() {
Token xsp;
xsp = jj_scanpos;
if (jj_3_11()) {
jj_scanpos = xsp;
- if (jj_3R_65()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_55()) return true;
+ }
return false;
}
final private boolean jj_3_11() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_35()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(26)) jj_scanpos = xsp;
if (jj_scan_token(LOGICAL_NOT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_36()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_30()) return true;
return false;
}
- final private boolean jj_3R_65() {
- if (jj_3R_73()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_55() {
+ if (jj_3R_63()) return true;
return false;
}
- final private boolean jj_3R_57() {
- if (jj_3R_70()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_48() {
+ if (jj_3R_60()) return true;
return false;
}
- final private boolean jj_3R_56() {
- if (jj_3R_69()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_47() {
+ if (jj_3R_59()) return true;
return false;
}
- final private boolean jj_3R_55() {
- if (jj_3R_68()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_46() {
+ if (jj_3R_58()) return true;
return false;
}
final private boolean jj_3_1() {
if (jj_3R_20()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_54() {
- if (jj_3R_67()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_45() {
+ if (jj_3R_57()) return true;
return false;
}
- final private boolean jj_3R_94() {
- if (jj_3R_43()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_79() {
+ if (jj_3R_35()) return true;
return false;
}
- final private boolean jj_3R_97() {
+ final private boolean jj_3R_81() {
if (jj_scan_token(COMMA)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_27()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_24()) return true;
return false;
}
- final private boolean jj_3R_76() {
- if (jj_3R_43()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_53() {
- if (jj_scan_token(WHITESPACE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_65() {
+ if (jj_3R_35()) return true;
return false;
}
- final private boolean jj_3R_22() {
+ final private boolean jj_3R_21() {
if (jj_3R_20()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_27() {
+ final private boolean jj_3R_24() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_53()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(26)) jj_scanpos = xsp;
xsp = jj_scanpos;
- if (jj_3R_54()) {
+ if (jj_3R_45()) {
jj_scanpos = xsp;
- if (jj_3R_55()) {
+ if (jj_3R_46()) {
jj_scanpos = xsp;
- if (jj_3R_56()) {
+ if (jj_3R_47()) {
jj_scanpos = xsp;
- if (jj_3R_57()) {
+ if (jj_3R_48()) {
jj_scanpos = xsp;
- if (jj_3R_58()) {
+ if (jj_3R_49()) {
jj_scanpos = xsp;
- if (jj_3R_59()) {
+ if (jj_3R_50()) {
jj_scanpos = xsp;
- if (jj_3R_60()) {
+ if (jj_3R_51()) {
jj_scanpos = xsp;
- if (jj_3R_61()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_52()) return true;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
xsp = jj_scanpos;
- if (jj_3R_62()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(26)) jj_scanpos = xsp;
return false;
}
- final private boolean jj_3R_74() {
- if (jj_scan_token(WHITESPACE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_95() {
- if (jj_scan_token(WHITESPACE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_93() {
+ final private boolean jj_3R_78() {
if (jj_3R_20()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_91() {
- if (jj_scan_token(WHITESPACE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_75() {
+ final private boolean jj_3R_64() {
if (jj_3R_20()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_78() {
- if (jj_3R_27()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_67() {
+ if (jj_3R_24()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_97()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_81()) { jj_scanpos = xsp; break; }
}
return false;
}
- final private boolean jj_3R_21() {
- if (jj_scan_token(WHITESPACE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_68() {
+ final private boolean jj_3R_58() {
if (jj_scan_token(LBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_74()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(26)) jj_scanpos = xsp;
xsp = jj_scanpos;
- if (jj_3R_75()) {
+ if (jj_3R_64()) {
jj_scanpos = xsp;
- if (jj_3R_76()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_65()) return true;
+ }
xsp = jj_scanpos;
- if (jj_3R_91()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(26)) jj_scanpos = xsp;
if (jj_scan_token(DOUBLEDOT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
xsp = jj_scanpos;
- if (jj_3R_92()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(26)) jj_scanpos = xsp;
xsp = jj_scanpos;
- if (jj_3R_93()) {
+ if (jj_3R_78()) {
jj_scanpos = xsp;
- if (jj_3R_94()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_79()) return true;
+ }
xsp = jj_scanpos;
- if (jj_3R_95()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(26)) jj_scanpos = xsp;
if (jj_scan_token(RBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_52() {
- if (jj_3R_72()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_44() {
+ if (jj_3R_62()) return true;
return false;
}
- final private boolean jj_3R_70() {
+ final private boolean jj_3R_60() {
if (jj_scan_token(LBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_78()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_67()) jj_scanpos = xsp;
if (jj_scan_token(RBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
final private boolean jj_3_3() {
if (jj_scan_token(LBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_21()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(26)) jj_scanpos = xsp;
xsp = jj_scanpos;
- if (jj_3R_22()) {
+ if (jj_3R_21()) {
jj_scanpos = xsp;
- if (jj_3R_23()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_22()) return true;
+ }
xsp = jj_scanpos;
- if (jj_3R_24()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(26)) jj_scanpos = xsp;
if (jj_scan_token(DOUBLEDOT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_51() {
- if (jj_3R_71()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_89() {
- if (jj_scan_token(WHITESPACE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_43() {
+ if (jj_3R_61()) return true;
return false;
}
- final private boolean jj_3R_77() {
+ final private boolean jj_3R_66() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_89()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(26)) jj_scanpos = xsp;
return false;
}
- final private boolean jj_3R_50() {
- if (jj_3R_70()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_42() {
+ if (jj_3R_60()) return true;
return false;
}
final private boolean jj_3_5() {
- if (jj_3R_27()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_24()) return true;
if (jj_scan_token(COLON)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_27()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_24()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_96()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_80()) { jj_scanpos = xsp; break; }
}
return false;
}
- final private boolean jj_3R_49() {
- if (jj_3R_69()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_41() {
+ if (jj_3R_59()) return true;
return false;
}
- final private boolean jj_3R_69() {
+ final private boolean jj_3R_59() {
if (jj_scan_token(LEFT_CURLEY)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
Token xsp;
xsp = jj_scanpos;
if (jj_3_5()) {
jj_scanpos = xsp;
- if (jj_3R_77()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_66()) return true;
+ }
if (jj_scan_token(RIGHT_CURLEY)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_48() {
- if (jj_3R_68()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_40() {
+ if (jj_3R_58()) return true;
return false;
}
- final private boolean jj_3R_47() {
- if (jj_3R_43()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_39() {
+ if (jj_3R_35()) return true;
return false;
}
- final private boolean jj_3R_46() {
- if (jj_3R_67()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_38() {
+ if (jj_3R_57()) return true;
return false;
}
- final private boolean jj_3R_45() {
- if (jj_3R_66()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ final private boolean jj_3R_37() {
+ if (jj_3R_56()) return true;
return false;
}
- final private boolean jj_3R_26() {
+ final private boolean jj_3R_36() {
+ if (jj_3R_20()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_23() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_44()) {
+ if (jj_3R_36()) {
jj_scanpos = xsp;
- if (jj_3R_45()) {
+ if (jj_3R_37()) {
jj_scanpos = xsp;
- if (jj_3R_46()) {
+ if (jj_3R_38()) {
jj_scanpos = xsp;
- if (jj_3R_47()) {
+ if (jj_3R_39()) {
jj_scanpos = xsp;
- if (jj_3R_48()) {
+ if (jj_3R_40()) {
jj_scanpos = xsp;
- if (jj_3R_49()) {
+ if (jj_3R_41()) {
jj_scanpos = xsp;
- if (jj_3R_50()) {
+ if (jj_3R_42()) {
jj_scanpos = xsp;
- if (jj_3R_51()) {
+ if (jj_3R_43()) {
jj_scanpos = xsp;
- if (jj_3R_52()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_44() {
- if (jj_3R_20()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_44()) return true;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
return false;
}
- final private boolean jj_3R_66() {
+ final private boolean jj_3R_56() {
if (jj_scan_token(WORD)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_63() {
+ final private boolean jj_3R_53() {
if (jj_scan_token(IDENTIFIER)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_25() {
- if (jj_scan_token(WHITESPACE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_67() {
+ final private boolean jj_3R_57() {
if (jj_scan_token(STRING_LITERAL)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
@@ -3344,6 +3125,8 @@
throw generateParseException();
}
+ static private final class LookaheadSuccess extends java.lang.Error { }
+ final private LookaheadSuccess jj_ls = new LookaheadSuccess();
final private boolean jj_scan_token(int kind) {
if (jj_scanpos == jj_lastpos) {
jj_la--;
@@ -3360,7 +3143,9 @@
while (tok != null && tok != jj_scanpos) { i++; tok = tok.next; }
if (tok != null) jj_add_error_token(kind, i);
}
- return (jj_scanpos.kind != kind);
+ if (jj_scanpos.kind != kind) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;
+ return false;
}
final public Token getNextToken() {
@@ -3403,8 +3188,8 @@
jj_expentry[i] = jj_lasttokens[i];
}
boolean exists = false;
- for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {
- int[] oldentry = (int[])(enum.nextElement());
+ 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++) {
Modified: jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj
Url: http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj?view=diff&rev=125193&p1=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj&r1=125192&p2=jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj&r2=125193
==============================================================================
--- jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj (original)
+++ jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj Fri Jan 14 10:17:02 2005
@@ -1,4 +1,4 @@
-/*@bgen(jjtree) Generated By:JJTree: Do not edit this line. parser.jj */
+/*@bgen(jjtree) Generated By:JJTree: Do not edit this line. Parser.jj */
/*@egen*//*
* The Apache Software License, Version 1.1
*
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org