You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by nb...@apache.org on 2009/01/22 16:49:13 UTC
svn commit: r736681 [3/3] - in /velocity/engine/trunk/src: changes/
java/org/apache/velocity/runtime/parser/ parser/
test/org/apache/velocity/test/
Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java?rev=736681&r1=736680&r2=736681&view=diff
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java Thu Jan 22 07:49:12 2009
@@ -1,5 +1,4 @@
-/* Generated By:JJTree: Do not edit this line. ParserTreeConstants.java */
-
+/* Generated By:JavaCC: Do not edit this line. ParserTreeConstants.java Version 4.1 */
package org.apache.velocity.runtime.parser;
public interface ParserTreeConstants
@@ -95,3 +94,4 @@
"NotNode",
};
}
+/* JavaCC - OriginalChecksum=6486d1e0227c52f059ed205018b7b6fa (do not edit this line) */
Modified: velocity/engine/trunk/src/parser/Parser.jjt
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/parser/Parser.jjt?rev=736681&r1=736680&r2=736681&view=diff
==============================================================================
--- velocity/engine/trunk/src/parser/Parser.jjt (original)
+++ velocity/engine/trunk/src/parser/Parser.jjt Thu Jan 22 07:49:12 2009
@@ -829,7 +829,7 @@
// treat the single line comment case separately
// to avoid ##<EOF> errors
-<*>
+<DEFAULT,PRE_DIRECTIVE,DIRECTIVE,REFERENCE>
TOKEN :
{
<SINGLE_LINE_COMMENT_START: "##">
Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/IndexTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/IndexTestCase.java?rev=736681&r1=736680&r2=736681&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/IndexTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/IndexTestCase.java Thu Jan 22 07:49:12 2009
@@ -29,6 +29,7 @@
public IndexTestCase(String name)
{
super(name);
+ //DEBUG = true;
}
public void setUp() throws Exception
@@ -59,8 +60,6 @@
Boo boo = new Boo();
context.put("boo", boo);
-
- DEBUG=true;
}
public void testCallingIndex()
Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/TextblockTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/TextblockTestCase.java?rev=736681&r1=736680&r2=736681&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/TextblockTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/TextblockTestCase.java Thu Jan 22 07:49:12 2009
@@ -18,20 +18,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.parser.node.ASTTextblock;
-import org.apache.velocity.test.misc.TestLogChute;
-import org.apache.velocity.test.provider.ForeachMethodCallHelper;
+
+import org.apache.velocity.runtime.RuntimeConstants;
+import org.apache.velocity.runtime.parser.node.ASTTextblock;
/**
* This class tests the Textblock directive.
@@ -140,6 +129,13 @@
{
assertTextblockEvalEquals("<!--#include file=\"wisdom.inc\"--> ");
}
-
+ /**
+ * https://issues.apache.org/jira/browse/VELOCITY-676
+ */
+ public void testLineCommentInsideTextblock() throws Exception
+ {
+ assertTextblockEvalEquals("##x");
+ }
+
}