geirm 00/11/26 10:11:41
Modified: src/java/org/apache/velocity/runtime/parser Parser.java
Parser.jj ParserTokenManager.java
Log:
Usual Parser.jjt auto-gen followers.
Revision Changes Path
1.35 +1 -1
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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Parser.java 2000/11/22 02:17:42 1.34
+++ Parser.java 2000/11/26 18:11:38 1.35
@@ -21,7 +21,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.34 2000/11/22 02:17:42 geirm Exp $
+ * @version $Id: Parser.java,v 1.35 2000/11/26 18:11:38 geirm Exp $
*/
public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants, ParserConstants
{/*@bgen(jjtree)*/
protected JJTParserState jjtree = new JJTParserState();/**
1.33 +2 -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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Parser.jj 2000/11/22 02:17:42 1.32
+++ Parser.jj 2000/11/26 18:11:39 1.33
@@ -106,7 +106,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.32 2000/11/22 02:17:42 geirm Exp $
+ * @version $Id: Parser.jj,v 1.33 2000/11/26 18:11:39 geirm Exp $
*/
public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants/*@egen*/
{/*@bgen(jjtree)*/
@@ -862,7 +862,7 @@
<#ALPHA_CHAR: ["a"-"z", "A"-"Z"] >
| <#ALPHANUM_CHAR: [ "a"-"z", "A"-"Z", "0"-"9" ] >
| <#IDENTIFIER_CHAR: [ "a"-"z", "A"-"Z", "0"-"9", "-", "_" ] >
-| <IDENTIFIER: <ALPHA_CHAR> (<IDENTIFIER_CHAR>)* >
+| <IDENTIFIER: ( <ALPHA_CHAR> | ["_"]) (<IDENTIFIER_CHAR>)* >
| <DOT: "." <ALPHA_CHAR>>
{
/*
1.30 +3 -21
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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ParserTokenManager.java 2000/11/21 02:30:01 1.29
+++ ParserTokenManager.java 2000/11/26 18:11:39 1.30
@@ -2112,7 +2112,7 @@
switch(jjstateSet[--i])
{
case 5:
- if ((0x7fffffe07fffffeL & l) != 0L)
+ if ((0x7fffffe87fffffeL & l) != 0L)
{
if (kind > 54)
kind = 54;
@@ -2133,12 +2133,6 @@
jjAddStates(10, 11);
break;
case 9:
- if ((0x7fffffe07fffffeL & l) == 0L)
- break;
- if (kind > 54)
- kind = 54;
- jjCheckNAdd(10);
- break;
case 10:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
@@ -2488,7 +2482,7 @@
switch(jjstateSet[--i])
{
case 5:
- if ((0x7fffffe07fffffeL & l) != 0L)
+ if ((0x7fffffe87fffffeL & l) != 0L)
{
if (kind > 54)
kind = 54;
@@ -2509,12 +2503,6 @@
jjAddStates(12, 13);
break;
case 11:
- if ((0x7fffffe07fffffeL & l) == 0L)
- break;
- if (kind > 54)
- kind = 54;
- jjCheckNAdd(12);
- break;
case 12:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
@@ -2836,7 +2824,7 @@
switch(jjstateSet[--i])
{
case 5:
- if ((0x7fffffe07fffffeL & l) != 0L)
+ if ((0x7fffffe87fffffeL & l) != 0L)
{
if (kind > 54)
kind = 54;
@@ -2857,12 +2845,6 @@
jjAddStates(10, 11);
break;
case 9:
- if ((0x7fffffe07fffffeL & l) == 0L)
- break;
- if (kind > 54)
- kind = 54;
- jjCheckNAdd(10);
- break;
case 10:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
