Ck/template context

src/main/java/liqp/RenderTransformer.java

@@ -16,8 +16,8 @@
  * created temporarily on the heap, increasing the chance of an out-of-memory situation, and a generally
  * high allocation activity (spikes in the memory allocation graph).
  * <p>
- * For example, the following liquid template results in <em>10012</em> {@link StringBuilder}
- * {@link #toString()} conversions:
+ * For example, the following liquid template results in <em>10012</em>
+ * {@link StringBuilder#toString()} conversions:
  * 
  * <pre><code>{% for l in (1..10)%}{% for k in (1..1000) %}
  *   {% for i in (1..1000) %}Hello! {{ i }} world

src/main/java/liqp/TemplateContext.java

@@ -11,6 +11,8 @@
 import liqp.RenderTransformer.ObjectAppender;
 import liqp.exceptions.ExceededMaxIterationsException;
 import liqp.parser.LiquidSupport;
+import liqp.filters.Filters;
+import liqp.parser.Flavor;
 
 public class TemplateContext {
 
@@ -29,6 +31,7 @@ public class TemplateContext {
     private Map<String, Object> registry;
 
     private List<Exception> errors;
+    private final Template template;
 
     public TemplateContext() {
         this(TemplateParser.DEFAULT, new LinkedHashMap<>());
@@ -40,14 +43,19 @@ public TemplateContext(Map<String, Object> variables) {
     }
 
     public TemplateContext(TemplateParser parser, Map<String, Object> variables) {
+      this(null, parser, variables);
+    }
+
+    public TemplateContext(Template template, TemplateParser parser, Map<String, Object> variables) {
+        this.template = template;
         this.parent = null;
         this.parser = parser;
         this.variables = new LinkedHashMap<>(variables);
         this.errors = new ArrayList<>();
     }
 
     public TemplateContext(TemplateContext parent) {
-        this(parent.getParser(), new LinkedHashMap<String, Object>());
+        this(parent.template, parent.getParser(), new LinkedHashMap<String, Object>());
         this.parent = parent;
     }
 
@@ -199,4 +207,9 @@ public void checkForMaxIterations(int iterations) {
     public TemplateParser.ErrorMode getErrorMode() {
         return parser.getErrorMode();
     }
+
+    public TemplateContext newChildContext() {
+        return newChildContext(new HashMap<>());
+    }
+
 }

src/main/java/liqp/blocks/For.java

@@ -64,7 +64,7 @@ public Object render(TemplateContext context, LNode... nodes) {
         boolean reversed = super.asBoolean(nodes[6].render(context));
 
         // Each for tag has its own context that keeps track of its own variables (scope)
-        TemplateContext nestedContext = new TemplateContext(context);
+        TemplateContext nestedContext = context.newChildContext();
 
         Object rendered = array ? renderArray(id, nestedContext, tagName, reversed, nodes) : renderRange(id, nestedContext, tagName, reversed, nodes);
 

src/main/java/liqp/blocks/Tablerow.java

@@ -1,14 +1,14 @@
 package liqp.blocks;
 
-import liqp.TemplateContext;
-import liqp.RenderTransformer.ObjectAppender;
-import liqp.nodes.LNode;
-import liqp.parser.LiquidSupport;
-
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
+import liqp.RenderTransformer.ObjectAppender;
+import liqp.TemplateContext;
+import liqp.nodes.LNode;
+import liqp.parser.LiquidSupport;
+
 public class Tablerow extends Block {
 
     private static final String COLS = "cols";
@@ -66,7 +66,7 @@ public Object render(TemplateContext context, LNode... nodes) {
             }
         }
 
-        TemplateContext nestedContext = new TemplateContext(context);
+        TemplateContext nestedContext = context.newChildContext();
         int total = Math.min(collection.length, limit);
         TablerowloopDrop tablerowloopDrop = new TablerowloopDrop(total, cols);
         nestedContext.put(TABLEROWLOOP, tablerowloopDrop);