(Commented out AST assertions)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/44ca7eb5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/44ca7eb5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/44ca7eb5 Branch: refs/heads/master Commit: 44ca7eb5ba3bba4013d57544e668a645119fff62 Parents: a97cf72 Author: ddekany <ddek...@apache.org> Authored: Tue Dec 15 22:06:02 2015 +0100 Committer: ddekany <ddek...@apache.org> Committed: Tue Dec 15 22:06:02 2015 +0100 ---------------------------------------------------------------------- src/main/java/freemarker/core/TemplateElement.java | 4 +++- src/main/java/freemarker/core/TemplateElementArrayBuilder.java | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/44ca7eb5/src/main/java/freemarker/core/TemplateElement.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/TemplateElement.java b/src/main/java/freemarker/core/TemplateElement.java index 7d3139a..de1f109 100644 --- a/src/main/java/freemarker/core/TemplateElement.java +++ b/src/main/java/freemarker/core/TemplateElement.java @@ -355,7 +355,8 @@ abstract public class TemplateElement extends TemplateObject { for (int i = 0; i < childCount; i++) { TemplateElement te = childBuffer[i]; - //!!T temporal assertion + /* + // Assertion: if (te.getIndex() != i) { throw new BugException("Invalid index " + te.getIndex() + " (expected: " + i + ") for: " + te.dump(false)); @@ -364,6 +365,7 @@ abstract public class TemplateElement extends TemplateObject { throw new BugException("Invalid parent " + te.getParent() + " (expected: " + this.dump(false) + ") for: " + te.dump(false)); } + */ te = te.postParseCleanup(stripWhitespace); childBuffer[i] = te; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/44ca7eb5/src/main/java/freemarker/core/TemplateElementArrayBuilder.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/TemplateElementArrayBuilder.java b/src/main/java/freemarker/core/TemplateElementArrayBuilder.java index 623fd17..c18e48b 100644 --- a/src/main/java/freemarker/core/TemplateElementArrayBuilder.java +++ b/src/main/java/freemarker/core/TemplateElementArrayBuilder.java @@ -22,9 +22,13 @@ class TemplateElements { * The number of utilized buffer elements; if 0, then {@code null} must be {@code null}. */ TemplateElements(TemplateElement[] buffer, int count) { - if (count == 0 && buffer != null) { // !!T temporal assertion + /* + // Assertion: + if (count == 0 && buffer != null) { throw new IllegalArgumentException(); } + */ + this.buffer = buffer; this.count = count; }
