Fix bug in conditional expression lexer. Switch to MIT license.

ChangeLog.txt

@@ -1,6 +1,12 @@
 Release History
 
+3.6.2 - 2021-12-31 tmcclure
+
+  Fix bug in conditional expression tokenizer
+  Switch to MIT license
+
 3.6.1 - 2021-03-21 tmcclure
+
   json-smart is now an optional dependency, no longer required in pom.xml
   Add support for jackson-databind to unlock json macro features
 

README.md

@@ -10,6 +10,8 @@ Chunk is compact and speedy, easy to learn yet very powerful.
 
 Chunk templates provide a rich featureset: in-tag filters, in-tag default values, includes, looping and branching, defining multiple snippets per template file, layered themes, macros, and much much more.
 
+Free to use, copyright waived.  MIT License.
+
 Quick Start
 ===========
 
@@ -23,7 +25,7 @@ Available from Maven Central:
     <dependency>
       <groupId>com.x5dev</groupId>
       <artifactId>chunk-templates</artifactId>
-      <version>3.6.1</version>
+      <version>3.6.2</version>
     </dependency>
 ```
 

pom.xml

@@ -3,7 +3,7 @@
   <groupId>com.x5dev</groupId>
   <artifactId>chunk-templates</artifactId>
   <packaging>jar</packaging>
-  <version>3.6.1</version>
+  <version>3.6.2</version>
   <name>Chunk Templates</name>
   <description>Chunk Template Engine for Java</description>
   <url>http://www.x5software.com/chunk/</url>
@@ -20,8 +20,8 @@
 
   <licenses>
     <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <name>MIT License</name>
+      <url>http://www.opensource.org/licenses/mit-license.php</url>
       <distribution>repo</distribution>
     </license>
   </licenses>

src/main/java/com/x5/template/Chunk.java

@@ -244,15 +244,15 @@
  * Updates: <A href="http://www.x5software.com/chunk/">Chunk Documentation</A><BR>
  *
  * @author Tom McClure
- * @version 3.6.1
+ * @version 3.6.2
  */
 
 public class Chunk implements Map<String,Object>
 {
     public static final int HASH_THRESH = 8;
     public static final int DEPTH_LIMIT = 17;
 
-    public static final String VERSION = "3.6.1";
+    public static final String VERSION = "3.6.2";
 
     public static final String TRUE = "TRUE";
 

src/main/java/com/x5/template/CondLexer.java

@@ -59,7 +59,7 @@ private Iterator<String> lexLogicTokens()
             // not a logic token, must be the start of a comparison/test.
             int j = endOfComparison(conditional, i);
             tokens.add(conditional.substring(i,j));
-            i = j;
+            i = j-1;
         }
 
         return tokens.iterator();
@@ -105,6 +105,9 @@ private int endOfComparison(String s, int start) {
                 }
                 continue;
             }
+            if (exprCount > 0 && (c == '&' || c == '|' || c == ')')) {
+                return i;
+            }
             if (exprCount > 0 && (c == '=' || c == '!')) {
                 if (i+1 == len) {
                     return len;

src/main/java/com/x5/template/IfTag.java

@@ -64,7 +64,13 @@ private String stripCasing(String params)
         int exprPos = params.indexOf("f") + 1; // if or elseIf
         String test = params.substring(exprPos).trim();
         if (test.charAt(0) == '(' && test.charAt(test.length()-1) == ')') {
-            test = test.substring(1,test.length()-1);
+            // DON'T strip outer parens if there are ANY inner parens
+            // in fact, maybe never strip outer parens anymore,
+            // ie now that the cond expr parser can handle parens?
+            int innerParenPos = test.indexOf(')', 1);
+            if (innerParenPos == test.length()-1) {
+                test = test.substring(1, test.length() - 1);
+            }
         }
 
         return test;

src/test/java/com/x5/template/IfTagTest.java

@@ -94,6 +94,62 @@ public void testGrouping()
         assertEquals("fail", c.toString());
     }
 
+    @Test
+    public void testAndWithBoolAndInequality()
+    {
+        Chunk c = new Chunk();
+        c.append("{%if $a && $b != 0.0 %}pass{% else %}fail{% endif %}");
+        c.set("a", "A");
+        c.set("b", 1);
+
+        assertEquals("pass", c.toString());
+
+        c.unset("a");
+
+        assertEquals("fail", c.toString());
+
+        c.set("a", "A");
+        c.set("b", "0.0");
+
+        assertEquals("fail", c.toString());
+    }
+
+    @Test
+    public void testAndWithBoolAndInequalityAndGrouping()
+    {
+        Chunk c = new Chunk();
+        c.append("{%if $a && ($b != 0.0) %}pass{% else %}fail{% endif %}");
+        c.set("a", "A");
+        c.set("b", 1);
+
+        assertEquals("pass", c.toString());
+
+        c.resetTemplate();
+        c.append("{%if ($a) && ($b != 0.0) %}pass{% else %}fail{% endif %}");
+
+        assertEquals("pass", c.toString());
+
+        c.unset("a");
+        assertEquals("fail", c.toString());
+
+        c.set("a", "A");
+        c.set("b", "0.0");
+        assertEquals("fail", c.toString());
+
+        c.resetTemplate();
+        c.append("{%if (($a) && ($b != 0.0)) %}pass{% else %}fail{% endif %}");
+
+        c.set("b", 1);
+        assertEquals("pass", c.toString());
+
+        c.unset("a");
+        assertEquals("fail", c.toString());
+
+        c.set("a", "A");
+        c.set("b", "0.0");
+        assertEquals("fail", c.toString());
+    }
+
     @Test
     public void testIfTagWithConstants()
     {