This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch 3
in repository https://gitbox.apache.org/repos/asf/freemarker.git
from cfb0651b Forward ported from 2.3-gae: Fix HTLM typos (PR #73)
new baf73f01 Forward ported from 2.3-gae: Typo fixes
new 4cc9e519 Forward ported from 2.3-gae: (Added some tests for
ArithmeticEngine.toNumber, and ?number)
new 0981d81a Forward ported from 2.3-gae: CFormat setting and
implementation, ?c/?cn. Some typo fixes, other smaller (sometimes unrelated)
fixes.
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:
FM3-CHANGE-LOG.txt | 2 +-
...va => BooleanFormatEnvironmentCachingTest.java} | 35 ++-
.../apache/freemarker/core/CAndCnBuiltInTest.java | 128 +++++++++++
.../freemarker/core/CFormatTemplateTest.java | 81 +++++++
.../apache/freemarker/core/ConfigurationTest.java | 9 +
...tableParsingAndProcessingConfigurationTest.java | 68 ++++--
...{UnclosedCommentTest.java => NumberBiTest.java} | 35 +--
.../freemarker/core/TemplateConfigurationTest.java | 53 ++---
...icEngineTest.java => ArithmeticEngineTest.java} | 40 +++-
.../core/cformat/impl/CustomCFormat.java | 67 ++++++
.../freemarker/core/util/StringUtilsTest.java | 107 +++++++--
.../core/valueformat/NumberFormatTest.java | 39 ++--
.../core/templatesuite/expected/number-format.txt | 8 +-
.../templatesuite/templates/number-format.f3ac | 25 +-
.../org/apache/freemarker/core/ASTDirSetting.java | 37 ++-
.../org/apache/freemarker/core/ASTExpBuiltIn.java | 3 +-
.../freemarker/core/BuiltInsForMultipleTypes.java | 127 ++++-------
.../org/apache/freemarker/core/Configuration.java | 94 ++++----
.../org/apache/freemarker/core/Environment.java | 117 ++++------
.../core/MutableProcessingConfiguration.java | 113 +++++----
.../freemarker/core/ParsingConfiguration.java | 20 +-
.../freemarker/core/ProcessingConfiguration.java | 45 ++--
.../java/org/apache/freemarker/core/Template.java | 47 ++--
.../freemarker/core/TemplateBooleanFormat.java | 19 +-
.../freemarker/core/TemplateConfiguration.java | 40 +++-
.../impl/BigDecimalArithmeticEngine.java | 2 +-
.../apache/freemarker/core/cformat/CFormat.java | 68 ++++++
.../impl/AbstractJSONLikeFormat.java} | 42 ++--
.../core/cformat/impl/CTemplateNumberFormat.java | 198 ++++++++++++++++
.../freemarker/core/cformat/impl/JSONCFormat.java | 52 +++++
.../freemarker/core/cformat/impl/JavaCFormat.java | 71 ++++++
.../core/cformat/impl/JavaScriptCFormat.java | 52 +++++
.../core/cformat/impl/JavaScriptOrJSONCFormat.java | 57 +++++
.../core/cformat/impl/StandardCFormats.java | 46 ++++
.../freemarker/core/cformat/impl/XSCFormat.java | 78 +++++++
.../core/model/impl/DefaultObjectWrapper.java | 66 +-----
.../core/outputformat/MarkupOutputFormat.java | 2 +-
.../apache/freemarker/core/util/_NumberUtils.java | 2 +-
.../apache/freemarker/core/util/_StringUtils.java | 252 +++++++++++++++------
.../impl/ISOLikeTemplateDateFormat.java | 14 +-
.../impl/JavaTemplateNumberFormatFactory.java | 12 +-
freemarker-manual/src/main/docgen/en_US/book.xml | 2 +-
.../apache/freemarker/test/TemplateTestSuite.java | 33 +--
43 files changed, 1754 insertions(+), 654 deletions(-)
copy
freemarker-core-test/src/test/java/org/apache/freemarker/core/{model/impl/Java9InstrospectorBugWorkaroundTest.java
=> BooleanFormatEnvironmentCachingTest.java} (50%)
create mode 100644
freemarker-core-test/src/test/java/org/apache/freemarker/core/CAndCnBuiltInTest.java
create mode 100644
freemarker-core-test/src/test/java/org/apache/freemarker/core/CFormatTemplateTest.java
copy
freemarker-core-test/src/test/java/org/apache/freemarker/core/{UnclosedCommentTest.java
=> NumberBiTest.java} (57%)
rename
freemarker-core-test/src/test/java/org/apache/freemarker/core/arithmetic/impl/{BigDecimalArithmeticEngineTest.java
=> ArithmeticEngineTest.java} (69%)
create mode 100644
freemarker-core-test/src/test/java/org/apache/freemarker/core/cformat/impl/CustomCFormat.java
create mode 100644
freemarker-core/src/main/java/org/apache/freemarker/core/cformat/CFormat.java
copy
freemarker-core/src/main/java/org/apache/freemarker/core/{util/_ArrayAdapterList.java
=> cformat/impl/AbstractJSONLikeFormat.java} (50%)
create mode 100644
freemarker-core/src/main/java/org/apache/freemarker/core/cformat/impl/CTemplateNumberFormat.java
create mode 100644
freemarker-core/src/main/java/org/apache/freemarker/core/cformat/impl/JSONCFormat.java
create mode 100644
freemarker-core/src/main/java/org/apache/freemarker/core/cformat/impl/JavaCFormat.java
create mode 100644
freemarker-core/src/main/java/org/apache/freemarker/core/cformat/impl/JavaScriptCFormat.java
create mode 100644
freemarker-core/src/main/java/org/apache/freemarker/core/cformat/impl/JavaScriptOrJSONCFormat.java
create mode 100644
freemarker-core/src/main/java/org/apache/freemarker/core/cformat/impl/StandardCFormats.java
create mode 100644
freemarker-core/src/main/java/org/apache/freemarker/core/cformat/impl/XSCFormat.java
