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/20 22:59:01 UTC
svn commit: r736127 - in /velocity/engine/branches/1.6.x: ./ build/
src/changes/ src/java/org/apache/velocity/runtime/directive/
src/java/org/apache/velocity/runtime/parser/ src/parser/
src/test/org/apache/velocity/test/issues/
Author: byron
Date: Tue Jan 20 13:59:00 2009
New Revision: 736127
URL: http://svn.apache.org/viewvc?rev=736127&view=rev
Log:
VELOCITY-667 merge of fix from trunk to 1.6.x branch for 1.6.2 inclusion
Added:
velocity/engine/branches/1.6.x/src/test/org/apache/velocity/test/issues/Velocity667TestCase.java
- copied unchanged from r736019, velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity667TestCase.java
Modified:
velocity/engine/branches/1.6.x/ (props changed)
velocity/engine/branches/1.6.x/build/ (props changed)
velocity/engine/branches/1.6.x/src/changes/changes.xml
velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/directive/MacroParseException.java
velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/Parser.java
velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/Parser.jj
velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/ParserConstants.java
velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java
velocity/engine/branches/1.6.x/src/parser/Parser.jjt
Propchange: velocity/engine/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 20 13:59:00 2009
@@ -1 +1 @@
-/velocity/engine/trunk:728869-729711,730359-730365,732913
+/velocity/engine/trunk:728869-729711,730359-730365,732913,735709,736019
Propchange: velocity/engine/branches/1.6.x/build/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 20 13:59:00 2009
@@ -1,2 +1,2 @@
/velocity/engine/trunk:732913
-/velocity/engine/trunk/build:728869-729711,730359-730365,732913
+/velocity/engine/trunk/build:728869-729711,730359-730365,732913,735709,736019
Modified: velocity/engine/branches/1.6.x/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/1.6.x/src/changes/changes.xml?rev=736127&r1=736126&r2=736127&view=diff
==============================================================================
--- velocity/engine/branches/1.6.x/src/changes/changes.xml (original)
+++ velocity/engine/branches/1.6.x/src/changes/changes.xml Tue Jan 20 13:59:00 2009
@@ -28,6 +28,11 @@
<release version="1.6.2" date="2009-01-24">
+ <action type="fix" dev="byron" issue="VELOCITY-667">
+ Pre 1.6 behavior of specifying #macro without parenthesis
+ would throw a VelocityException has been restored.
+ </action>
+
<action type="add" dev="byron" issue="VELOCITY-656">
Better error reporting when toString() throw an exception
when testing an #if conditional. For example #if($foo)
Modified: velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/directive/MacroParseException.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/directive/MacroParseException.java?rev=736127&r1=736126&r2=736127&view=diff
==============================================================================
--- velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/directive/MacroParseException.java (original)
+++ velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/directive/MacroParseException.java Tue Jan 20 13:59:00 2009
@@ -77,6 +77,10 @@
{
return currentToken.next.beginLine;
}
+ else if (currentToken != null)
+ {
+ return currentToken.beginLine;
+ }
else
{
return -1;
@@ -94,6 +98,10 @@
{
return currentToken.next.beginColumn;
}
+ else if (currentToken != null)
+ {
+ return currentToken.beginColumn;
+ }
else
{
return -1;
Modified: velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/Parser.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/Parser.java?rev=736127&r1=736126&r2=736127&view=diff
==============================================================================
--- velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/Parser.java (original)
+++ velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/Parser.java Tue Jan 20 13:59:00 2009
@@ -836,6 +836,14 @@
{if (true) return jjtn000;}
}
} else {
+ if (doItNow) // doItNow is true if the directive is "macro"
+ {
+ // VELOCITY-667 We get here if we have a "#macro" construct
+ // without parenthesis which is a parse error
+ {if (true) throw new MacroParseException("A macro declaration requires at least a name argument"
+ , currentTemplateName, t);}
+ }
+
/**
* Not a directive
*/
@@ -2505,96 +2513,155 @@
}
}
- 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_45() {
+ final private boolean jj_3_1() {
+ if (jj_3R_20()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_21() {
+ if (jj_3R_20()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_64() {
+ if (jj_scan_token(LBRACKET)) return true;
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_71()) jj_scanpos = xsp;
+ if (jj_scan_token(RBRACKET)) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_70() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_scan_token(26)) jj_scanpos = xsp;
+ return false;
+ }
+
+ final private boolean jj_3_5() {
+ if (jj_3R_25()) return true;
+ if (jj_scan_token(COLON)) return true;
+ if (jj_3R_25()) return true;
+ Token xsp;
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_3R_85()) { jj_scanpos = xsp; break; }
+ }
+ return false;
+ }
+
+ final private boolean jj_3R_63() {
+ if (jj_scan_token(LEFT_CURLEY)) return true;
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3_5()) {
+ jj_scanpos = xsp;
+ if (jj_3R_70()) return true;
+ }
+ xsp = jj_scanpos;
+ if (jj_scan_token(7)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(65)) return true;
+ }
+ return false;
+ }
+
+ final private boolean jj_3R_46() {
+ if (jj_3R_66()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_45() {
if (jj_3R_65()) 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;
@@ -2610,42 +2677,42 @@
return false;
}
- private boolean jj_3R_44() {
+ final private boolean jj_3R_44() {
if (jj_3R_64()) return true;
return false;
}
- private boolean jj_3R_43() {
+ final private boolean jj_3R_43() {
if (jj_3R_63()) return true;
return false;
}
- private boolean jj_3R_42() {
+ final private boolean jj_3R_42() {
if (jj_3R_62()) return true;
return false;
}
- private boolean jj_3R_41() {
+ final private boolean jj_3R_41() {
if (jj_3R_61()) return true;
return false;
}
- private boolean jj_3R_40() {
+ final private boolean jj_3R_40() {
if (jj_3R_36()) return true;
return false;
}
- private boolean jj_3R_39() {
+ final private boolean jj_3R_39() {
if (jj_3R_60()) return true;
return false;
}
- private boolean jj_3R_38() {
+ final private boolean jj_3R_38() {
if (jj_3R_59()) return true;
return false;
}
- private boolean jj_3R_23() {
+ final private boolean jj_3R_23() {
if (jj_scan_token(COMMA)) return true;
Token xsp;
xsp = jj_scanpos;
@@ -2653,12 +2720,12 @@
return false;
}
- private boolean jj_3R_37() {
+ final private boolean jj_3R_37() {
if (jj_3R_20()) return true;
return false;
}
- private boolean jj_3R_24() {
+ final private boolean jj_3R_24() {
Token xsp;
xsp = jj_scanpos;
if (jj_3R_37()) {
@@ -2692,22 +2759,32 @@
return false;
}
- private boolean jj_3R_59() {
+ final private boolean jj_3R_59() {
if (jj_scan_token(WORD)) return true;
return false;
}
- private boolean jj_3R_56() {
+ final private boolean jj_3R_56() {
if (jj_scan_token(IDENTIFIER)) return true;
return false;
}
- private boolean jj_3R_30() {
+ final private boolean jj_3R_30() {
if (jj_3R_56()) return true;
return false;
}
- private boolean jj_3_4() {
+ final private boolean jj_3R_28() {
+ if (jj_3R_56()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_33() {
+ if (jj_3R_36()) return true;
+ return false;
+ }
+
+ final private boolean jj_3_4() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(26)) jj_scanpos = xsp;
@@ -2717,73 +2794,63 @@
return false;
}
- private boolean jj_3R_60() {
+ final private boolean jj_3R_60() {
if (jj_scan_token(STRING_LITERAL)) return true;
return false;
}
- private boolean jj_3R_28() {
- if (jj_3R_56()) return true;
- return false;
- }
-
- private boolean jj_3R_33() {
- if (jj_3R_36()) return true;
- return false;
- }
-
- private boolean jj_3R_36() {
+ final private boolean jj_3R_36() {
if (jj_scan_token(INTEGER_LITERAL)) return true;
return false;
}
- private boolean jj_3R_62() {
- if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
+ final private boolean jj_3R_32() {
+ if (jj_3R_20()) return true;
return false;
}
- private boolean jj_3R_32() {
- if (jj_3R_20()) return true;
+ final private boolean jj_3R_27() {
+ if (jj_3R_36()) return true;
return false;
}
- private boolean jj_3R_27() {
- if (jj_3R_36()) return true;
+ final private boolean jj_3R_62() {
+ if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
return false;
}
- private boolean jj_3_10() {
+ final private boolean jj_3_10() {
if (jj_3R_29()) return true;
return false;
}
- private boolean jj_3R_82() {
+ final private boolean jj_3R_82() {
if (jj_scan_token(COMMA)) return true;
if (jj_3R_25()) return true;
return false;
}
- private boolean jj_3_8() {
+ final private boolean jj_3_8() {
if (jj_3R_29()) return true;
return false;
}
- private boolean jj_3R_26() {
+ final private boolean jj_3R_26() {
if (jj_3R_20()) return true;
return false;
}
- private boolean jj_3R_66() {
+ final private boolean jj_3R_66() {
if (jj_scan_token(FALSE)) return true;
return false;
}
- private boolean jj_3R_65() {
+ final private boolean jj_3R_65() {
if (jj_scan_token(TRUE)) 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;
@@ -2794,7 +2861,7 @@
return false;
}
- private boolean jj_3R_57() {
+ final private boolean jj_3R_57() {
if (jj_3R_25()) return true;
Token xsp;
while (true) {
@@ -2804,7 +2871,7 @@
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;
@@ -2815,7 +2882,7 @@
return false;
}
- private boolean jj_3R_35() {
+ final private boolean jj_3R_35() {
if (jj_scan_token(LCURLY)) return true;
if (jj_scan_token(IDENTIFIER)) return true;
Token xsp;
@@ -2827,7 +2894,7 @@
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;
@@ -2843,7 +2910,7 @@
return false;
}
- private boolean jj_3R_34() {
+ final private boolean jj_3R_34() {
if (jj_scan_token(IDENTIFIER)) return true;
Token xsp;
while (true) {
@@ -2853,27 +2920,22 @@
return false;
}
- private boolean jj_3R_81() {
+ final private boolean jj_3R_81() {
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_80() {
+ final private boolean jj_3R_80() {
if (jj_3R_66()) return true;
return false;
}
- private boolean jj_3R_79() {
+ final private boolean jj_3R_79() {
if (jj_3R_65()) return true;
return false;
}
- private boolean jj_3_2() {
- if (jj_scan_token(DOUBLE_ESCAPE)) return true;
- return false;
- }
-
- private boolean jj_3R_20() {
+ final private boolean jj_3R_20() {
Token xsp;
xsp = jj_scanpos;
if (jj_3R_34()) {
@@ -2883,37 +2945,37 @@
return false;
}
- private boolean jj_3R_78() {
+ final private boolean jj_3R_78() {
if (jj_3R_64()) return true;
return false;
}
- private boolean jj_3R_77() {
+ final private boolean jj_3R_77() {
if (jj_3R_63()) return true;
return false;
}
- private boolean jj_3R_76() {
+ final private boolean jj_3R_76() {
if (jj_3R_62()) return true;
return false;
}
- private boolean jj_3R_75() {
+ final private boolean jj_3R_75() {
if (jj_3R_61()) return true;
return false;
}
- private boolean jj_3R_74() {
+ final private boolean jj_3R_74() {
if (jj_3R_36()) return true;
return false;
}
- private boolean jj_3R_73() {
+ final private boolean jj_3R_73() {
if (jj_3R_20()) 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;
@@ -2929,7 +2991,12 @@
return false;
}
- private boolean jj_3R_29() {
+ final private boolean jj_3_2() {
+ if (jj_scan_token(DOUBLE_ESCAPE)) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_29() {
if (jj_3R_56()) return true;
if (jj_scan_token(LPAREN)) return true;
Token xsp;
@@ -2939,12 +3006,12 @@
return false;
}
- private boolean jj_3R_72() {
+ final private boolean jj_3R_72() {
if (jj_3R_60()) return true;
return false;
}
- private boolean jj_3R_67() {
+ final private boolean jj_3R_67() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(26)) jj_scanpos = xsp;
@@ -2980,27 +3047,27 @@
return false;
}
- private boolean jj_3R_55() {
+ final private boolean jj_3R_55() {
if (jj_3R_62()) return true;
return false;
}
- private boolean jj_3R_54() {
+ final private boolean jj_3R_54() {
if (jj_3R_20()) 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_65()) return true;
return false;
}
- private boolean jj_3R_31() {
+ final private boolean jj_3R_31() {
Token xsp;
xsp = jj_scanpos;
if (jj_3_11()) {
@@ -3010,7 +3077,7 @@
return false;
}
- private boolean jj_3_11() {
+ final private boolean jj_3_11() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(26)) jj_scanpos = xsp;
@@ -3019,17 +3086,17 @@
return false;
}
- private boolean jj_3R_58() {
+ final private boolean jj_3R_58() {
if (jj_3R_67()) return true;
return false;
}
- private boolean jj_3R_51() {
+ final private boolean jj_3R_51() {
if (jj_3R_64()) return true;
return false;
}
- private boolean jj_3R_85() {
+ final private boolean jj_3R_85() {
if (jj_scan_token(COMMA)) return true;
if (jj_3R_25()) return true;
if (jj_scan_token(COLON)) return true;
@@ -3037,43 +3104,43 @@
return false;
}
- private boolean jj_3R_50() {
+ final private boolean jj_3R_50() {
if (jj_3R_63()) return true;
return false;
}
- private boolean jj_3R_49() {
+ final private boolean jj_3R_49() {
if (jj_3R_61()) return true;
return false;
}
- private boolean jj_3R_48() {
+ final private boolean jj_3R_48() {
if (jj_3R_36()) return true;
return false;
}
- private boolean jj_3R_47() {
+ final private boolean jj_3R_47() {
if (jj_3R_60()) return true;
return false;
}
- private boolean jj_3R_84() {
+ final private boolean jj_3R_84() {
if (jj_3R_36()) return true;
return false;
}
- private boolean jj_3R_69() {
+ final private boolean jj_3R_69() {
if (jj_3R_36()) return true;
return false;
}
- private boolean jj_3R_86() {
+ final private boolean jj_3R_86() {
if (jj_scan_token(COMMA)) return true;
if (jj_3R_25()) return true;
return false;
}
- private boolean jj_3R_25() {
+ final private boolean jj_3R_25() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(26)) jj_scanpos = xsp;
@@ -3108,22 +3175,22 @@
return false;
}
- private boolean jj_3R_22() {
- if (jj_3R_36()) return true;
+ final private boolean jj_3R_83() {
+ if (jj_3R_20()) return true;
return false;
}
- private boolean jj_3R_83() {
- if (jj_3R_20()) return true;
+ final private boolean jj_3R_22() {
+ if (jj_3R_36()) return true;
return false;
}
- private boolean jj_3R_68() {
+ final private boolean jj_3R_68() {
if (jj_3R_20()) return true;
return false;
}
- private boolean jj_3R_71() {
+ final private boolean jj_3R_71() {
if (jj_3R_25()) return true;
Token xsp;
while (true) {
@@ -3133,7 +3200,7 @@
return false;
}
- private boolean jj_3R_61() {
+ final private boolean jj_3R_61() {
if (jj_scan_token(LBRACKET)) return true;
Token xsp;
xsp = jj_scanpos;
@@ -3159,98 +3226,36 @@
return false;
}
- private boolean jj_3_1() {
- if (jj_3R_20()) return true;
- return false;
- }
-
- private boolean jj_3R_21() {
- if (jj_3R_20()) return true;
- return false;
- }
-
- private boolean jj_3R_64() {
- if (jj_scan_token(LBRACKET)) return true;
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_71()) jj_scanpos = xsp;
- if (jj_scan_token(RBRACKET)) return true;
- return false;
- }
-
- private boolean jj_3R_70() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_scan_token(26)) jj_scanpos = xsp;
- return false;
- }
-
- private boolean jj_3_5() {
- if (jj_3R_25()) return true;
- if (jj_scan_token(COLON)) return true;
- if (jj_3R_25()) return true;
- Token xsp;
- while (true) {
- xsp = jj_scanpos;
- if (jj_3R_85()) { jj_scanpos = xsp; break; }
- }
- return false;
- }
-
- private boolean jj_3R_46() {
- if (jj_3R_66()) return true;
- return false;
- }
-
- private boolean jj_3R_63() {
- if (jj_scan_token(LEFT_CURLEY)) return true;
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3_5()) {
- jj_scanpos = xsp;
- if (jj_3R_70()) return true;
- }
- xsp = jj_scanpos;
- if (jj_scan_token(7)) {
- jj_scanpos = xsp;
- if (jj_scan_token(65)) 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[62];
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[] {0x9bc1b00,0x0,0x9bc1b00,0x400000,0x1840000,0x8000000,0x30000042,0x0,0x4000000,0x4000000,0x4000000,0x8,0x4000000,0x9bc1b00,0x8,0x4000000,0x80,0x8,0x3c000042,0x4000000,0x0,0x4000000,0x4000000,0x0,0x4000000,0x4000000,0x8000000,0x30000042,0x4000000,0x8,0x3c000042,0x0,0x0,0x0,0x8300300,0x4000000,0x9bc1b00,0x0,0x0,0x0,0x9bc1b00,0x4000000,0x9bc1b00,0x4000000,0x4000000,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x80000000,0x0,0x0,0x4000000,0x3c000142,0x4000000,0x8000000,0x30000142,0x4000000,};
}
- private static void jj_la1_init_1() {
+ private static void jj_la1_1() {
jj_la1_1 = new int[] {0xc6348000,0x48000,0x86300000,0x0,0x0,0x42100000,0x200000,0x6000000,0x0,0x0,0x0,0x0,0x0,0xc6348000,0x0,0x0,0x0,0x0,0x40300000,0x0,0x40100000,0x0,0x0,0x40100000,0x0,0x0,0x100000,0x40200000,0x0,0x0,0x40300000,0x40000000,0x40000000,0x40000000,0x80300000,0x0,0xc6348000,0x10000,0x10000,0x20000,0xc6348000,0x0,0xc6348000,0x0,0x0,0x0,0x20,0x10,0xc00,0xc00,0x3c0,0x3c0,0x1,0x1,0xe,0xe,0x0,0x40300000,0x0,0x40100000,0x200000,0x0,};
}
- private static void jj_la1_init_2() {
+ private static void jj_la1_2() {
jj_la1_2 = new int[] {0x3,0x0,0x3,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3,0x0,0x0,0x2,0x0,0x1,0x0,0x1,0x0,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x0,0x0,0x1,0x3,0x0,0x3,0x0,0x0,0x0,0x3,0x0,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,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();
@@ -3260,7 +3265,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();
@@ -3271,7 +3275,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();
@@ -3281,7 +3284,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();
@@ -3292,7 +3294,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();
@@ -3318,7 +3320,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) {
@@ -3339,8 +3341,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();
@@ -3349,9 +3349,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();
@@ -3359,14 +3358,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];
@@ -3381,26 +3380,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[68];
+ for (int i = 0; i < 68; i++) {
+ la1tokens[i] = false;
+ }
if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
@@ -3424,7 +3428,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;
@@ -3432,23 +3436,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) {
@@ -3470,12 +3471,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/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/Parser.jj
URL: http://svn.apache.org/viewvc/velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/Parser.jj?rev=736127&r1=736126&r2=736127&view=diff
==============================================================================
--- velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/Parser.jj (original)
+++ velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/Parser.jj Tue Jan 20 13:59:00 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. 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
@@ -115,7 +90,7 @@
/**
* Name of current template we are parsing. Passed to us in parse()
*/
- String currentTemplateName = "";
+ public String currentTemplateName = "";
VelocityCharStream velcharstream = null;
@@ -253,7 +228,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) == '{')
@@ -1626,6 +1601,14 @@
}
|
{
+ if (doItNow) // doItNow is true if the directive is "macro"
+ {
+ // VELOCITY-667 We get here if we have a "#macro" construct
+ // without parenthesis which is a parse error
+ throw new MacroParseException("A macro declaration requires at least a name argument"
+ , currentTemplateName, t);
+ }
+
/**
* Not a directive
*/
@@ -1733,7 +1716,7 @@
|
[ <WHITESPACE> ]
)
-
+
/** note: need both tokens as they are generated in different states **/
( <RIGHT_CURLEY> | <RCURLY> )/*@bgen(jjtree)*/
} catch (Throwable jjte000) {
@@ -2103,7 +2086,7 @@
jjtree.closeNodeScope(jjtn001, true);
}
}
-/*@egen*/ /*@bgen(jjtree)*/
+/*@egen*//*@bgen(jjtree)*/
} catch (Throwable jjte000) {
if (jjtc000) {
jjtree.clearNodeScope(jjtn000);
@@ -2163,7 +2146,7 @@
jjtree.closeNodeScope(jjtn001, true);
}
}
-/*@egen*/ /*@bgen(jjtree)*/
+/*@egen*//*@bgen(jjtree)*/
} catch (Throwable jjte000) {
if (jjtc000) {
jjtree.clearNodeScope(jjtn000);
@@ -2354,7 +2337,7 @@
jjtree.closeNodeScope(jjtn001, 2);
}
}
-/*@egen*/ )*
+/*@egen*/ )*
}
@@ -2388,7 +2371,7 @@
jjtree.closeNodeScope(jjtn001, 2);
}
}
-/*@egen*/ )*
+/*@egen*/ )*
}
void EqualityExpression() : {}
Modified: velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/ParserConstants.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/ParserConstants.java?rev=736127&r1=736126&r2=736127&view=diff
==============================================================================
--- velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/ParserConstants.java (original)
+++ velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/ParserConstants.java Tue Jan 20 13:59:00 2009
@@ -1,164 +1,84 @@
/* 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 LBRACKET = 1;
- /** RegularExpression Id. */
int RBRACKET = 2;
- /** RegularExpression Id. */
int COMMA = 3;
- /** RegularExpression Id. */
int DOUBLEDOT = 4;
- /** RegularExpression Id. */
int COLON = 5;
- /** RegularExpression Id. */
int LEFT_CURLEY = 6;
- /** RegularExpression Id. */
int RIGHT_CURLEY = 7;
- /** RegularExpression Id. */
int LPAREN = 8;
- /** RegularExpression Id. */
int RPAREN = 9;
- /** RegularExpression Id. */
int REFMOD2_RPAREN = 10;
- /** RegularExpression Id. */
int ESCAPE_DIRECTIVE = 11;
- /** RegularExpression Id. */
int SET_DIRECTIVE = 12;
- /** RegularExpression Id. */
int DOLLAR = 13;
- /** RegularExpression Id. */
int DOLLARBANG = 14;
- /** RegularExpression Id. */
int HASH = 17;
- /** RegularExpression Id. */
int SINGLE_LINE_COMMENT_START = 18;
- /** RegularExpression Id. */
int DOUBLE_ESCAPE = 19;
- /** RegularExpression Id. */
int ESCAPE = 20;
- /** RegularExpression Id. */
int TEXT = 21;
- /** RegularExpression Id. */
int SINGLE_LINE_COMMENT = 22;
- /** RegularExpression Id. */
int FORMAL_COMMENT = 23;
- /** RegularExpression Id. */
int MULTI_LINE_COMMENT = 24;
- /** RegularExpression Id. */
int WHITESPACE = 26;
- /** RegularExpression Id. */
int STRING_LITERAL = 27;
- /** RegularExpression Id. */
int TRUE = 28;
- /** RegularExpression Id. */
int FALSE = 29;
- /** RegularExpression Id. */
int NEWLINE = 30;
- /** RegularExpression Id. */
int MINUS = 31;
- /** RegularExpression Id. */
int PLUS = 32;
- /** RegularExpression Id. */
int MULTIPLY = 33;
- /** RegularExpression Id. */
int DIVIDE = 34;
- /** RegularExpression Id. */
int MODULUS = 35;
- /** RegularExpression Id. */
int LOGICAL_AND = 36;
- /** RegularExpression Id. */
int LOGICAL_OR = 37;
- /** RegularExpression Id. */
int LOGICAL_LT = 38;
- /** RegularExpression Id. */
int LOGICAL_LE = 39;
- /** RegularExpression Id. */
int LOGICAL_GT = 40;
- /** RegularExpression Id. */
int LOGICAL_GE = 41;
- /** RegularExpression Id. */
int LOGICAL_EQUALS = 42;
- /** RegularExpression Id. */
int LOGICAL_NOT_EQUALS = 43;
- /** RegularExpression Id. */
int LOGICAL_NOT = 44;
- /** RegularExpression Id. */
int EQUALS = 45;
- /** RegularExpression Id. */
int END = 46;
- /** RegularExpression Id. */
int IF_DIRECTIVE = 47;
- /** RegularExpression Id. */
int ELSEIF_DIRECTIVE = 48;
- /** RegularExpression Id. */
int ELSE_DIRECTIVE = 49;
- /** RegularExpression Id. */
int STOP_DIRECTIVE = 50;
- /** RegularExpression Id. */
int DIGIT = 51;
- /** RegularExpression Id. */
int INTEGER_LITERAL = 52;
- /** RegularExpression Id. */
int FLOATING_POINT_LITERAL = 53;
- /** RegularExpression Id. */
int EXPONENT = 54;
- /** RegularExpression Id. */
int LETTER = 55;
- /** RegularExpression Id. */
int DIRECTIVE_CHAR = 56;
- /** RegularExpression Id. */
int WORD = 57;
- /** RegularExpression Id. */
int BRACKETED_WORD = 58;
- /** RegularExpression Id. */
int ALPHA_CHAR = 59;
- /** RegularExpression Id. */
int ALPHANUM_CHAR = 60;
- /** RegularExpression Id. */
int IDENTIFIER_CHAR = 61;
- /** RegularExpression Id. */
int IDENTIFIER = 62;
- /** RegularExpression Id. */
int DOT = 63;
- /** RegularExpression Id. */
int LCURLY = 64;
- /** RegularExpression Id. */
int RCURLY = 65;
- /** RegularExpression Id. */
int REFERENCE_TERMINATOR = 66;
- /** RegularExpression Id. */
int DIRECTIVE_TERMINATOR = 67;
- /** Lexical state. */
int DIRECTIVE = 0;
- /** Lexical state. */
int REFMOD2 = 1;
- /** Lexical state. */
int REFMODIFIER = 2;
- /** Lexical state. */
int DEFAULT = 3;
- /** Lexical state. */
int REFERENCE = 4;
- /** Lexical state. */
int PRE_DIRECTIVE = 5;
- /** Lexical state. */
int IN_MULTI_LINE_COMMENT = 6;
- /** Lexical state. */
int IN_FORMAL_COMMENT = 7;
- /** Lexical state. */
int IN_SINGLE_LINE_COMMENT = 8;
- /** Literal token values. */
String[] tokenImage = {
"<EOF>",
"\"[\"",
Modified: velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java?rev=736127&r1=736126&r2=736127&view=diff
==============================================================================
--- velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java (original)
+++ velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java Tue Jan 20 13:59:00 2009
@@ -10,7 +10,6 @@
import org.apache.velocity.runtime.directive.MacroParseException;
import org.apache.velocity.util.StringUtils;
-/** Token Manager. */
public class ParserTokenManager implements ParserConstants
{
private int fileDepth = 0;
@@ -160,10 +159,7 @@
}
}
}
-
- /** Debug output. */
public java.io.PrintStream debugStream = System.out;
- /** Set debug output. */
public void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
private final int jjStopStringLiteralDfa_0(int pos, long active0)
{
@@ -222,13 +218,21 @@
{
return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1);
}
-private int jjStopAtPos(int pos, int kind)
+private final int jjStopAtPos(int pos, int kind)
{
jjmatchedKind = kind;
jjmatchedPos = pos;
return pos + 1;
}
-private int jjMoveStringLiteralDfa0_0()
+private final int jjStartNfaWithStates_0(int pos, int kind, int state)
+{
+ jjmatchedKind = kind;
+ jjmatchedPos = pos;
+ try { curChar = input_stream.readChar(); }
+ catch(java.io.IOException e) { return pos + 1; }
+ return jjMoveNfa_0(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_0()
{
switch(curChar)
{
@@ -271,7 +275,7 @@
return jjMoveNfa_0(0, 0);
}
}
-private int jjMoveStringLiteralDfa1_0(long active0)
+private final int jjMoveStringLiteralDfa1_0(long active0)
{
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
@@ -301,10 +305,10 @@
}
return jjStartNfa_0(0, active0);
}
-private int jjMoveStringLiteralDfa2_0(long old0, long active0)
+private final int jjMoveStringLiteralDfa2_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjStartNfa_0(0, old0);
+ return jjStartNfa_0(0, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(1, active0);
@@ -321,10 +325,10 @@
}
return jjStartNfa_0(1, active0);
}
-private int jjMoveStringLiteralDfa3_0(long old0, long active0)
+private final int jjMoveStringLiteralDfa3_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjStartNfa_0(1, old0);
+ return jjStartNfa_0(1, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(2, active0);
@@ -343,10 +347,10 @@
}
return jjStartNfa_0(2, active0);
}
-private int jjMoveStringLiteralDfa4_0(long old0, long active0)
+private final int jjMoveStringLiteralDfa4_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjStartNfa_0(2, old0);
+ return jjStartNfa_0(2, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(3, active0);
@@ -363,13 +367,35 @@
}
return jjStartNfa_0(3, active0);
}
-private int jjStartNfaWithStates_0(int pos, int kind, int state)
+private final void jjCheckNAdd(int state)
{
- jjmatchedKind = kind;
- jjmatchedPos = pos;
- try { curChar = input_stream.readChar(); }
- catch(java.io.IOException e) { return pos + 1; }
- return jjMoveNfa_0(state, pos + 1);
+ if (jjrounds[state] != jjround)
+ {
+ jjstateSet[jjnewStateCnt++] = state;
+ jjrounds[state] = jjround;
+ }
+}
+private final void jjAddStates(int start, int end)
+{
+ do {
+ jjstateSet[jjnewStateCnt++] = jjnextStates[start];
+ } while (start++ != end);
+}
+private final void jjCheckNAddTwoStates(int state1, int state2)
+{
+ jjCheckNAdd(state1);
+ jjCheckNAdd(state2);
+}
+private final void jjCheckNAddStates(int start, int end)
+{
+ do {
+ jjCheckNAdd(jjnextStates[start]);
+ } while (start++ != end);
+}
+private final void jjCheckNAddStates(int start)
+{
+ jjCheckNAdd(jjnextStates[start]);
+ jjCheckNAdd(jjnextStates[start + 1]);
}
static final long[] jjbitVec0 = {
0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL
@@ -377,13 +403,14 @@
static final long[] jjbitVec2 = {
0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
};
-private int jjMoveNfa_0(int startState, int curPos)
+private final int jjMoveNfa_0(int startState, int curPos)
{
+ int[] nextStates;
int startsAt = 0;
jjnewStateCnt = 101;
int i = 1;
jjstateSet[0] = startState;
- int kind = 0x7fffffff;
+ int j, kind = 0x7fffffff;
for (;;)
{
if (++jjround == 0x7fffffff)
@@ -391,7 +418,7 @@
if (curChar < 64)
{
long l = 1L << curChar;
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -785,7 +812,7 @@
else if (curChar < 128)
{
long l = 1L << (curChar & 077);
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -993,7 +1020,7 @@
long l1 = 1L << (hiByte & 077);
int i2 = (curChar & 0xff) >> 6;
long l2 = 1L << (curChar & 077);
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -1042,7 +1069,15 @@
{
return jjMoveNfa_6(jjStopStringLiteralDfa_6(pos, active0), pos + 1);
}
-private int jjMoveStringLiteralDfa0_6()
+private final int jjStartNfaWithStates_6(int pos, int kind, int state)
+{
+ jjmatchedKind = kind;
+ jjmatchedPos = pos;
+ try { curChar = input_stream.readChar(); }
+ catch(java.io.IOException e) { return pos + 1; }
+ return jjMoveNfa_6(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_6()
{
switch(curChar)
{
@@ -1055,7 +1090,7 @@
return jjMoveNfa_6(3, 0);
}
}
-private int jjMoveStringLiteralDfa1_6(long active0)
+private final int jjMoveStringLiteralDfa1_6(long active0)
{
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
@@ -1079,21 +1114,14 @@
}
return jjStartNfa_6(0, active0);
}
-private int jjStartNfaWithStates_6(int pos, int kind, int state)
-{
- jjmatchedKind = kind;
- jjmatchedPos = pos;
- try { curChar = input_stream.readChar(); }
- catch(java.io.IOException e) { return pos + 1; }
- return jjMoveNfa_6(state, pos + 1);
-}
-private int jjMoveNfa_6(int startState, int curPos)
+private final int jjMoveNfa_6(int startState, int curPos)
{
+ int[] nextStates;
int startsAt = 0;
jjnewStateCnt = 12;
int i = 1;
jjstateSet[0] = startState;
- int kind = 0x7fffffff;
+ int j, kind = 0x7fffffff;
for (;;)
{
if (++jjround == 0x7fffffff)
@@ -1101,7 +1129,7 @@
if (curChar < 64)
{
long l = 1L << curChar;
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -1153,7 +1181,7 @@
else if (curChar < 128)
{
long l = 1L << (curChar & 077);
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -1188,7 +1216,7 @@
long l1 = 1L << (hiByte & 077);
int i2 = (curChar & 0xff) >> 6;
long l2 = 1L << (curChar & 077);
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -1229,7 +1257,15 @@
{
return jjMoveNfa_5(jjStopStringLiteralDfa_5(pos, active0), pos + 1);
}
-private int jjMoveStringLiteralDfa0_5()
+private final int jjStartNfaWithStates_5(int pos, int kind, int state)
+{
+ jjmatchedKind = kind;
+ jjmatchedPos = pos;
+ try { curChar = input_stream.readChar(); }
+ catch(java.io.IOException e) { return pos + 1; }
+ return jjMoveNfa_5(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_5()
{
switch(curChar)
{
@@ -1240,7 +1276,7 @@
return jjMoveNfa_5(3, 0);
}
}
-private int jjMoveStringLiteralDfa1_5(long active0)
+private final int jjMoveStringLiteralDfa1_5(long active0)
{
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
@@ -1262,21 +1298,14 @@
}
return jjStartNfa_5(0, active0);
}
-private int jjStartNfaWithStates_5(int pos, int kind, int state)
-{
- jjmatchedKind = kind;
- jjmatchedPos = pos;
- try { curChar = input_stream.readChar(); }
- catch(java.io.IOException e) { return pos + 1; }
- return jjMoveNfa_5(state, pos + 1);
-}
-private int jjMoveNfa_5(int startState, int curPos)
+private final int jjMoveNfa_5(int startState, int curPos)
{
+ int[] nextStates;
int startsAt = 0;
jjnewStateCnt = 92;
int i = 1;
jjstateSet[0] = startState;
- int kind = 0x7fffffff;
+ int j, kind = 0x7fffffff;
for (;;)
{
if (++jjround == 0x7fffffff)
@@ -1284,7 +1313,7 @@
if (curChar < 64)
{
long l = 1L << curChar;
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -1491,7 +1520,7 @@
else if (curChar < 128)
{
long l = 1L << (curChar & 077);
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -1759,7 +1788,7 @@
long l1 = 1L << (hiByte & 077);
int i2 = (curChar & 0xff) >> 6;
long l2 = 1L << (curChar & 077);
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -1802,7 +1831,15 @@
{
return jjMoveNfa_3(jjStopStringLiteralDfa_3(pos, active0), pos + 1);
}
-private int jjMoveStringLiteralDfa0_3()
+private final int jjStartNfaWithStates_3(int pos, int kind, int state)
+{
+ jjmatchedKind = kind;
+ jjmatchedPos = pos;
+ try { curChar = input_stream.readChar(); }
+ catch(java.io.IOException e) { return pos + 1; }
+ return jjMoveNfa_3(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_3()
{
switch(curChar)
{
@@ -1816,7 +1853,7 @@
return jjMoveNfa_3(22, 0);
}
}
-private int jjMoveStringLiteralDfa1_3(long active0)
+private final int jjMoveStringLiteralDfa1_3(long active0)
{
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
@@ -1842,21 +1879,14 @@
}
return jjStartNfa_3(0, active0);
}
-private int jjStartNfaWithStates_3(int pos, int kind, int state)
-{
- jjmatchedKind = kind;
- jjmatchedPos = pos;
- try { curChar = input_stream.readChar(); }
- catch(java.io.IOException e) { return pos + 1; }
- return jjMoveNfa_3(state, pos + 1);
-}
-private int jjMoveNfa_3(int startState, int curPos)
+private final int jjMoveNfa_3(int startState, int curPos)
{
+ int[] nextStates;
int startsAt = 0;
jjnewStateCnt = 34;
int i = 1;
jjstateSet[0] = startState;
- int kind = 0x7fffffff;
+ int j, kind = 0x7fffffff;
for (;;)
{
if (++jjround == 0x7fffffff)
@@ -1864,7 +1894,7 @@
if (curChar < 64)
{
long l = 1L << curChar;
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -1986,7 +2016,7 @@
else if (curChar < 128)
{
long l = 1L << (curChar & 077);
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -2115,7 +2145,7 @@
long l1 = 1L << (hiByte & 077);
int i2 = (curChar & 0xff) >> 6;
long l2 = 1L << (curChar & 077);
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -2164,7 +2194,15 @@
{
return jjMoveNfa_7(jjStopStringLiteralDfa_7(pos, active0), pos + 1);
}
-private int jjMoveStringLiteralDfa0_7()
+private final int jjStartNfaWithStates_7(int pos, int kind, int state)
+{
+ jjmatchedKind = kind;
+ jjmatchedPos = pos;
+ try { curChar = input_stream.readChar(); }
+ catch(java.io.IOException e) { return pos + 1; }
+ return jjMoveNfa_7(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_7()
{
switch(curChar)
{
@@ -2177,7 +2215,7 @@
return jjMoveNfa_7(3, 0);
}
}
-private int jjMoveStringLiteralDfa1_7(long active0)
+private final int jjMoveStringLiteralDfa1_7(long active0)
{
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
@@ -2201,21 +2239,14 @@
}
return jjStartNfa_7(0, active0);
}
-private int jjStartNfaWithStates_7(int pos, int kind, int state)
-{
- jjmatchedKind = kind;
- jjmatchedPos = pos;
- try { curChar = input_stream.readChar(); }
- catch(java.io.IOException e) { return pos + 1; }
- return jjMoveNfa_7(state, pos + 1);
-}
-private int jjMoveNfa_7(int startState, int curPos)
+private final int jjMoveNfa_7(int startState, int curPos)
{
+ int[] nextStates;
int startsAt = 0;
jjnewStateCnt = 12;
int i = 1;
jjstateSet[0] = startState;
- int kind = 0x7fffffff;
+ int j, kind = 0x7fffffff;
for (;;)
{
if (++jjround == 0x7fffffff)
@@ -2223,7 +2254,7 @@
if (curChar < 64)
{
long l = 1L << curChar;
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -2275,7 +2306,7 @@
else if (curChar < 128)
{
long l = 1L << (curChar & 077);
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -2310,7 +2341,7 @@
long l1 = 1L << (hiByte & 077);
int i2 = (curChar & 0xff) >> 6;
long l2 = 1L << (curChar & 077);
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -2351,7 +2382,15 @@
{
return jjMoveNfa_8(jjStopStringLiteralDfa_8(pos, active0), pos + 1);
}
-private int jjMoveStringLiteralDfa0_8()
+private final int jjStartNfaWithStates_8(int pos, int kind, int state)
+{
+ jjmatchedKind = kind;
+ jjmatchedPos = pos;
+ try { curChar = input_stream.readChar(); }
+ catch(java.io.IOException e) { return pos + 1; }
+ return jjMoveNfa_8(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_8()
{
switch(curChar)
{
@@ -2362,7 +2401,7 @@
return jjMoveNfa_8(3, 0);
}
}
-private int jjMoveStringLiteralDfa1_8(long active0)
+private final int jjMoveStringLiteralDfa1_8(long active0)
{
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
@@ -2384,21 +2423,14 @@
}
return jjStartNfa_8(0, active0);
}
-private int jjStartNfaWithStates_8(int pos, int kind, int state)
-{
- jjmatchedKind = kind;
- jjmatchedPos = pos;
- try { curChar = input_stream.readChar(); }
- catch(java.io.IOException e) { return pos + 1; }
- return jjMoveNfa_8(state, pos + 1);
-}
-private int jjMoveNfa_8(int startState, int curPos)
+private final int jjMoveNfa_8(int startState, int curPos)
{
+ int[] nextStates;
int startsAt = 0;
jjnewStateCnt = 15;
int i = 1;
jjstateSet[0] = startState;
- int kind = 0x7fffffff;
+ int j, kind = 0x7fffffff;
for (;;)
{
if (++jjround == 0x7fffffff)
@@ -2406,7 +2438,7 @@
if (curChar < 64)
{
long l = 1L << curChar;
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -2477,7 +2509,7 @@
else if (curChar < 128)
{
long l = 1L << (curChar & 077);
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -2512,7 +2544,7 @@
long l1 = 1L << (hiByte & 077);
int i2 = (curChar & 0xff) >> 6;
long l2 = 1L << (curChar & 077);
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -2586,7 +2618,15 @@
{
return jjMoveNfa_4(jjStopStringLiteralDfa_4(pos, active0, active1), pos + 1);
}
-private int jjMoveStringLiteralDfa0_4()
+private final int jjStartNfaWithStates_4(int pos, int kind, int state)
+{
+ jjmatchedKind = kind;
+ jjmatchedPos = pos;
+ try { curChar = input_stream.readChar(); }
+ catch(java.io.IOException e) { return pos + 1; }
+ return jjMoveNfa_4(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_4()
{
switch(curChar)
{
@@ -2605,7 +2645,7 @@
return jjMoveNfa_4(12, 0);
}
}
-private int jjMoveStringLiteralDfa1_4(long active0)
+private final int jjMoveStringLiteralDfa1_4(long active0)
{
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
@@ -2631,7 +2671,7 @@
}
return jjStartNfa_4(0, active0, 0L);
}
-private int jjMoveStringLiteralDfa2_4(long old0, long active0)
+private final int jjMoveStringLiteralDfa2_4(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_4(0, old0, 0L);
@@ -2651,7 +2691,7 @@
}
return jjStartNfa_4(1, active0, 0L);
}
-private int jjMoveStringLiteralDfa3_4(long old0, long active0)
+private final int jjMoveStringLiteralDfa3_4(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_4(1, old0, 0L);
@@ -2673,7 +2713,7 @@
}
return jjStartNfa_4(2, active0, 0L);
}
-private int jjMoveStringLiteralDfa4_4(long old0, long active0)
+private final int jjMoveStringLiteralDfa4_4(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_4(2, old0, 0L);
@@ -2693,21 +2733,14 @@
}
return jjStartNfa_4(3, active0, 0L);
}
-private int jjStartNfaWithStates_4(int pos, int kind, int state)
-{
- jjmatchedKind = kind;
- jjmatchedPos = pos;
- try { curChar = input_stream.readChar(); }
- catch(java.io.IOException e) { return pos + 1; }
- return jjMoveNfa_4(state, pos + 1);
-}
-private int jjMoveNfa_4(int startState, int curPos)
+private final int jjMoveNfa_4(int startState, int curPos)
{
+ int[] nextStates;
int startsAt = 0;
jjnewStateCnt = 28;
int i = 1;
jjstateSet[0] = startState;
- int kind = 0x7fffffff;
+ int j, kind = 0x7fffffff;
for (;;)
{
if (++jjround == 0x7fffffff)
@@ -2715,7 +2748,7 @@
if (curChar < 64)
{
long l = 1L << curChar;
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -2802,7 +2835,7 @@
else if (curChar < 128)
{
long l = 1L << (curChar & 077);
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -2896,7 +2929,7 @@
long l1 = 1L << (hiByte & 077);
int i2 = (curChar & 0xff) >> 6;
long l2 = 1L << (curChar & 077);
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -2972,7 +3005,15 @@
{
return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0), pos + 1);
}
-private int jjMoveStringLiteralDfa0_1()
+private final int jjStartNfaWithStates_1(int pos, int kind, int state)
+{
+ jjmatchedKind = kind;
+ jjmatchedPos = pos;
+ try { curChar = input_stream.readChar(); }
+ catch(java.io.IOException e) { return pos + 1; }
+ return jjMoveNfa_1(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_1()
{
switch(curChar)
{
@@ -3003,7 +3044,7 @@
return jjMoveNfa_1(13, 0);
}
}
-private int jjMoveStringLiteralDfa1_1(long active0)
+private final int jjMoveStringLiteralDfa1_1(long active0)
{
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
@@ -3033,10 +3074,10 @@
}
return jjStartNfa_1(0, active0);
}
-private int jjMoveStringLiteralDfa2_1(long old0, long active0)
+private final int jjMoveStringLiteralDfa2_1(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjStartNfa_1(0, old0);
+ return jjStartNfa_1(0, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_1(1, active0);
@@ -3053,10 +3094,10 @@
}
return jjStartNfa_1(1, active0);
}
-private int jjMoveStringLiteralDfa3_1(long old0, long active0)
+private final int jjMoveStringLiteralDfa3_1(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjStartNfa_1(1, old0);
+ return jjStartNfa_1(1, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_1(2, active0);
@@ -3075,10 +3116,10 @@
}
return jjStartNfa_1(2, active0);
}
-private int jjMoveStringLiteralDfa4_1(long old0, long active0)
+private final int jjMoveStringLiteralDfa4_1(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjStartNfa_1(2, old0);
+ return jjStartNfa_1(2, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_1(3, active0);
@@ -3095,21 +3136,14 @@
}
return jjStartNfa_1(3, active0);
}
-private int jjStartNfaWithStates_1(int pos, int kind, int state)
-{
- jjmatchedKind = kind;
- jjmatchedPos = pos;
- try { curChar = input_stream.readChar(); }
- catch(java.io.IOException e) { return pos + 1; }
- return jjMoveNfa_1(state, pos + 1);
-}
-private int jjMoveNfa_1(int startState, int curPos)
+private final int jjMoveNfa_1(int startState, int curPos)
{
+ int[] nextStates;
int startsAt = 0;
jjnewStateCnt = 71;
int i = 1;
jjstateSet[0] = startState;
- int kind = 0x7fffffff;
+ int j, kind = 0x7fffffff;
for (;;)
{
if (++jjround == 0x7fffffff)
@@ -3117,7 +3151,7 @@
if (curChar < 64)
{
long l = 1L << curChar;
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -3394,7 +3428,7 @@
else if (curChar < 128)
{
long l = 1L << (curChar & 077);
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -3539,7 +3573,7 @@
long l1 = 1L << (hiByte & 077);
int i2 = (curChar & 0xff) >> 6;
long l2 = 1L << (curChar & 077);
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -3621,7 +3655,15 @@
{
return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0, active1), pos + 1);
}
-private int jjMoveStringLiteralDfa0_2()
+private final int jjStartNfaWithStates_2(int pos, int kind, int state)
+{
+ jjmatchedKind = kind;
+ jjmatchedPos = pos;
+ try { curChar = input_stream.readChar(); }
+ catch(java.io.IOException e) { return pos + 1; }
+ return jjMoveNfa_2(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_2()
{
switch(curChar)
{
@@ -3642,7 +3684,7 @@
return jjMoveNfa_2(12, 0);
}
}
-private int jjMoveStringLiteralDfa1_2(long active0)
+private final int jjMoveStringLiteralDfa1_2(long active0)
{
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
@@ -3668,7 +3710,7 @@
}
return jjStartNfa_2(0, active0, 0L);
}
-private int jjMoveStringLiteralDfa2_2(long old0, long active0)
+private final int jjMoveStringLiteralDfa2_2(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_2(0, old0, 0L);
@@ -3688,7 +3730,7 @@
}
return jjStartNfa_2(1, active0, 0L);
}
-private int jjMoveStringLiteralDfa3_2(long old0, long active0)
+private final int jjMoveStringLiteralDfa3_2(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_2(1, old0, 0L);
@@ -3710,7 +3752,7 @@
}
return jjStartNfa_2(2, active0, 0L);
}
-private int jjMoveStringLiteralDfa4_2(long old0, long active0)
+private final int jjMoveStringLiteralDfa4_2(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_2(2, old0, 0L);
@@ -3730,21 +3772,14 @@
}
return jjStartNfa_2(3, active0, 0L);
}
-private int jjStartNfaWithStates_2(int pos, int kind, int state)
-{
- jjmatchedKind = kind;
- jjmatchedPos = pos;
- try { curChar = input_stream.readChar(); }
- catch(java.io.IOException e) { return pos + 1; }
- return jjMoveNfa_2(state, pos + 1);
-}
-private int jjMoveNfa_2(int startState, int curPos)
+private final int jjMoveNfa_2(int startState, int curPos)
{
+ int[] nextStates;
int startsAt = 0;
jjnewStateCnt = 28;
int i = 1;
jjstateSet[0] = startState;
- int kind = 0x7fffffff;
+ int j, kind = 0x7fffffff;
for (;;)
{
if (++jjround == 0x7fffffff)
@@ -3752,7 +3787,7 @@
if (curChar < 64)
{
long l = 1L << curChar;
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -3839,7 +3874,7 @@
else if (curChar < 128)
{
long l = 1L << (curChar & 077);
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -3933,7 +3968,7 @@
long l1 = 1L << (hiByte & 077);
int i2 = (curChar & 0xff) >> 6;
long l2 = 1L << (curChar & 077);
- do
+ MatchLoop: do
{
switch(jjstateSet[--i])
{
@@ -3977,35 +4012,29 @@
{
case 0:
return ((jjbitVec2[i2] & l2) != 0L);
- default :
+ default :
if ((jjbitVec0[i1] & l1) != 0L)
return true;
return false;
}
}
-
-/** Token literal values. */
public static final String[] jjstrLiteralImages = {
null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, };
-
-/** Lexer state names. */
public static final String[] lexStateNames = {
- "DIRECTIVE",
- "REFMOD2",
- "REFMODIFIER",
- "DEFAULT",
- "REFERENCE",
- "PRE_DIRECTIVE",
- "IN_MULTI_LINE_COMMENT",
- "IN_FORMAL_COMMENT",
- "IN_SINGLE_LINE_COMMENT",
+ "DIRECTIVE",
+ "REFMOD2",
+ "REFMODIFIER",
+ "DEFAULT",
+ "REFERENCE",
+ "PRE_DIRECTIVE",
+ "IN_MULTI_LINE_COMMENT",
+ "IN_FORMAL_COMMENT",
+ "IN_SINGLE_LINE_COMMENT",
};
-
-/** Lex State array. */
public static final int[] jjnewLexState = {
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -4026,23 +4055,19 @@
protected CharStream input_stream;
private final int[] jjrounds = new int[101];
private final int[] jjstateSet = new int[202];
-private final StringBuffer jjimage = new StringBuffer();
-private StringBuffer image = jjimage;
-private int jjimageLen;
-private int lengthOfMatch;
+StringBuffer image;
+int jjimageLen;
+int lengthOfMatch;
protected char curChar;
-/** Constructor. */
-public ParserTokenManager(CharStream stream){
+public ParserTokenManager(CharStream stream)
+{
input_stream = stream;
}
-
-/** Constructor. */
-public ParserTokenManager(CharStream stream, int lexState){
+public ParserTokenManager(CharStream stream, int lexState)
+{
this(stream);
SwitchTo(lexState);
}
-
-/** Reinitialise parser. */
public void ReInit(CharStream stream)
{
jjmatchedPos = jjnewStateCnt = 0;
@@ -4050,22 +4075,18 @@
input_stream = stream;
ReInitRounds();
}
-private void ReInitRounds()
+private final void ReInitRounds()
{
int i;
jjround = 0x80000001;
for (i = 101; i-- > 0;)
jjrounds[i] = 0x80000000;
}
-
-/** Reinitialise parser. */
public void ReInit(CharStream stream, int lexState)
{
ReInit(stream);
SwitchTo(lexState);
}
-
-/** Switch to specified lex state. */
public void SwitchTo(int lexState)
{
if (lexState >= 9 || lexState < 0)
@@ -4076,27 +4097,14 @@
protected Token jjFillToken()
{
- final Token t;
- final String curTokenImage;
- final int beginLine;
- final int endLine;
- final int beginColumn;
- final int endColumn;
- String im = jjstrLiteralImages[jjmatchedKind];
- curTokenImage = (im == null) ? input_stream.GetImage() : im;
- beginLine = input_stream.getBeginLine();
- beginColumn = input_stream.getBeginColumn();
- endLine = input_stream.getEndLine();
- endColumn = input_stream.getEndColumn();
- t = Token.newToken(jjmatchedKind);
+ Token t = Token.newToken(jjmatchedKind);
t.kind = jjmatchedKind;
- t.image = curTokenImage;
-
- t.beginLine = beginLine;
- t.endLine = endLine;
- t.beginColumn = beginColumn;
- t.endColumn = endColumn;
-
+ String im = jjstrLiteralImages[jjmatchedKind];
+ t.image = (im == null) ? input_stream.GetImage() : im;
+ t.beginLine = input_stream.getBeginLine();
+ t.beginColumn = input_stream.getBeginColumn();
+ t.endLine = input_stream.getEndLine();
+ t.endColumn = input_stream.getEndColumn();
return t;
}
@@ -4107,29 +4115,28 @@
int jjmatchedPos;
int jjmatchedKind;
-/** Get the next Token. */
public Token getNextToken()
{
+ int kind;
Token specialToken = null;
Token matchedToken;
int curPos = 0;
EOFLoop :
for (;;)
- {
- try
- {
+ {
+ try
+ {
curChar = input_stream.BeginToken();
- }
+ }
catch(java.io.IOException e)
- {
+ {
jjmatchedKind = 0;
matchedToken = jjFillToken();
matchedToken.specialToken = specialToken;
return matchedToken;
}
- image = jjimage;
- image.setLength(0);
+ image = null;
jjimageLen = 0;
for (;;)
@@ -4237,7 +4244,7 @@
}
SkipLexicalActions(matchedToken);
}
- else
+ else
SkipLexicalActions(null);
if (jjnewLexState[jjmatchedKind] != -1)
curLexState = jjnewLexState[jjmatchedKind];
@@ -4283,7 +4290,10 @@
switch(jjmatchedKind)
{
case 66 :
- image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
/*
* push every terminator character back into the stream
*/
@@ -4298,7 +4308,10 @@
stateStackPop();
break;
case 67 :
- image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
if ( debugPrint )
System.out.print("DIRECTIVE_TERM :");
@@ -4316,7 +4329,10 @@
switch(jjmatchedKind)
{
case 13 :
- image.append(input_stream.GetSuffix(jjimageLen));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen)));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen));
jjimageLen = 0;
if (! inComment)
{
@@ -4341,7 +4357,10 @@
}
break;
case 14 :
- image.append(input_stream.GetSuffix(jjimageLen));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen)));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen));
jjimageLen = 0;
if (! inComment)
{
@@ -4366,7 +4385,10 @@
}
break;
case 15 :
- image.append(input_stream.GetSuffix(jjimageLen));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen)));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen));
jjimageLen = 0;
if (!inComment)
{
@@ -4377,7 +4399,10 @@
}
break;
case 16 :
- image.append(input_stream.GetSuffix(jjimageLen));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen)));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen));
jjimageLen = 0;
if (!inComment)
{
@@ -4387,7 +4412,10 @@
}
break;
case 17 :
- image.append(input_stream.GetSuffix(jjimageLen));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen)));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen));
jjimageLen = 0;
if (! inComment)
{
@@ -4413,7 +4441,7 @@
SwitchTo(PRE_DIRECTIVE);
}
break;
- default :
+ default :
break;
}
}
@@ -4422,7 +4450,10 @@
switch(jjmatchedKind)
{
case 8 :
- image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
if (!inComment)
lparen++;
@@ -4435,11 +4466,17 @@
SwitchTo( REFMOD2 );
break;
case 9 :
- image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
RPARENHandler();
break;
case 10 :
- image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
/*
* need to simply switch back to REFERENCE, not drop down the stack
* because we can (infinitely) chain, ala
@@ -4449,7 +4486,10 @@
SwitchTo( REFERENCE );
break;
case 12 :
- image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
if (! inComment)
{
inDirective = true;
@@ -4480,7 +4520,10 @@
}
break;
case 18 :
- image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
if (!inComment)
{
if (curLexState == REFERENCE)
@@ -4495,22 +4538,34 @@
}
break;
case 22 :
- image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
inComment = false;
stateStackPop();
break;
case 23 :
- image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
inComment = false;
stateStackPop();
break;
case 24 :
- image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
inComment = false;
stateStackPop();
break;
case 27 :
- image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
/*
* - if we are in DIRECTIVE and haven't seen ( yet, then also drop out.
* don't forget to account for the beloved yet wierd #set
@@ -4521,7 +4576,10 @@
stateStackPop();
break;
case 30 :
- image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
if ( debugPrint )
System.out.println(" NEWLINE :");
@@ -4534,30 +4592,48 @@
inDirective = false;
break;
case 46 :
- image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
inDirective = false;
stateStackPop();
break;
case 47 :
- image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
SwitchTo(DIRECTIVE);
break;
case 48 :
- image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
SwitchTo(DIRECTIVE);
break;
case 49 :
- image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
inDirective = false;
stateStackPop();
break;
case 50 :
- image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
inDirective = false;
stateStackPop();
break;
case 52 :
- image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
/*
* Remove the double period if it is there
*/
@@ -4578,7 +4654,10 @@
}
break;
case 53 :
- image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
/*
* check to see if we are in set
* ex. #set $foo = $foo + 3
@@ -4591,7 +4670,10 @@
}
break;
case 63 :
- image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
/*
* push the alpha char back into the stream so the following identifier
* is complete
@@ -4611,38 +4693,14 @@
SwitchTo(REFMODIFIER);
break;
case 65 :
- image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+ if (image == null)
+ image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+ else
+ image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
stateStackPop();
break;
- default :
+ default :
break;
}
}
-private void jjCheckNAdd(int state)
-{
- if (jjrounds[state] != jjround)
- {
- jjstateSet[jjnewStateCnt++] = state;
- jjrounds[state] = jjround;
- }
-}
-private void jjAddStates(int start, int end)
-{
- do {
- jjstateSet[jjnewStateCnt++] = jjnextStates[start];
- } while (start++ != end);
-}
-private void jjCheckNAddTwoStates(int state1, int state2)
-{
- jjCheckNAdd(state1);
- jjCheckNAdd(state2);
-}
-
-private void jjCheckNAddStates(int start, int end)
-{
- do {
- jjCheckNAdd(jjnextStates[start]);
- } while (start++ != end);
-}
-
}
Modified: velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java?rev=736127&r1=736126&r2=736127&view=diff
==============================================================================
--- velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java (original)
+++ velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java Tue Jan 20 13:59:00 2009
@@ -1,4 +1,5 @@
-/* Generated By:JavaCC: Do not edit this line. ParserTreeConstants.java Version 4.1 */
+/* Generated By:JJTree: Do not edit this line. ParserTreeConstants.java */
+
package org.apache.velocity.runtime.parser;
public interface ParserTreeConstants
@@ -90,4 +91,3 @@
"NotNode",
};
}
-/* JavaCC - OriginalChecksum=3c1632cd7e231249279dbb78c45031b8 (do not edit this line) */
Modified: velocity/engine/branches/1.6.x/src/parser/Parser.jjt
URL: http://svn.apache.org/viewvc/velocity/engine/branches/1.6.x/src/parser/Parser.jjt?rev=736127&r1=736126&r2=736127&view=diff
==============================================================================
--- velocity/engine/branches/1.6.x/src/parser/Parser.jjt (original)
+++ velocity/engine/branches/1.6.x/src/parser/Parser.jjt Tue Jan 20 13:59:00 2009
@@ -1479,6 +1479,14 @@
}
|
{
+ if (doItNow) // doItNow is true if the directive is "macro"
+ {
+ // VELOCITY-667 We get here if we have a "#macro" construct
+ // without parenthesis which is a parse error
+ throw new MacroParseException("A macro declaration requires at least a name argument"
+ , currentTemplateName, t);
+ }
+
/**
* Not a directive
*/