You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by ge...@apache.org on 2001/07/14 15:23:14 UTC
cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime/parser Parser.java Parser.jj
geirm 01/07/14 06:23:14
Modified: src/java/org/apache/velocity/runtime/parser Parser.java
Parser.jj
Log:
Parser.jjt followers
Revision Changes Path
1.63 +5 -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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Parser.java 2001/06/29 23:32:48 1.62
+++ Parser.java 2001/07/14 13:23:12 1.63
@@ -21,7 +21,7 @@
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: Parser.java,v 1.62 2001/06/29 23:32:48 geirm Exp $
+ * @version $Id: Parser.java,v 1.63 2001/07/14 13:23:12 geirm Exp $
*/
public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants, ParserConstants {/*@bgen(jjtree)*/
protected JJTParserState jjtree = new JJTParserState();/**
@@ -100,6 +100,10 @@
Runtime.error ("Parser Exception: " + templateName + " : " + StringUtils.stackTrace(pe));
throw new ParseException (pe.currentToken,
pe.expectedTokenSequences, pe.tokenImage);
+ }
+ catch (TokenMgrError tme)
+ {
+ throw new ParseException("Lexical error: " + tme.toString());
}
catch (Exception e)
{
1.61 +5 -1 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.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- Parser.jj 2001/06/29 23:32:49 1.60
+++ Parser.jj 2001/07/14 13:23:13 1.61
@@ -112,7 +112,7 @@
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: Parser.jj,v 1.60 2001/06/29 23:32:49 geirm Exp $
+ * @version $Id: Parser.jj,v 1.61 2001/07/14 13:23:13 geirm Exp $
*/
public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants/*@egen*/
{/*@bgen(jjtree)*/
@@ -195,6 +195,10 @@
Runtime.error ("Parser Exception: " + templateName + " : " + StringUtils.stackTrace(pe));
throw new ParseException (pe.currentToken,
pe.expectedTokenSequences, pe.tokenImage);
+ }
+ catch (TokenMgrError tme)
+ {
+ throw new ParseException("Lexical error: " + tme.toString());
}
catch (Exception e)
{