Repository: incubator-freemarker Updated Branches: refs/heads/3 1c4a73cf5 -> 410fd0d8c
(Fixed FTL.jj compilation problem. Renamed FTLUtil.getFTLTypeDescription.) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/410fd0d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/410fd0d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/410fd0d8 Branch: refs/heads/3 Commit: 410fd0d8c2ccf0d3ca3152f340a81c327ad6f39f Parents: 1c4a73c Author: ddekany <[email protected]> Authored: Sat Feb 18 11:09:56 2017 +0100 Committer: ddekany <[email protected]> Committed: Sat Feb 18 11:17:51 2017 +0100 ---------------------------------------------------------------------- .../apache/freemarker/core/ast/_DelayedFTLTypeDescription.java | 2 +- .../java/org/apache/freemarker/core/model/TemplateModel.java | 2 +- .../freemarker/core/model/impl/beans/OverloadedMethods.java | 2 +- .../freemarker/core/model/impl/beans/SimpleMethodModel.java | 2 +- src/main/java/org/apache/freemarker/core/util/FTLUtil.java | 2 +- src/main/javacc/FTL.jj | 4 ++-- src/test/java/org/apache/freemarker/core/ast/ASTPrinter.java | 2 +- .../java/org/apache/freemarker/test/util/AssertDirective.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/410fd0d8/src/main/java/org/apache/freemarker/core/ast/_DelayedFTLTypeDescription.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/_DelayedFTLTypeDescription.java b/src/main/java/org/apache/freemarker/core/ast/_DelayedFTLTypeDescription.java index 1551c46..13c3f00 100644 --- a/src/main/java/org/apache/freemarker/core/ast/_DelayedFTLTypeDescription.java +++ b/src/main/java/org/apache/freemarker/core/ast/_DelayedFTLTypeDescription.java @@ -31,7 +31,7 @@ public class _DelayedFTLTypeDescription extends _DelayedConversionToString { @Override protected String doConversion(Object obj) { - return FTLUtil.getFTLTypeDescription((TemplateModel) obj); + return FTLUtil.getTypeDescription((TemplateModel) obj); } } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/410fd0d8/src/main/java/org/apache/freemarker/core/model/TemplateModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/TemplateModel.java b/src/main/java/org/apache/freemarker/core/model/TemplateModel.java index 9bfa63b..b5d4422 100644 --- a/src/main/java/org/apache/freemarker/core/model/TemplateModel.java +++ b/src/main/java/org/apache/freemarker/core/model/TemplateModel.java @@ -42,7 +42,7 @@ import org.apache.freemarker.core.util.FTLUtil; * these types: string, number, boolean, date. The intended applications are like string+hash, string+method, * hash+sequence, etc. * - * @see FTLUtil#getFTLTypeDescription(TemplateModel) + * @see FTLUtil#getTypeDescription(TemplateModel) */ public interface TemplateModel { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/410fd0d8/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedMethods.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedMethods.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedMethods.java index 726ed7d..3ceebe1 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedMethods.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedMethods.java @@ -219,7 +219,7 @@ final class OverloadedMethods { private _DelayedConversionToString getTMActualParameterTypes(List arguments) { final String[] argumentTypeDescs = new String[arguments.size()]; for (int i = 0; i < arguments.size(); i++) { - argumentTypeDescs[i] = FTLUtil.getFTLTypeDescription((TemplateModel) arguments.get(i)); + argumentTypeDescs[i] = FTLUtil.getTypeDescription((TemplateModel) arguments.get(i)); } return new DelayedCallSignatureToString(argumentTypeDescs) { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/410fd0d8/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMethodModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMethodModel.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMethodModel.java index c23d410..68b7060 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMethodModel.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMethodModel.java @@ -86,7 +86,7 @@ public final class SimpleMethodModel extends SimpleMethod public int size() throws TemplateModelException { throw new TemplateModelException( "Getting the number of items or enumerating the items is not supported on this " - + FTLUtil.getFTLTypeDescription(this) + " value.\n" + + FTLUtil.getTypeDescription(this) + " value.\n" + "(" + "Hint 1: Maybe you wanted to call this method first and then do something with its return value. " + "Hint 2: Getting items by intex possibly works, hence it's a \"+sequence\"." http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/410fd0d8/src/main/java/org/apache/freemarker/core/util/FTLUtil.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/util/FTLUtil.java b/src/main/java/org/apache/freemarker/core/util/FTLUtil.java index 6f69590..af43310 100644 --- a/src/main/java/org/apache/freemarker/core/util/FTLUtil.java +++ b/src/main/java/org/apache/freemarker/core/util/FTLUtil.java @@ -640,7 +640,7 @@ public final class FTLUtil { * * @since 2.3.20 */ - public static String getFTLTypeDescription(TemplateModel tm) { + public static String getTypeDescription(TemplateModel tm) { if (tm == null) { return "Null"; } else { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/410fd0d8/src/main/javacc/FTL.jj ---------------------------------------------------------------------- diff --git a/src/main/javacc/FTL.jj b/src/main/javacc/FTL.jj index e6cedca..19e60ad 100644 --- a/src/main/javacc/FTL.jj +++ b/src/main/javacc/FTL.jj @@ -2151,7 +2151,7 @@ StringLiteral StringLiteral(boolean interpolate) : s = t.image.substring(2, t.image.length() -1); } else { try { - s = _StringUtil.FTLStringLiteralDec(t.image.substring(1, t.image.length() -1)); + s = FTLUtil.unescapeStringLiteralPart(t.image.substring(1, t.image.length() -1)); } catch (ParseException pe) { pe.lineNumber = t.beginLine; pe.columnNumber = t.beginColumn; @@ -3605,7 +3605,7 @@ OutputFormatBlock OutputFormat() : } } else { throw new ParseException( - "Parameter must be a string, but was: " + _ClassUtil.getFTLTypeDescription(paramTM), + "Parameter must be a string, but was: " + FTLUtil.getTypeDescription(paramTM), paramExp); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/410fd0d8/src/test/java/org/apache/freemarker/core/ast/ASTPrinter.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/ast/ASTPrinter.java b/src/test/java/org/apache/freemarker/core/ast/ASTPrinter.java index fea1150..82a37a9 100644 --- a/src/test/java/org/apache/freemarker/core/ast/ASTPrinter.java +++ b/src/test/java/org/apache/freemarker/core/ast/ASTPrinter.java @@ -332,7 +332,7 @@ public class ASTPrinter { out.write(INDENTATION); out.write(ind); out.write("= const "); - out.write(FTLUtil.getFTLTypeDescription(tm)); + out.write(FTLUtil.getTypeDescription(tm)); out.write(' '); out.write(tm.toString()); out.write('\n'); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/410fd0d8/src/test/java/org/apache/freemarker/test/util/AssertDirective.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/util/AssertDirective.java b/src/test/java/org/apache/freemarker/test/util/AssertDirective.java index d8f995c..2b574dd 100644 --- a/src/test/java/org/apache/freemarker/test/util/AssertDirective.java +++ b/src/test/java/org/apache/freemarker/test/util/AssertDirective.java @@ -59,7 +59,7 @@ public class AssertDirective implements TemplateDirectiveModel { if (!(test instanceof TemplateBooleanModel)) { throw new AssertationFailedInTemplateException("Assertion failed:\n" - + "The value had to be boolean, but it was of type" + FTLUtil.getFTLTypeDescription(test), + + "The value had to be boolean, but it was of type" + FTLUtil.getTypeDescription(test), env); } if (!((TemplateBooleanModel) test).getAsBoolean()) {
