You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2015/09/29 02:07:05 UTC
[5/5] incubator-freemarker git commit: Merge remote-tracking branch
'origin/2.3-gae'
Merge remote-tracking branch 'origin/2.3-gae'
Conflicts:
src/main/java/freemarker/core/NewBI.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/09b10ce0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/09b10ce0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/09b10ce0
Branch: refs/heads/master
Commit: 09b10ce08be62e6abb805ec7cff34eb18ef38cc7
Parents: 533d47d c798862
Author: ddekany <dd...@apache.org>
Authored: Tue Sep 29 02:06:45 2015 +0200
Committer: ddekany <dd...@apache.org>
Committed: Tue Sep 29 02:06:45 2015 +0200
----------------------------------------------------------------------
.../freemarker/core/AddConcatExpression.java | 21 ++--
src/main/java/freemarker/core/Assignment.java | 9 +-
.../core/BuiltInForLegacyEscaping.java | 4 +-
.../BuiltInForMarkupOutputFormatRelated.java | 46 -------
.../core/BuiltInForOutputFormatRelated.java | 46 -------
.../java/freemarker/core/BuiltInForString.java | 2 +-
.../core/BuiltInsForMultipleTypes.java | 14 +--
.../core/BuiltInsForOutputFormatRelated.java | 7 +-
.../freemarker/core/BuiltInsForSequences.java | 2 +-
.../core/BuiltInsForStringsBasic.java | 6 +-
.../core/BuiltInsForStringsEncoding.java | 26 +---
.../freemarker/core/BuiltInsForStringsMisc.java | 2 +-
.../java/freemarker/core/DollarVariable.java | 6 +-
.../java/freemarker/core/DynamicKeyName.java | 4 +-
src/main/java/freemarker/core/Environment.java | 18 +--
src/main/java/freemarker/core/EvalUtil.java | 126 +++++++++++++++----
src/main/java/freemarker/core/Expression.java | 30 ++++-
src/main/java/freemarker/core/HashLiteral.java | 4 +-
.../core/ISOLikeTemplateDateFormat.java | 2 +-
src/main/java/freemarker/core/Include.java | 6 +-
src/main/java/freemarker/core/Interpret.java | 6 +-
.../freemarker/core/JavaTemplateDateFormat.java | 2 +-
.../core/JavaTemplateNumberFormat.java | 2 +-
src/main/java/freemarker/core/LibraryLoad.java | 2 +-
src/main/java/freemarker/core/ListLiteral.java | 4 +-
.../core/MarkupOutputFormatBoundBuiltIn.java | 46 +++++++
src/main/java/freemarker/core/NewBI.java | 2 +-
.../java/freemarker/core/NumberLiteral.java | 4 +-
.../core/OutputFormatBoundBuiltIn.java | 46 +++++++
.../java/freemarker/core/PropertySetting.java | 2 +-
.../java/freemarker/core/StopInstruction.java | 2 +-
.../java/freemarker/core/StringLiteral.java | 4 +-
.../freemarker/core/TemplateDateFormat.java | 21 ++--
.../freemarker/core/TemplateNumberFormat.java | 19 ++-
.../java/freemarker/ext/beans/BeanModel.java | 8 +-
src/main/javacc/FTL.jj | 14 +--
src/manual/book.xml | 34 ++---
.../core/AppMetaTemplateDateFormatFactory.java | 2 +-
.../core/BaseNTemplateNumberFormatFactory.java | 4 +-
.../freemarker/core/CorectionToTextualTest.java | 119 ++++++++++++++++++
.../java/freemarker/core/DateFormatTest.java | 34 ++---
...EpochMillisDivTemplateDateFormatFactory.java | 2 +-
.../EpochMillisTemplateDateFormatFactory.java | 2 +-
.../core/HTMLISOTemplateDateFormatFactory.java | 104 +++++++++++++++
.../core/HexTemplateNumberFormatFactory.java | 2 +-
...AndTZSensitiveTemplateDateFormatFactory.java | 2 +-
...aleSensitiveTemplateNumberFormatFactory.java | 2 +-
.../java/freemarker/core/NumberFormatTest.java | 30 +++--
.../PrintfGTemplateNumberFormatFactory.java | 11 +-
49 files changed, 594 insertions(+), 319 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/09b10ce0/src/main/java/freemarker/core/BuiltInsForMultipleTypes.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/09b10ce0/src/main/java/freemarker/core/BuiltInsForStringsMisc.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/09b10ce0/src/main/java/freemarker/core/Environment.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/09b10ce0/src/main/java/freemarker/core/EvalUtil.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/09b10ce0/src/main/java/freemarker/core/Expression.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/09b10ce0/src/main/java/freemarker/core/Include.java
----------------------------------------------------------------------
diff --cc src/main/java/freemarker/core/Include.java
index 50a36b4,f18c314..fe36924
--- a/src/main/java/freemarker/core/Include.java
+++ b/src/main/java/freemarker/core/Include.java
@@@ -80,10 -80,10 +80,10 @@@ final class Include extends TemplateEle
try {
if (parseExp instanceof StringLiteral) {
// Legacy
- parse = Boolean.valueOf(StringUtil.getYesNo(parseExp.evalAndCoerceToString(null)));
+ parse = Boolean.valueOf(StringUtil.getYesNo(parseExp.evalAndCoerceToPlainText(null)));
} else {
try {
- parse = Boolean.valueOf(parseExp.evalToBoolean(template.getConfiguration()));
+ parse = Boolean.valueOf(parseExp.evalToBoolean(unboundTemplate.getConfiguration()));
} catch (NonBooleanException e) {
throw new ParseException("Expected a boolean or string as the value of the parse attribute",
parseExp, e);
@@@ -119,10 -119,10 +119,10 @@@
@Override
void accept(Environment env) throws TemplateException, IOException {
- final String includedTemplateName = includedTemplateNameExp.evalAndCoerceToString(env);
+ final String includedTemplateName = includedTemplateNameExp.evalAndCoerceToPlainText(env);
final String fullIncludedTemplateName;
try {
- fullIncludedTemplateName = env.toFullTemplateName(getTemplate().getName(), includedTemplateName);
+ fullIncludedTemplateName = env.toFullTemplateName(env.getCurrentTemplate().getName(), includedTemplateName);
} catch (MalformedTemplateNameException e) {
throw new _MiscTemplateException(e, env,
"Malformed template name ", new _DelayedJQuote(e.getTemplateName()), ":\n",
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/09b10ce0/src/main/java/freemarker/core/LibraryLoad.java
----------------------------------------------------------------------
diff --cc src/main/java/freemarker/core/LibraryLoad.java
index 7d535ef,9a9c887..98a7c38
--- a/src/main/java/freemarker/core/LibraryLoad.java
+++ b/src/main/java/freemarker/core/LibraryLoad.java
@@@ -51,10 -51,10 +51,10 @@@ public final class LibraryLoad extends
@Override
void accept(Environment env) throws TemplateException, IOException {
- final String importedTemplateName = importedTemplateNameExp.evalAndCoerceToString(env);
+ final String importedTemplateName = importedTemplateNameExp.evalAndCoerceToPlainText(env);
final String fullImportedTemplateName;
try {
- fullImportedTemplateName = env.toFullTemplateName(getTemplate().getName(), importedTemplateName);
+ fullImportedTemplateName = env.toFullTemplateName(env.getCurrentTemplate().getName(), importedTemplateName);
} catch (MalformedTemplateNameException e) {
throw new _MiscTemplateException(e, env,
"Malformed template name ", new _DelayedJQuote(e.getTemplateName()), ":\n",
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/09b10ce0/src/main/java/freemarker/core/NewBI.java
----------------------------------------------------------------------
diff --cc src/main/java/freemarker/core/NewBI.java
index 4364d93,c7842de..c719c9d
--- a/src/main/java/freemarker/core/NewBI.java
+++ b/src/main/java/freemarker/core/NewBI.java
@@@ -47,7 -48,7 +47,7 @@@ class NewBI extends BuiltIn
@Override
TemplateModel _eval(Environment env)
throws TemplateException {
- return new ConstructorFunction(target.evalAndCoerceToString(env), env);
- return new ConstructorFunction(target.evalAndCoerceToPlainText(env), env, target.getTemplate());
++ return new ConstructorFunction(target.evalAndCoerceToPlainText(env), env);
}
class ConstructorFunction implements TemplateMethodModelEx {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/09b10ce0/src/main/java/freemarker/core/PropertySetting.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/09b10ce0/src/main/java/freemarker/core/StringLiteral.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/09b10ce0/src/main/javacc/FTL.jj
----------------------------------------------------------------------