Author: wglass
Date: Mon Sep 19 23:01:24 2005
New Revision: 290368
URL: http://svn.apache.org/viewcvs?rev=290368&view=rev
Log:
allow empty body in #if, e.g. #if(true)#end as suggested in Velocity-359
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jjt
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java?rev=290368&r1=290367&r2=290368&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
Mon Sep 19 23:01:24 2005
@@ -1407,7 +1407,6 @@
try {
label_10:
while (true) {
- Statement();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LPAREN:
case RPAREN:
@@ -1436,6 +1435,7 @@
jj_la1[32] = jj_gen;
break label_10;
}
+ Statement();
}
} catch (Throwable jjte001) {
if (jjtc001) {
@@ -1518,7 +1518,6 @@
try {
label_12:
while (true) {
- Statement();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LPAREN:
case RPAREN:
@@ -1547,6 +1546,7 @@
jj_la1[36] = jj_gen;
break label_12;
}
+ Statement();
}
} catch (Throwable jjte001) {
if (jjtc001) {
@@ -1612,7 +1612,6 @@
try {
label_13:
while (true) {
- Statement();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LPAREN:
case RPAREN:
@@ -1641,6 +1640,7 @@
jj_la1[38] = jj_gen;
break label_13;
}
+ Statement();
}
} catch (Throwable jjte001) {
if (jjtc001) {
@@ -2626,11 +2626,6 @@
return false;
}
- final private boolean jj_3R_78() {
- if (jj_3R_64()) return true;
- return false;
- }
-
final private boolean jj_3R_20() {
Token xsp;
xsp = jj_scanpos;
@@ -2641,8 +2636,8 @@
return false;
}
- final private boolean jj_3R_77() {
- if (jj_3R_63()) return true;
+ final private boolean jj_3R_78() {
+ if (jj_3R_64()) return true;
return false;
}
@@ -2651,6 +2646,11 @@
return false;
}
+ final private boolean jj_3R_77() {
+ if (jj_3R_63()) return true;
+ return false;
+ }
+
final private boolean jj_3R_76() {
if (jj_3R_62()) return true;
return false;
@@ -2692,11 +2692,6 @@
return false;
}
- final private boolean jj_3R_71() {
- if (jj_3R_59()) return true;
- return false;
- }
-
final private boolean jj_3R_28() {
if (jj_3R_55()) return true;
if (jj_scan_token(LPAREN)) return true;
@@ -2707,6 +2702,11 @@
return false;
}
+ final private boolean jj_3R_71() {
+ if (jj_3R_59()) return true;
+ return false;
+ }
+
final private boolean jj_3R_66() {
Token xsp;
xsp = jj_scanpos;
@@ -2758,6 +2758,19 @@
return false;
}
+ final private boolean jj_3R_84() {
+ if (jj_scan_token(COMMA)) return true;
+ if (jj_3R_24()) return true;
+ if (jj_scan_token(COLON)) return true;
+ if (jj_3R_24()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_51() {
+ if (jj_3R_64()) return true;
+ return false;
+ }
+
final private boolean jj_3R_30() {
Token xsp;
xsp = jj_scanpos;
@@ -2782,19 +2795,6 @@
return false;
}
- final private boolean jj_3R_84() {
- if (jj_scan_token(COMMA)) return true;
- if (jj_3R_24()) return true;
- if (jj_scan_token(COLON)) return true;
- if (jj_3R_24()) return true;
- return false;
- }
-
- final private boolean jj_3R_51() {
- if (jj_3R_64()) return true;
- return false;
- }
-
final private boolean jj_3R_50() {
if (jj_3R_63()) return true;
return false;
@@ -3100,13 +3100,13 @@
return false;
}
- final private boolean jj_3R_32() {
- if (jj_3R_35()) return true;
+ final private boolean jj_3R_59() {
+ if (jj_scan_token(STRING_LITERAL)) return true;
return false;
}
- final private boolean jj_3R_59() {
- if (jj_scan_token(STRING_LITERAL)) return true;
+ final private boolean jj_3R_32() {
+ if (jj_3R_35()) return true;
return false;
}
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj?rev=290368&r1=290367&r2=290368&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj
Mon Sep 19 23:01:24 2005
@@ -1,4 +1,4 @@
-/[EMAIL PROTECTED](jjtree) Generated By:JJTree: Do not edit this line.
Parser.jj */
+/[EMAIL PROTECTED](jjtree) Generated By:JJTree: Do not edit this line.
C:/Documents and Settings/wglass/My
Documents/GAWE/velocity/trunk/src/java/org/apache/velocity/runtime/parser\Parser.jj
*/
/[EMAIL PROTECTED]//*
* Copyright 2000-2004 The Apache Software Foundation.
*
@@ -1910,7 +1910,7 @@
}
try {
/[EMAIL PROTECTED]/
- ( Statement() )+/[EMAIL PROTECTED](jjtree)*/
+ ( Statement() )*/[EMAIL PROTECTED](jjtree)*/
} catch (Throwable jjte001) {
if (jjtc001) {
jjtree.clearNodeScope(jjtn001);
@@ -1954,7 +1954,6 @@
}
}
/[EMAIL PROTECTED]/
-
}
void ElseStatement() : {/[EMAIL PROTECTED](jjtree) ElseStatement */
@@ -1973,7 +1972,7 @@
}
try {
/[EMAIL PROTECTED]/
- ( Statement() )+/[EMAIL PROTECTED](jjtree)*/
+ ( Statement() )*/[EMAIL PROTECTED](jjtree)*/
} catch (Throwable jjte001) {
if (jjtc001) {
jjtree.clearNodeScope(jjtn001);
@@ -2033,7 +2032,7 @@
}
try {
/[EMAIL PROTECTED]/
- ( Statement() )+/[EMAIL PROTECTED](jjtree)*/
+ ( Statement() )*/[EMAIL PROTECTED](jjtree)*/
} catch (Throwable jjte001) {
if (jjtc001) {
jjtree.clearNodeScope(jjtn001);
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jjt
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jjt?rev=290368&r1=290367&r2=290368&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jjt
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jjt
Mon Sep 19 23:01:24 2005
@@ -1557,24 +1557,23 @@
void IfStatement() : {}
{
<IF_DIRECTIVE> [<WHITESPACE>] <LPAREN> Expression() <RPAREN>
- ( Statement() )+ #Block
+ ( Statement() )* #Block
[ LOOKAHEAD(1) ( ElseIfStatement() )+ ]
[ LOOKAHEAD(1) ElseStatement() ]
<END>
-
}
void ElseStatement() : {}
{
<ELSE_DIRECTIVE>
- ( Statement() )+ #Block
+ ( Statement() )* #Block
}
void ElseIfStatement() : {}
{
<ELSEIF_DIRECTIVE> [<WHITESPACE>]
<LPAREN> Expression() <RPAREN>
- ( Statement() )+ #Block
+ ( Statement() )* #Block
}
/**
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java?rev=290368&r1=290367&r2=290368&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java
Mon Sep 19 23:01:24 2005
@@ -1,4 +1,4 @@
-/* Generated By:JJTree: Do not edit this line. ParserTreeConstants.java */
+/* Generated By:JJTree: Do not edit this line. C:/Documents and
Settings/wglass/My
Documents/GAWE/velocity/trunk/src/java/org/apache/velocity/runtime/parser\ParserTreeConstants.java
*/
package org.apache.velocity.runtime.parser;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
