svn commit: r329576 - in /jakarta/velocity/core/trunk/src: java/org/apache/velocity/runtime/parser/Parser.java java/org/apache/velocity/runtime/parser/Parser.jj parser/Parser.jjt

[henning]

Author: henning
Date: Sun Oct 30 06:52:33 2005
New Revision: 329576

URL: http://svn.apache.org/viewcvs?rev=329576&view=rev
Log:
Remove some unnecessary information from the exeption text, rebuild parser


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=329576&r1=329575&r2=329576&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
 Sun Oct 30 06:52:33 2005
@@ -754,8 +754,7 @@
 
                         {if (true) throw new MacroParseException("Invalid 
first arg "
                             + " in #macro() directive - must be a"
-                            + " word token (no \' or \" surrounding)"
-                            + " at line " + t.beginLine + ", column ", 
currentTemplateName, t);}
+                            + " word token (no \' or \" surrounding)", 
currentTemplateName, t);}
                     }
                 }
 
@@ -2880,6 +2879,11 @@
     return false;
   }
 
+  final private boolean jj_3_1() {
+    if (jj_3R_20()) return true;
+    return false;
+  }
+
   final private boolean jj_3R_70() {
     if (jj_3R_24()) return true;
     Token xsp;
@@ -2890,11 +2894,6 @@
     return false;
   }
 
-  final private boolean jj_3_1() {
-    if (jj_3R_20()) return true;
-    return false;
-  }
-
   final private boolean jj_3R_60() {
     if (jj_scan_token(LBRACKET)) return true;
     Token xsp;
@@ -2930,15 +2929,15 @@
     return false;
   }
 
+  final private boolean jj_3R_45() {
+    if (jj_3R_65()) return true;
+    return false;
+  }
+
   final private boolean jj_3R_69() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(26)) jj_scanpos = xsp;
-    return false;
-  }
-
-  final private boolean jj_3R_45() {
-    if (jj_3R_65()) 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=329576&r1=329575&r2=329576&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
 Sun Oct 30 06:52:33 2005
@@ -1517,8 +1517,7 @@
 
                         throw new MacroParseException("Invalid first arg "
                             + " in #macro() directive - must be a"
-                            + " word token (no \' or \" surrounding)"
-                            + " at line " + t.beginLine + ", column ", 
currentTemplateName, t);
+                            + " word token (no \' or \" surrounding)", 
currentTemplateName, t);
                     }
                 }
 

Modified: jakarta/velocity/core/trunk/src/parser/Parser.jjt
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/parser/Parser.jjt?rev=329576&r1=329575&r2=329576&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/parser/Parser.jjt (original)
+++ jakarta/velocity/core/trunk/src/parser/Parser.jjt Sun Oct 30 06:52:33 2005
@@ -1393,10 +1393,9 @@
                     {
                         /* if a VM and it's the 0th arg, not ok */
 
-                        throw new MacroParseException("Invalid first arg "
+                        throw new MacroParseException("Invalid first arg"
                             + " in #macro() directive - must be a"
-                            + " word token (no \' or \" surrounding)"
-                            + " at line " + t.beginLine + ", column ", 
currentTemplateName, t);
+                            + " word token (no \' or \" surrounding)", 
currentTemplateName, t);
                     }
                 }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]