svn commit: r928463 [1/3] - in /velocity/engine/trunk/src: java/org/apache/velocity/runtime/parser/ java/org/apache/velocity/runtime/parser/node/ parser/ test/org/apache/velocity/test/issues/

[nbubna]

Author: nbubna
Date: Sun Mar 28 18:11:34 2010
New Revision: 928463

URL: http://svn.apache.org/viewvc?rev=928463&view=rev
Log:
VELOCITY-755, VELOCITY-709 fix \ string literal trouble and implement doubling 
quotes to escape (thanks to Jarkko Viinamaki)

Added:
    
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity709TestCase.java
Modified:
    
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
    
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
    
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java
    velocity/engine/trunk/src/parser/Parser.jjt

Modified: 
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java?rev=928463&r1=928462&r2=928463&view=diff
==============================================================================
--- 
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java 
(original)
+++ 
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java 
Sun Mar 28 18:11:34 2010
@@ -2740,27 +2740,6 @@ public class Parser/*...@bgen(jjtree)*/impl
     finally { jj_save(11, xla); }
   }
 
-  private boolean jj_3_12() {
-    if (jj_scan_token(LBRACKET)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(31)) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_36()) {
-    jj_scanpos = xsp;
-    if (jj_3R_37()) return true;
-    }
-    xsp = jj_scanpos;
-    if (jj_scan_token(31)) jj_scanpos = xsp;
-    if (jj_scan_token(DOUBLEDOT)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_65() {
-    if (jj_scan_token(STRING_LITERAL)) return true;
-    return false;
-  }
-
   private boolean jj_3_7() {
     if (jj_scan_token(DOT)) return true;
     Token xsp;
@@ -3215,6 +3194,11 @@ public class Parser/*...@bgen(jjtree)*/impl
     return false;
   }
 
+  private boolean jj_3R_25() {
+    if (jj_3R_24()) return true;
+    return false;
+  }
+
   private boolean jj_3R_68() {
     if (jj_scan_token(LEFT_CURLEY)) return true;
     Token xsp;
@@ -3231,11 +3215,6 @@ public class Parser/*...@bgen(jjtree)*/impl
     return false;
   }
 
-  private boolean jj_3R_25() {
-    if (jj_3R_24()) return true;
-    return false;
-  }
-
   private boolean jj_3_1() {
     if (jj_3R_24()) return true;
     return false;
@@ -3460,6 +3439,27 @@ public class Parser/*...@bgen(jjtree)*/impl
     return false;
   }
 
+  private boolean jj_3_12() {
+    if (jj_scan_token(LBRACKET)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(31)) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_36()) {
+    jj_scanpos = xsp;
+    if (jj_3R_37()) return true;
+    }
+    xsp = jj_scanpos;
+    if (jj_scan_token(31)) jj_scanpos = xsp;
+    if (jj_scan_token(DOUBLEDOT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_65() {
+    if (jj_scan_token(STRING_LITERAL)) return true;
+    return false;
+  }
+
   /** Generated Token Manager. */
   public ParserTokenManager token_source;
   /** Current token. */