geirm 00/11/03 03:35:01
Modified: src/java/org/apache/velocity/runtime/parser Parser.java
Parser.jj ParserTokenManager.java
Log:
Parser.jjt followers. ( the $strings.getVillageType($col.Type) bug)
Revision Changes Path
1.18 +48 -48
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.java
Index: Parser.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Parser.java 2000/11/03 03:27:53 1.17
+++ Parser.java 2000/11/03 11:34:51 1.18
@@ -18,7 +18,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: Parser.java,v 1.17 2000/11/03 03:27:53 geirm Exp $
+ * @version $Id: Parser.java,v 1.18 2000/11/03 11:34:51 geirm Exp $
*/
public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants, ParserConstants
{/*@bgen(jjtree)*/
protected JJTParserState jjtree = new JJTParserState();
@@ -1818,53 +1818,6 @@
return retval;
}
- final private boolean jj_3R_73() {
- if (jj_3R_19()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_76() {
- if (jj_scan_token(MODULUS)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_68()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_72() {
- if (jj_scan_token(LOGICAL_NOT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_68()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_68() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_72()) {
- jj_scanpos = xsp;
- if (jj_3R_73()) 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_30() {
- if (jj_scan_token(STRING_LITERAL)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_75() {
- if (jj_scan_token(DIVIDE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_68()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
final private boolean jj_3R_74() {
if (jj_scan_token(MULTIPLY)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -2392,6 +2345,53 @@
} 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_73() {
+ if (jj_3R_19()) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ return false;
+ }
+
+ final private boolean jj_3R_76() {
+ if (jj_scan_token(MODULUS)) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_68()) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ return false;
+ }
+
+ final private boolean jj_3R_72() {
+ if (jj_scan_token(LOGICAL_NOT)) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_68()) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ return false;
+ }
+
+ final private boolean jj_3R_68() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_72()) {
+ jj_scanpos = xsp;
+ if (jj_3R_73()) 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_30() {
+ if (jj_scan_token(STRING_LITERAL)) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ return false;
+ }
+
+ final private boolean jj_3R_75() {
+ if (jj_scan_token(DIVIDE)) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_68()) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
1.18 +9 -2
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.jj
Index: Parser.jj
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.jj,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Parser.jj 2000/11/03 03:27:55 1.17
+++ Parser.jj 2000/11/03 11:34:53 1.18
@@ -103,7 +103,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: Parser.jj,v 1.17 2000/11/03 03:27:55 geirm Exp $
+ * @version $Id: Parser.jj,v 1.18 2000/11/03 11:34:53 geirm Exp $
*/
public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants/*@egen*/
{/*@bgen(jjtree)*/
@@ -453,8 +453,15 @@
if (curLexState == REFMODIFIER )
SwitchTo( REFMOD2 );
}
+}
-| <RPAREN: ")" (" ")* ( "\n" | "\r" | "\r\n" )?>
+/* $$$ gmj
+ * we never will see a ) in anything but DIRECTIVE and REFMOD2. Each have their
own
+ */
+<DIRECTIVE>
+TOKEN:
+{
+ <RPAREN: ")" (" ")* ( "\n" | "\r" | "\r\n" )?>
{
RPARENHandler();
}
1.16 +53 -82
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
Index: ParserTokenManager.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ParserTokenManager.java 2000/11/03 03:27:56 1.15
+++ ParserTokenManager.java 2000/11/03 11:34:56 1.16
@@ -1389,12 +1389,12 @@
if ((active0 & 0x60000000L) != 0L)
{
jjmatchedKind = 61;
- return 15;
+ return 10;
}
if ((active0 & 0x50000L) != 0L)
{
jjmatchedKind = 19;
- return 8;
+ return 3;
}
if ((active0 & 0x8000L) != 0L)
{
@@ -1403,14 +1403,8 @@
}
return -1;
case 1:
- if ((active0 & 0x60000000L) != 0L)
- {
- jjmatchedKind = 61;
- jjmatchedPos = 1;
- return 15;
- }
if ((active0 & 0x40000L) != 0L)
- return 6;
+ return 1;
if ((active0 & 0x8000L) != 0L)
{
if (jjmatchedPos == 0)
@@ -1420,23 +1414,29 @@
}
return -1;
}
+ if ((active0 & 0x60000000L) != 0L)
+ {
+ jjmatchedKind = 61;
+ jjmatchedPos = 1;
+ return 10;
+ }
return -1;
case 2:
if ((active0 & 0x60000000L) != 0L)
{
jjmatchedKind = 61;
jjmatchedPos = 2;
- return 15;
+ return 10;
}
return -1;
case 3:
if ((active0 & 0x20000000L) != 0L)
- return 15;
+ return 10;
if ((active0 & 0x40000000L) != 0L)
{
jjmatchedKind = 61;
jjmatchedPos = 3;
- return 15;
+ return 10;
}
return -1;
default :
@@ -1478,7 +1478,7 @@
case 125:
return jjStopAtPos(0, 64);
default :
- return jjMoveNfa_1(0, 0);
+ return jjMoveNfa_1(4, 0);
}
}
private final int jjMoveStringLiteralDfa1_1(long active0)
@@ -1500,7 +1500,7 @@
break;
case 42:
if ((active0 & 0x40000L) != 0L)
- return jjStartNfaWithStates_1(1, 18, 6);
+ return jjStartNfaWithStates_1(1, 18, 1);
break;
case 97:
return jjMoveStringLiteralDfa2_1(active0, 0x40000000L);
@@ -1544,7 +1544,7 @@
{
case 101:
if ((active0 & 0x20000000L) != 0L)
- return jjStartNfaWithStates_1(3, 29, 15);
+ return jjStartNfaWithStates_1(3, 29, 10);
break;
case 115:
return jjMoveStringLiteralDfa4_1(active0, 0x40000000L);
@@ -1566,7 +1566,7 @@
{
case 101:
if ((active0 & 0x40000000L) != 0L)
- return jjStartNfaWithStates_1(4, 30, 15);
+ return jjStartNfaWithStates_1(4, 30, 10);
break;
default :
break;
@@ -1577,7 +1577,7 @@
{
int[] nextStates;
int startsAt = 0;
- jjnewStateCnt = 19;
+ jjnewStateCnt = 14;
int i = 1;
jjstateSet[0] = startState;
int j, kind = 0x7fffffff;
@@ -1592,11 +1592,11 @@
{
switch(jjstateSet[--i])
{
- case 0:
+ case 4:
if (curChar == 46)
- jjstateSet[jjnewStateCnt++] = 17;
+ jjstateSet[jjnewStateCnt++] = 12;
else if (curChar == 34)
- jjCheckNAddTwoStates(12, 13);
+ jjCheckNAddTwoStates(7, 8);
else if (curChar == 35)
{
if (kind > 19)
@@ -1607,80 +1607,51 @@
if (kind > 14)
kind = 14;
}
- else if (curChar == 41)
- {
- if (kind > 5)
- kind = 5;
- jjCheckNAddStates(0, 2);
- }
if (curChar == 35)
- jjstateSet[jjnewStateCnt++] = 8;
- break;
- case 1:
- if (curChar != 32)
- break;
- if (kind > 5)
- kind = 5;
- jjCheckNAddStates(0, 2);
- break;
- case 2:
- if ((0x2400L & l) != 0L && kind > 5)
- kind = 5;
- break;
- case 3:
- if (curChar == 10 && kind > 5)
- kind = 5;
- break;
- case 4:
- if (curChar == 13)
jjstateSet[jjnewStateCnt++] = 3;
break;
- case 5:
+ case 0:
if (curChar == 36 && kind > 14)
kind = 14;
break;
- case 6:
+ case 1:
if (curChar == 42)
- jjstateSet[jjnewStateCnt++] = 7;
+ jjstateSet[jjnewStateCnt++] = 2;
break;
- case 7:
+ case 2:
if ((0xfffffff7ffffffffL & l) != 0L && kind > 17)
kind = 17;
break;
- case 8:
+ case 3:
if (curChar == 42)
- jjstateSet[jjnewStateCnt++] = 6;
- break;
- case 9:
- if (curChar == 35)
- jjstateSet[jjnewStateCnt++] = 8;
+ jjstateSet[jjnewStateCnt++] = 1;
break;
- case 10:
+ case 5:
if (curChar == 35 && kind > 19)
kind = 19;
break;
- case 11:
+ case 6:
if (curChar == 34)
- jjCheckNAddTwoStates(12, 13);
+ jjCheckNAddTwoStates(7, 8);
break;
- case 12:
+ case 7:
if ((0xfffffffbffffdbffL & l) != 0L)
- jjCheckNAddTwoStates(12, 13);
+ jjCheckNAddTwoStates(7, 8);
break;
- case 13:
+ case 8:
if (curChar == 34 && kind > 28)
kind = 28;
break;
- case 15:
+ case 10:
if ((0x3ff200000000000L & l) == 0L)
break;
if (kind > 61)
kind = 61;
- jjstateSet[jjnewStateCnt++] = 15;
+ jjstateSet[jjnewStateCnt++] = 10;
break;
- case 16:
+ case 11:
if (curChar == 46)
- jjstateSet[jjnewStateCnt++] = 17;
+ jjstateSet[jjnewStateCnt++] = 12;
break;
default : break;
}
@@ -1693,44 +1664,44 @@
{
switch(jjstateSet[--i])
{
- case 0:
+ case 4:
if ((0x7fffffe07fffffeL & l) != 0L)
{
if (kind > 61)
kind = 61;
- jjCheckNAdd(15);
+ jjCheckNAdd(10);
}
else if (curChar == 92)
- jjAddStates(3, 4);
+ jjAddStates(9, 10);
break;
- case 7:
+ case 2:
if (kind > 17)
kind = 17;
break;
- case 12:
- jjAddStates(5, 6);
+ case 7:
+ jjAddStates(11, 12);
break;
- case 14:
+ case 9:
if ((0x7fffffe07fffffeL & l) == 0L)
break;
if (kind > 61)
kind = 61;
- jjCheckNAdd(15);
+ jjCheckNAdd(10);
break;
- case 15:
+ case 10:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
if (kind > 61)
kind = 61;
- jjCheckNAdd(15);
+ jjCheckNAdd(10);
break;
- case 17:
+ case 12:
if ((0x7fffffe07fffffeL & l) != 0L && kind > 62)
kind = 62;
break;
- case 18:
+ case 13:
if (curChar == 92)
- jjAddStates(3, 4);
+ jjAddStates(9, 10);
break;
default : break;
}
@@ -1744,13 +1715,13 @@
{
switch(jjstateSet[--i])
{
- case 7:
+ case 2:
if ((jjbitVec0[i2] & l2) != 0L && kind > 17)
kind = 17;
break;
- case 12:
+ case 7:
if ((jjbitVec0[i2] & l2) != 0L)
- jjAddStates(5, 6);
+ jjAddStates(11, 12);
break;
default : break;
}
@@ -1763,7 +1734,7 @@
kind = 0x7fffffff;
}
++curPos;
- if ((i = jjnewStateCnt) == (startsAt = 19 - (jjnewStateCnt = startsAt)))
+ if ((i = jjnewStateCnt) == (startsAt = 14 - (jjnewStateCnt = startsAt)))
return curPos;
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) { return curPos; }
