#210 Correction

Author: ericbn

javalite-templator/src/main/java/org/javalite/templator/TemplateParser.java

@@ -22,7 +22,7 @@
  *
  *
  * TAG_START = '&lt' '#'
- * TAG_END = '&lt' '/' '#' LOWER_ALPHA '>'
+ * TAG_END = '&lt' '/' '#' LOWER_ALPHA '>'
  * IF_TAG = TAG_START "if" '(' EXPRESSION ')' '>' LIST_TAG_BODY TAG_END "if" '>'
  * </pre>
  *
@@ -169,9 +169,11 @@ private Exp _expId() {
         ChainedIds chainedIds = _chainedIds();
         if (chainedIds == null) { return null; }
         _whitespace(); // optional
+        //TODO: refactor this
+        int currentIndex = index;
         Comparison.Operator operator = _comparisonOperator();
         if (operator == null) {
-            return new BooleanId(chainedIds);
+            return currentIndex == index ? new BooleanId(chainedIds) : null;
         } else {
             _whitespace(); // optional
             ChainedIds rightOperand = _chainedIds();

javalite-templator/src/test/java/org/javalite/templator/TemplateParserSpec.java

@@ -6,6 +6,7 @@
 import java.util.Map;
 import static org.javalite.common.Collections.*;
 import static org.javalite.test.jspec.JSpec.*;
+import org.junit.Ignore;
 
 /**
  * @author Eric Nielsen
@@ -47,23 +48,23 @@ public void shouldParseBuiltIn() throws Exception {
     }
 
     @Test
-    public void shouldParseExpressionWithEq() throws Exception {
+    public void shouldParseIfTagWithEq() throws Exception {
         ParentNode node = (ParentNode) new TemplateParser("<b><<#if(left==right)>tada</#if>></b>").parse();
         the(node.children.size()).shouldBeEqual(3);
         the(process(node, map("left", "help!", "right", "help!"))).shouldBeEqual("<b><tada></b>");
         the(process(node, map("left", "help!", "right", "help?"))).shouldBeEqual("<b><></b>");
     }
 
     @Test
-    public void shouldParseExpressionWithNotNeq() throws Exception {
+    public void shouldParseIfTagWithNotNeq() throws Exception {
         ParentNode node = (ParentNode) new TemplateParser("<#if(!left!=right)>tada</#if>").parse();
         the(node.children.size()).shouldBeEqual(1);
         the(process(node, map("left", 0, "right", 0))).shouldBeEqual("tada");
         the(process(node, map("left", 0, "right", 1))).shouldBeEqual("");
     }
 
     @Test
-    public void shouldParseExpressionWithAndParensOr() throws Exception {
+    public void shouldParseIfTagWithAndParensOr() throws Exception {
         ParentNode node = (ParentNode) new TemplateParser(
                 "<#if (first > second && (first > third || third <= second))><b>%{first}</b></#if>").parse();
         the(node.children.size()).shouldBeEqual(1);
@@ -73,11 +74,26 @@ public void shouldParseExpressionWithAndParensOr() throws Exception {
     }
 
     @Test
-    public void shouldParseExpressionWithBoolean() throws Exception {
+    public void shouldParseIfTagWithBoolean() throws Exception {
         ParentNode node = (ParentNode) new TemplateParser("<#if (foo)>bar</#if>").parse();
         the(node.children.size()).shouldBeEqual(1);
         the(process(node, map("foo", true))).shouldBeEqual("bar");
         the(process(node, map("foo", false))).shouldBeEqual("");
     }
 
+    @Test
+    public void shouldNotParseInvalidIfTagWithBoolean() throws Exception {
+        String source = "<#if (foo=)>bar</#if>";
+        ParentNode node = (ParentNode) new TemplateParser(source).parse();
+        the(node.children.size()).shouldBeEqual(1);
+        the(process(node, map())).shouldBeEqual(source);
+    }
+
+    @Ignore
+    @Test
+    public void shouldParseForTag() throws Exception {
+        ParentNode node = (ParentNode) new TemplateParser("<#for item:list> %{item} </#for>").parse();
+        the(node.children.size()).shouldBeEqual(1);
+        the(process(node, map("list", list(1, 2, 3)))).shouldBeEqual(" 1  2  3 ");
+    }
 }