This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch 2.3-gae
in repository https://gitbox.apache.org/repos/asf/freemarker.git
from 37e4dff4 (Updated version number in Manual)
new 613b8f2b (Added some tests for ArithmeticEngine.toNumber, and ?number)
new 37b5b161 FREEMARKER-198: To avoid deadlock when class initialization
happens on multiple threads (like _TemplateAPI->DefaultObjectWrapper, and
DefaultObjectWrapper->_TemplateAPI), factored out static fields from
_TemplateAPI into their owns classes.
new 7ebbd5c8 (Refactorings/changed related to computer number format (like
?c): Added some more to version history.)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/java/freemarker/cache/TemplateCache.java | 5 +-
.../core/APINotSupportedTemplateException.java | 4 +-
.../java/freemarker/core/AddConcatExpression.java | 6 +-
.../java/freemarker/core/ArithmeticEngine.java | 2 +-
.../java/freemarker/core/BuiltInsForDates.java | 3 +-
.../freemarker/core/BuiltInsForMultipleTypes.java | 7 +-
.../java/freemarker/core/BuiltInsForNodes.java | 4 +-
.../java/freemarker/core/BuiltInsForSequences.java | 6 +-
.../freemarker/core/BuiltInsForStringsBasic.java | 4 +-
.../core/BuiltInsForStringsEncoding.java | 4 +-
.../freemarker/core/BuiltInsForStringsRegexp.java | 4 +-
src/main/java/freemarker/core/BuiltinVariable.java | 4 +-
src/main/java/freemarker/core/Configurable.java | 3 +-
src/main/java/freemarker/core/DynamicKeyName.java | 12 +-
src/main/java/freemarker/core/Environment.java | 25 +-
src/main/java/freemarker/core/EvalUtil.java | 4 +-
.../freemarker/core/GetOptionalTemplateMethod.java | 4 +-
src/main/java/freemarker/core/HashLiteral.java | 12 +-
src/main/java/freemarker/core/Interpret.java | 4 +-
src/main/java/freemarker/core/JSONParser.java | 10 +-
src/main/java/freemarker/core/ListLiteral.java | 6 +-
src/main/java/freemarker/core/Macro.java | 6 +-
src/main/java/freemarker/core/Range.java | 3 +-
src/main/java/freemarker/core/RecurseNode.java | 4 +-
.../freemarker/core/TemplateConfiguration.java | 3 +-
src/main/java/freemarker/core/VisitNode.java | 4 +-
src/main/java/freemarker/core/_CoreAPI.java | 6 +-
.../java/freemarker/ext/ant/FreemarkerXmlTask.java | 4 +-
.../java/freemarker/ext/beans/BeansWrapper.java | 9 +-
.../ext/beans/BeansWrapperConfiguration.java | 3 +-
.../ext/beans/ClassIntrospectorBuilder.java | 7 +-
.../java/freemarker/ext/jdom/NodeListModel.java | 4 +-
.../freemarker/ext/jsp/FreeMarkerPageContext.java | 6 +-
.../freemarker/ext/servlet/InitParamParser.java | 6 +-
.../java/freemarker/template/Configuration.java | 6 +-
.../freemarker/template/DefaultObjectWrapper.java | 6 +-
.../DefaultObjectWrapperConfiguration.java | 4 +-
src/main/java/freemarker/template/Template.java | 4 +-
.../java/freemarker/template/_ObjectWrappers.java | 58 ++++
.../java/freemarker/template/_TemplateAPI.java | 53 +---
.../java/freemarker/template/_VersionInts.java | 50 +++
.../freemarker/template/utility/DOMNodeModel.java | 4 +-
.../template/utility/TemplateModelUtils.java | 6 +-
src/main/javacc/FTL.jj | 352 ++++++++++-----------
src/manual/en_US/book.xml | 19 +-
...icEngineTest.java => ArithmeticEngineTest.java} | 31 +-
src/test/java/freemarker/core/NumberBiTest.java | 61 ++++
.../freemarker/template/ConfigurationTest.java | 2 +-
.../template/DefaultObjectWrapperTest.java | 2 +-
.../test/templatesuite/TemplateTestCase.java | 4 +-
.../test/templatesuite/models/LegacyList.java | 4 +-
.../templatesuite/models/TransformHashWrapper.java | 4 +-
52 files changed, 526 insertions(+), 342 deletions(-)
create mode 100644 src/main/java/freemarker/template/_ObjectWrappers.java
create mode 100644 src/main/java/freemarker/template/_VersionInts.java
rename src/test/java/freemarker/core/{BigDecimalArithmeticEngineTest.java =>
ArithmeticEngineTest.java} (73%)
create mode 100644 src/test/java/freemarker/core/NumberBiTest.java
