Author: henning
Date: Sat Oct 29 11:01:49 2005
New Revision: 329459
URL: http://svn.apache.org/viewcvs?rev=329459&view=rev
Log:
rebuild parser using TemplateParseException and JavaCC 3.2
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/parser/Parser.jjt
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=329459&r1=329458&r2=329459&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
Sat Oct 29 11:01:49 2005
@@ -115,7 +115,7 @@
catch (ParseException pe)
{
rsvc.getLog().error("Parser Exception: " + templateName, pe);
- throw new ParseException (pe.currentToken,
+ throw new TemplateParseException (pe.currentToken,
pe.expectedTokenSequences, pe.tokenImage,
currentTemplateName);
}
catch (TokenMgrError tme)
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=329459&r1=329458&r2=329459&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
Sat Oct 29 11:01:49 2005
@@ -1,4 +1,4 @@
-/[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](jjtree) Generated By:JJTree: Do not edit this line.
/home/henning/scratch/velocity/core/src/java/org/apache/velocity/runtime/parser/Parser.jj
*/
/[EMAIL PROTECTED]//*
* Copyright 2000-2004 The Apache Software Foundation.
*
@@ -21,14 +21,14 @@
*/
options
-{
+{
/**
* The parser must be non-static in order for the
* above option to work, otherwise the parser value
* is passed in as null, which isn't all the useful ;)
*/
- STATIC=false;
+ STATIC=false;
/**
* Declare that we are accepting unicode input and
@@ -170,7 +170,7 @@
catch (ParseException pe)
{
rsvc.getLog().error("Parser Exception: " + templateName, pe);
- throw new ParseException (pe.currentToken,
+ throw new TemplateParseException (pe.currentToken,
pe.expectedTokenSequences, pe.tokenImage,
currentTemplateName);
}
catch (TokenMgrError tme)
Modified: jakarta/velocity/core/trunk/src/parser/Parser.jjt
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/parser/Parser.jjt?rev=329459&r1=329458&r2=329459&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/parser/Parser.jjt (original)
+++ jakarta/velocity/core/trunk/src/parser/Parser.jjt Sat Oct 29 11:01:49 2005
@@ -191,7 +191,7 @@
catch (ParseException pe)
{
rsvc.getLog().error("Parser Exception: " + templateName, pe);
- throw new ParseException (pe.currentToken,
+ throw new TemplateParseException (pe.currentToken,
pe.expectedTokenSequences, pe.tokenImage,
currentTemplateName);
}
catch (TokenMgrError tme)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
