"Strict mode" the same behavior as in ruby's

ruby/case_numeric_camparing_as_string.rb

@@ -2,5 +2,7 @@
 
 require_relative '_helpers.rb'
 
-pp render({}, "{% assign comparingValue = 98.0 %}{{ 98 > comparingValue }}")
-assertEqual("true", render({}, "{% assign comparingValue = 98.0 %}{{ '98' == comparingValue }}"))
+# pp render({}, "{% assign comparingValue = 98.0 %}{{ 98 > comparingValue }}")
+# assertEqual("true", render({}, "{% assign comparingValue = 98.0 %}{{ '98' == comparingValue }}"))
+
+assertEqual("true", render({}, "{% if 98 > '98' %}true{% else %}false{% endif %}"))

src/main/antlr4/liquid/parser/v4/LiquidParser.g4

@@ -1,19 +1,43 @@
 parser grammar LiquidParser;
 
+@parser::header {
+    // add java imports here
+import liqp.TemplateParser;
+}
+
 @parser::members {
-    private boolean isLiquid = true;
+    private boolean liquidStyleInclude = true;
+    private boolean evaluateInOutputTag = false;
+    private TemplateParser.ErrorMode errorMode = TemplateParser.ErrorMode.lax;
+
+    private boolean isLiquidStyleInclude(){
+        return liquidStyleInclude;
+    }
 
-    private boolean isLiquid(){
-        return isLiquid;
+    private boolean isJekyllStyleInclude(){
+        return !liquidStyleInclude;
     }
 
-    private boolean isJekyll(){
-        return !isLiquid;
+    private boolean isEvaluateInOutputTag() {
+        return evaluateInOutputTag;
     }
 
-    public LiquidParser(TokenStream input, boolean isLiquid) {
+    private boolean isStrict() {
+        return errorMode == TemplateParser.ErrorMode.strict;
+    }
+    private boolean isWarn() {
+        return errorMode == TemplateParser.ErrorMode.warn;
+    }
+
+    private boolean isLax() {
+        return errorMode == TemplateParser.ErrorMode.lax;
+    }
+
+    public LiquidParser(TokenStream input, boolean isLiquidStyleInclude, boolean evaluateInOutputTag, TemplateParser.ErrorMode errorMode) {
         this(input);
-        this.isLiquid = isLiquid;
+        this.liquidStyleInclude = isLiquidStyleInclude;
+        this.evaluateInOutputTag = evaluateInOutputTag;
+        this.errorMode = errorMode;
     }
 
     public void reportTokenError(String message, Token token) {
@@ -177,8 +201,8 @@ capture_tag
  ;
 
 include_tag
- : {isLiquid()}? TagStart liquid=Include expr (With Str)? TagEnd
- | {isJekyll()}? TagStart jekyll=Include file_name_or_output (jekyll_include_params)* TagEnd
+ : {isLiquidStyleInclude()}? TagStart liquid=Include expr (With Str)? TagEnd
+ | {isJekyllStyleInclude()}? TagStart jekyll=Include file_name_or_output (jekyll_include_params)* TagEnd
  ;
 
 // only valid for Flavor.JEKYLL
@@ -193,7 +217,13 @@ jekyll_include_params
  ;
 
 output
- : outStart expr filter* OutEnd
+ : {evaluateInOutputTag}? outStart evaluate=expr filter* OutEnd
+ | {isStrict()}? outStart term filter* OutEnd
+ | {isWarn() || isLax()}? outStart term filter* unparsed=not_out_end? OutEnd
+ ;
+
+not_out_end
+ : ~( OutEnd )*
  ;
 
 filter

src/main/java/liqp/Examples.java

@@ -15,17 +15,14 @@
 public class Examples {
 
     private static void demoGuards() {
-        ProtectionSettings protectionSettings = new ProtectionSettings.Builder() //
+
+        TemplateParser parser = new TemplateParser.Builder() //
                 .withMaxSizeRenderedString(300) //
                 .withMaxIterations(15) //
                 .withMaxRenderTimeMillis(100L) //
                 .withMaxTemplateSizeBytes(100) //
                 .build();
 
-        TemplateParser parser = new TemplateParser.Builder() //
-                .withProtectionSettings(protectionSettings) //
-                .build();
-
         String rendered = parser.parse("{% for i in (1..10) %}{{ text }}{% endfor %}").render(
                 "{\"text\": \"abcdefghijklmnopqrstuvwxyz\"}");
 
@@ -52,7 +49,7 @@ private static void demoSimple() {
     private static void demoCustomStrongFilter() {
 
         // first register your custom filter
-        ParseSettings parseSettings = new ParseSettings.Builder().with(new Filter("b") {
+        TemplateParser parser = new TemplateParser.Builder().withFilter(new Filter("b") {
             @Override
             public Object apply(Object value, TemplateContext context, Object... params) {
                 // create a string from the value
@@ -63,17 +60,14 @@ public Object apply(Object value, TemplateContext context, Object... params) {
             }
         }).build();
 
-        TemplateParser parser = new TemplateParser.Builder().withParseSettings(parseSettings).build();
-
         // use your filter
         Template template = parser.parse("{{ wiki | b }}");
         String rendered = template.render("{\"wiki\" : \"Some *bold* text *in here*.\"}");
         System.out.println(rendered);
     }
 
     private static void demoCustomRepeatFilter() {
-        // Register your custom filter via ParseSettings
-        ParseSettings parseSettings = new ParseSettings.Builder().with(new Filter("repeat") {
+        TemplateParser parser = new TemplateParser.Builder().withFilter(new Filter("repeat") {
             @Override
             public Object apply(Object value, TemplateContext context, Object... params) {
 
@@ -93,16 +87,14 @@ public Object apply(Object value, TemplateContext context, Object... params) {
             }
         }).build();
 
-        TemplateParser parser = new TemplateParser.Builder().withParseSettings(parseSettings).build();
-
         // use your filter
         Template template = parser.parse("{{ 'a' | repeat }}\n{{ 'b' | repeat:5 }}");
         String rendered = template.render();
         System.out.println(rendered);
     }
 
     private static void demoCustomSumFilter() {
-        ParseSettings parseSettings = new ParseSettings.Builder().with(new Filter("sum") {
+        TemplateParser parser = new TemplateParser.Builder().withFilter(new Filter("sum") {
             @Override
             public Object apply(Object value, TemplateContext context, Object... params) {
 
@@ -118,15 +110,14 @@ public Object apply(Object value, TemplateContext context, Object... params) {
             }
         }).build();
 
-        TemplateParser parser = new TemplateParser.Builder().withParseSettings(parseSettings).build();
-
         Template template = parser.parse("{{ numbers | sum }}");
         String rendered = template.render("{\"numbers\" : [1, 2, 3, 4, 5]}");
         System.out.println(rendered);
     }
 
     private static void customLoopBlock() {
-        ParseSettings parseSettings = new ParseSettings.Builder().with(new Block("loop") {
+
+        TemplateParser parser = new TemplateParser.Builder().withInsertion(new Block("loop") {
             @Override
             public Object render(TemplateContext context, LNode... nodes) {
 
@@ -143,8 +134,6 @@ public Object render(TemplateContext context, LNode... nodes) {
             }
         }).build();
 
-        TemplateParser parser = new TemplateParser.Builder().withParseSettings(parseSettings).build();
-
         String source = "{% loop 5 %}looping!\n{% endloop %}";
 
         Template template = parser.parse(source);
@@ -155,7 +144,8 @@ public Object render(TemplateContext context, LNode... nodes) {
     }
 
     public static void instanceFilter() {
-        ParseSettings parseSettings = new ParseSettings.Builder().with(new Filter("sum") {
+
+        TemplateParser parser = new TemplateParser.Builder().withFilter(new Filter("sum") {
             @Override
             public Object apply(Object value, TemplateContext context, Object... params) {
 
@@ -171,8 +161,6 @@ public Object apply(Object value, TemplateContext context, Object... params) {
             }
         }).build();
 
-        TemplateParser parser = new TemplateParser.Builder().withParseSettings(parseSettings).build();
-
         Template template = parser.parse("{{ numbers | sum }}");
 
         String rendered = template.render("{\"numbers\" : [1, 2, 3, 4, 5]}");
@@ -182,10 +170,8 @@ public Object apply(Object value, TemplateContext context, Object... params) {
     public static void demoStrictVariables() {
         try {
             TemplateParser parser = new TemplateParser.Builder() //
-                    .withRenderSettings(new RenderSettings.Builder() //
-                            .withStrictVariables(true) //
-                            .withRaiseExceptionsInStrictMode(true) //
-                            .build()) //
+                    .withStrictVariables(true)
+                    .withErrorMode(TemplateParser.ErrorMode.strict)
                     .build();
 
             parser.parse("{{mu}}").render();
@@ -195,7 +181,7 @@ public static void demoStrictVariables() {
     }
 
     public static void customRandomTag() {
-        ParseSettings parseSettings = new ParseSettings.Builder().with(new Tag("rand") {
+        TemplateParser parser = new TemplateParser.Builder().withInsertion(new Tag("rand") {
             private final Random rand = new Random();
 
             @Override
@@ -204,15 +190,14 @@ public Object render(TemplateContext context, LNode... nodes) {
             }
         }).build();
 
-        TemplateParser parser = new TemplateParser.Builder().withParseSettings(parseSettings).build();
-
         Template template = parser.parse("{% rand %}");
         String rendered = template.render();
         System.out.println(rendered);
     }
 
     public static void customFilter() {
-        ParseSettings parseSettings = new ParseSettings.Builder().with(new Filter("sum") {
+
+        TemplateParser parser = new TemplateParser.Builder().withFilter(new Filter("sum") {
             @Override
             public Object apply(Object value, TemplateContext context, Object... params) {
 
@@ -227,8 +212,6 @@ public Object apply(Object value, TemplateContext context, Object... params) {
             }
         }).build();
 
-        TemplateParser parser = new TemplateParser.Builder().withParseSettings(parseSettings).build();
-
         Template template = parser.parse("{{ numbers | sum }}");
 
         String rendered = template.render("{\"numbers\" : [1, 2, 3, 4, 5]}");

src/main/java/liqp/Insertion.java

@@ -11,17 +11,6 @@
  */
 public abstract class Insertion extends LValue {
 
-    /**
-     * A map holding all insertions.
-     */
-    private static final Map<String, Insertion> INSERTIONS = new HashMap<>();
-
-    private static Insertions CURRENT_INSERTIONS = null;
-
-    private static void updateCurrentInsertions() {
-      CURRENT_INSERTIONS = Insertions.of(INSERTIONS);
-    }
-
     /**
      * The name of this insertions.
      */
@@ -55,22 +44,6 @@ public String getName() {
       return name;
     }
 
-    /**
-     * Returns all tags registered for global use.
-     *
-     * Note that this method is unsafe, as {@link #registerInsertion(Insertion)} affects all uses
-     * of this class.
-     *
-     * Use {@link Insertions} instead.
-     *
-     * @return all default tags.
-     */
-    @Deprecated
-    public static Map<String, Insertion> getInsertions() {
-        checkInitialized();
-        return new HashMap<>(INSERTIONS);
-    }
-
     /**
      * Renders this insertion.
      *
@@ -85,36 +58,4 @@ public static Map<String, Insertion> getInsertions() {
      * @return an Object denoting the rendered AST.
      */
     public abstract Object render(TemplateContext context, LNode... nodes);
-
-    /**
-     * Registers an insertion for global use.
-     * 
-     * If an insertion exists under the same name, it is replaced by this one.
-     * 
-     * Note that this method is unsafe, as it affects all uses of this class.
-     * Use {@link Insertions} instead.
-     *
-     * @param insertion
-     *         the insertion to be registered.
-     * @deprecated Use {@link liqp.ParseSettings.Builder#with(Insertion)}
-     */
-    @Deprecated
-    public static void registerInsertion(Insertion insertion) {
-        checkInitialized();
-        INSERTIONS.put(insertion.name, insertion);
-        updateCurrentInsertions();
-    }
-
-    static Insertions getCurrentInsertions() {
-      checkInitialized();
-      return CURRENT_INSERTIONS;
-    }
-
-    private static void checkInitialized() {
-      if (CURRENT_INSERTIONS == null) {
-        Insertions.STANDARD_INSERTIONS.writeTo(INSERTIONS);
-
-        updateCurrentInsertions();
-      }
-    }
 }

src/main/java/liqp/Insertions.java

@@ -76,7 +76,7 @@ public static Insertions of(Collection<Insertion> insertions) {
             return EMPTY;
         }
         return new Insertions(insertions.stream().collect(Collectors.toMap(Insertion::getName, Function
-                .identity())));
+                .identity(), (a, b) -> b)));
     }
 
     /**
@@ -149,7 +149,7 @@ public Insertions mergeWith(Insertions other) {
      * @return The set of names.
      */
     private Set<String> getNames(Predicate<? super Map.Entry<String, Insertion>> predicate) {
-        return this.map.entrySet().stream().filter(predicate).map(x -> x.getKey()).collect(Collectors
+        return this.map.entrySet().stream().filter(predicate).map(Map.Entry::getKey).collect(Collectors
                 .toSet());
     }
 
@@ -203,4 +203,13 @@ public Insertion get(String name) {
     public Collection<Insertion> values() {
         return Collections.unmodifiableCollection(map.values());
     }
+
+    /**
+     * Returns an unmodifiable map of the stored {@link Insertion} names.
+     *
+     * @return The map.
+     */
+    public Map<String, Insertion> asMap() {
+        return Collections.unmodifiableMap(map);
+    }
 }