You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by he...@apache.org on 2006/10/12 22:39:51 UTC
svn commit: r463419 - in
/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser:
Parser.java Parser.jj ParserTokenManager.java ParserTreeConstants.java
Author: henning
Date: Thu Oct 12 13:39:49 2006
New Revision: 463419
URL: http://svn.apache.org/viewvc?view=rev&rev=463419
Log:
Update the generated parser using JavaCC 4.0
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java?view=diff&rev=463419&r1=463418&r2=463419
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java Thu Oct 12 13:39:49 2006
@@ -635,8 +635,7 @@
}
String directiveName;
if (t.kind == ParserConstants.BRACKETED_WORD)
- {
-
+ {
directiveName = t.image.substring(2,t.image.length() - 1);
}
else
@@ -887,7 +886,7 @@
/**
* for creating a map in a #set
*
- * #set($foo = [$foo : $bar, $blargh : $thingy])
+ * #set($foo = {$foo : $bar, $blargh : $thingy})
*/
final public void Map() throws ParseException {
/*@bgen(jjtree) Map */
@@ -2579,6 +2578,11 @@
return false;
}
+ final private boolean jj_3_2() {
+ if (jj_scan_token(DOUBLE_ESCAPE)) return true;
+ return false;
+ }
+
final private boolean jj_3R_35() {
if (jj_scan_token(LCURLY)) return true;
if (jj_scan_token(IDENTIFIER)) return true;
@@ -2591,11 +2595,6 @@
return false;
}
- final private boolean jj_3_2() {
- if (jj_scan_token(DOUBLE_ESCAPE)) return true;
- return false;
- }
-
final private boolean jj_3_12() {
if (jj_scan_token(LBRACKET)) return true;
Token xsp;
@@ -2821,12 +2820,12 @@
return false;
}
- final private boolean jj_3R_84() {
+ final private boolean jj_3R_22() {
if (jj_3R_36()) return true;
return false;
}
- final private boolean jj_3R_22() {
+ final private boolean jj_3R_84() {
if (jj_3R_36()) return true;
return false;
}
@@ -2882,12 +2881,12 @@
return false;
}
- final private boolean jj_3R_83() {
+ final private boolean jj_3R_21() {
if (jj_3R_20()) return true;
return false;
}
- final private boolean jj_3R_21() {
+ final private boolean jj_3R_83() {
if (jj_3R_20()) return true;
return false;
}
@@ -3121,13 +3120,13 @@
return false;
}
- final private boolean jj_3R_33() {
- if (jj_3R_36()) return true;
+ final private boolean jj_3R_62() {
+ if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
return false;
}
- final private boolean jj_3R_62() {
- if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
+ final private boolean jj_3R_33() {
+ if (jj_3R_36()) return true;
return false;
}
@@ -3370,6 +3369,7 @@
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) {
@@ -3391,6 +3391,7 @@
}
p = p.next;
} while (p != null);
+ } catch(LookaheadSuccess ls) { }
}
jj_rescan = false;
}
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj?view=diff&rev=463419&r1=463418&r2=463419
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj Thu Oct 12 13:39:49 2006
@@ -1,4 +1,4 @@
-/*@bgen(jjtree) Generated By:JJTree: Do not edit this line. C:/Documents and Settings/wglass/My Documents/GAWE/velocity/trunk2/src/java/org/apache/velocity/runtime/parser\Parser.jj */
+/*@bgen(jjtree) Generated By:JJTree: Do not edit this line. /Users/hgschmie/scratch/velocity/engine/src/java/org/apache/velocity/runtime/parser/Parser.jj */
/*@egen*//*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -15,14 +15,13 @@
* "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.
*/
/*
* NOTE : please see documentation at bottom of this file. (It was placed there its tiring
* to always have to page past it... :)
*/
-
options
{
@@ -52,7 +51,6 @@
}
PARSER_BEGIN(Parser)
-
package org.apache.velocity.runtime.parser;
import java.io.*;
@@ -1414,8 +1412,7 @@
{
String directiveName;
if (t.kind == ParserConstants.BRACKETED_WORD)
- {
-
+ {
directiveName = t.image.substring(2,t.image.length() - 1);
}
else
@@ -1616,7 +1613,7 @@
/**
* for creating a map in a #set
*
- * #set($foo = [$foo : $bar, $blargh : $thingy])
+ * #set($foo = {$foo : $bar, $blargh : $thingy})
*/
void Map() : {/*@bgen(jjtree) Map */
ASTMap jjtn000 = new ASTMap(this, JJTMAP);
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java?view=diff&rev=463419&r1=463418&r2=463419
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java Thu Oct 12 13:39:49 2006
@@ -3796,12 +3796,10 @@
int jjimageLen;
int lengthOfMatch;
protected char curChar;
-public ParserTokenManager(CharStream stream)
-{
+public ParserTokenManager(CharStream stream){
input_stream = stream;
}
-public ParserTokenManager(CharStream stream, int lexState)
-{
+public ParserTokenManager(CharStream stream, int lexState){
this(stream);
SwitchTo(lexState);
}
@@ -4028,9 +4026,8 @@
{
case 66 :
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)));
+ image = new StringBuffer();
+ image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
/*
* push every terminator character back into the stream
*/
@@ -4046,9 +4043,8 @@
break;
case 67 :
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)));
+ image = new StringBuffer();
+ image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
if ( debugPrint )
System.out.print("DIRECTIVE_TERM :");
@@ -4067,9 +4063,8 @@
{
case 13 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen)));
- else
- image.append(input_stream.GetSuffix(jjimageLen));
+ image = new StringBuffer();
+ image.append(input_stream.GetSuffix(jjimageLen));
jjimageLen = 0;
if (! inComment)
{
@@ -4095,9 +4090,8 @@
break;
case 14 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen)));
- else
- image.append(input_stream.GetSuffix(jjimageLen));
+ image = new StringBuffer();
+ image.append(input_stream.GetSuffix(jjimageLen));
jjimageLen = 0;
if (! inComment)
{
@@ -4123,9 +4117,8 @@
break;
case 15 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen)));
- else
- image.append(input_stream.GetSuffix(jjimageLen));
+ image = new StringBuffer();
+ image.append(input_stream.GetSuffix(jjimageLen));
jjimageLen = 0;
input_stream.backup(1);
inComment = true;
@@ -4134,9 +4127,8 @@
break;
case 16 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen)));
- else
- image.append(input_stream.GetSuffix(jjimageLen));
+ image = new StringBuffer();
+ image.append(input_stream.GetSuffix(jjimageLen));
jjimageLen = 0;
inComment=true;
stateStackPush();
@@ -4144,9 +4136,8 @@
break;
case 17 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen)));
- else
- image.append(input_stream.GetSuffix(jjimageLen));
+ image = new StringBuffer();
+ image.append(input_stream.GetSuffix(jjimageLen));
jjimageLen = 0;
if (! inComment)
{
@@ -4182,8 +4173,7 @@
{
case 8 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
- else
+ image = new StringBuffer();
image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
if (!inComment)
lparen++;
@@ -4198,15 +4188,13 @@
break;
case 9 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
- else
+ image = new StringBuffer();
image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
RPARENHandler();
break;
case 10 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
- else
+ image = new StringBuffer();
image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
/*
* need to simply switch back to REFERENCE, not drop down the stack
@@ -4218,8 +4206,7 @@
break;
case 12 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
- else
+ image = new StringBuffer();
image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
if (! inComment)
{
@@ -4252,8 +4239,7 @@
break;
case 18 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
- else
+ image = new StringBuffer();
image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
if (!inComment)
{
@@ -4270,32 +4256,28 @@
break;
case 22 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
- else
+ image = new StringBuffer();
image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
inComment = false;
stateStackPop();
break;
case 23 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
- else
+ image = new StringBuffer();
image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
inComment = false;
stateStackPop();
break;
case 24 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
- else
+ image = new StringBuffer();
image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
inComment = false;
stateStackPop();
break;
case 27 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
- else
+ image = new StringBuffer();
image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
/*
* - if we are in DIRECTIVE and haven't seen ( yet, then also drop out.
@@ -4308,8 +4290,7 @@
break;
case 30 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
- else
+ image = new StringBuffer();
image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
if ( debugPrint )
System.out.println(" NEWLINE :");
@@ -4324,46 +4305,40 @@
break;
case 46 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
- else
+ image = new StringBuffer();
image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
inDirective = false;
stateStackPop();
break;
case 47 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
- else
+ image = new StringBuffer();
image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
SwitchTo(DIRECTIVE);
break;
case 48 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
- else
+ image = new StringBuffer();
image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
SwitchTo(DIRECTIVE);
break;
case 49 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
- else
+ image = new StringBuffer();
image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
inDirective = false;
stateStackPop();
break;
case 50 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
- else
+ image = new StringBuffer();
image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
inDirective = false;
stateStackPop();
break;
case 52 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
- else
+ image = new StringBuffer();
image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
/*
* Remove the double period if it is there
@@ -4386,8 +4361,7 @@
break;
case 53 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
- else
+ image = new StringBuffer();
image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
/*
* check to see if we are in set
@@ -4402,8 +4376,7 @@
break;
case 63 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
- else
+ image = new StringBuffer();
image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
/*
* push the alpha char back into the stream so the following identifier
@@ -4425,8 +4398,7 @@
break;
case 65 :
if (image == null)
- image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
- else
+ image = new StringBuffer();
image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
stateStackPop();
break;
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java?view=diff&rev=463419&r1=463418&r2=463419
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java Thu Oct 12 13:39:49 2006
@@ -1,4 +1,4 @@
-/* Generated By:JJTree: Do not edit this line. C:/Documents and Settings/wglass/My Documents/GAWE/velocity/trunk2/src/java/org/apache/velocity/runtime/parser\ParserTreeConstants.java */
+/* Generated By:JJTree: Do not edit this line. /Users/hgschmie/scratch/velocity/engine/src/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java */
package org.apache.velocity.runtime.parser;
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org