Author: wglass
Date: Tue Sep 20 00:26:47 2005
New Revision: 290384
URL: http://svn.apache.org/viewcvs?rev=290384&view=rev
Log:
method calls now can take a map for a parameter. VELOCITY-336
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/ParserTokenManager.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=290384&r1=290383&r2=290384&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
Tue Sep 20 00:26:47 2005
@@ -2505,21 +2505,6 @@
finally { jj_save(11, xla); }
}
- final private boolean jj_3R_31() {
- if (jj_3R_20()) return true;
- return false;
- }
-
- final private boolean jj_3R_26() {
- if (jj_3R_35()) return true;
- return false;
- }
-
- final private boolean jj_3_10() {
- if (jj_3R_28()) return true;
- return false;
- }
-
final private boolean jj_3R_81() {
if (jj_scan_token(COMMA)) return true;
if (jj_3R_24()) return true;
@@ -3117,6 +3102,21 @@
final private boolean jj_3R_61() {
if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_31() {
+ if (jj_3R_20()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_26() {
+ if (jj_3R_35()) return true;
+ return false;
+ }
+
+ final private boolean jj_3_10() {
+ if (jj_3R_28()) 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=290384&r1=290383&r2=290384&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
Tue Sep 20 00:26:47 2005
@@ -448,7 +448,7 @@
<COLON : ":" >
}
-<DIRECTIVE>
+<DIRECTIVE, REFMOD2>
TOKEN :
{
<LEFT_CURLEY : "{" >
@@ -989,7 +989,13 @@
SwitchTo(REFMODIFIER);
}
-| <LCURLY: "{">
+}
+
+
+<REFERENCE,REFMODIFIER>
+TOKEN :
+{
+ <LCURLY: "{">
| <RCURLY: "}">
{
stateStackPop();
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=290384&r1=290383&r2=290384&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
Tue Sep 20 00:26:47 2005
@@ -469,7 +469,7 @@
<COLON : ":" >
}
-<DIRECTIVE>
+<DIRECTIVE, REFMOD2>
TOKEN :
{
<LEFT_CURLEY : "{" >
@@ -1010,7 +1010,13 @@
SwitchTo(REFMODIFIER);
}
-| <LCURLY: "{">
+}
+
+
+<REFERENCE,REFMODIFIER>
+TOKEN :
+{
+ <LCURLY: "{">
| <RCURLY: "}">
{
stateStackPop();
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java?rev=290384&r1=290383&r2=290384&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
Tue Sep 20 00:26:47 2005
@@ -2842,7 +2842,7 @@
catch(java.io.IOException e) { return curPos; }
}
}
-private final int jjStopStringLiteralDfa_1(int pos, long active0, long active1)
+private final int jjStopStringLiteralDfa_1(int pos, long active0)
{
switch (pos)
{
@@ -2889,9 +2889,9 @@
return -1;
}
}
-private final int jjStartNfa_1(int pos, long active0, long active1)
+private final int jjStartNfa_1(int pos, long active0)
{
- return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0, active1), pos +
1);
+ return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0), pos + 1);
}
private final int jjStartNfaWithStates_1(int pos, int kind, int state)
{
@@ -2925,9 +2925,9 @@
case 116:
return jjMoveStringLiteralDfa1_1(0x10000000L);
case 123:
- return jjStopAtPos(0, 64);
+ return jjStopAtPos(0, 6);
case 125:
- return jjStopAtPos(0, 65);
+ return jjStopAtPos(0, 7);
default :
return jjMoveNfa_1(3, 0);
}
@@ -2936,7 +2936,7 @@
{
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
- jjStopStringLiteralDfa_1(0, active0, 0L);
+ jjStopStringLiteralDfa_1(0, active0);
return 1;
}
switch(curChar)
@@ -2960,15 +2960,15 @@
default :
break;
}
- return jjStartNfa_1(0, active0, 0L);
+ return jjStartNfa_1(0, active0);
}
private final int jjMoveStringLiteralDfa2_1(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjStartNfa_1(0, old0, 0L);
+ return jjStartNfa_1(0, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
- jjStopStringLiteralDfa_1(1, active0, 0L);
+ jjStopStringLiteralDfa_1(1, active0);
return 2;
}
switch(curChar)
@@ -2980,15 +2980,15 @@
default :
break;
}
- return jjStartNfa_1(1, active0, 0L);
+ return jjStartNfa_1(1, active0);
}
private final int jjMoveStringLiteralDfa3_1(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjStartNfa_1(1, old0, 0L);
+ return jjStartNfa_1(1, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
- jjStopStringLiteralDfa_1(2, active0, 0L);
+ jjStopStringLiteralDfa_1(2, active0);
return 3;
}
switch(curChar)
@@ -3002,15 +3002,15 @@
default :
break;
}
- return jjStartNfa_1(2, active0, 0L);
+ return jjStartNfa_1(2, active0);
}
private final int jjMoveStringLiteralDfa4_1(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjStartNfa_1(2, old0, 0L);
+ return jjStartNfa_1(2, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
- jjStopStringLiteralDfa_1(3, active0, 0L);
+ jjStopStringLiteralDfa_1(3, active0);
return 4;
}
switch(curChar)
@@ -3022,7 +3022,7 @@
default :
break;
}
- return jjStartNfa_1(3, active0, 0L);
+ return jjStartNfa_1(3, active0);
}
private final int jjMoveNfa_1(int startState, int curPos)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
