This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch 2.3
in repository https://gitbox.apache.org/repos/asf/freemarker.git
from d146f340 Merge remote-tracking branch 'origin/2.3-gae' into 2.3
add be3490d0 add ?is_blank builtin for Strings
add dde131eb add testcase
add ae5aacad fix NUMBER_OF_BIS to 298
add 3899be7f change implementation
add fe9f0a5b move tests to java
add ee239a7f implement ?blank_to_null instead of ?is_blank
add 27f33c83 add ?trim_to_null and ?empty_to_null
add 501b8934 add manual for ?blank_to_null
add dfad8694 manual for trim_to_null and empty_to_null
add fa05011c add to alphabetical index
add 57080605 mention and link missing value operator
add d03f7f79 Build: Some build cleanup, and documentation regarding static
linking to _Java9Impl/_Java16Impl using the multi-release JAR format.
add 1836779d Merge remote-tracking branch 'upstream/2.3-gae' into
add-is_blank-builtin-for-string
add be043ecc Merge pull request #111 from
chrisrueger/add-is_blank-builtin-for-string
add 943c9b60 Refinements for blank_to_null, empty_to_null, and
trim_to_null built-ins PR: - ?blank_to_null now also considers non-breaking
whitespace as whitespace - Fixed type error messages, and added tests for the
same - Added tests for type conversions - Added tests for parentheses behavior
- Extended/reworked documentation (also added to version history) - Various
smaller code cleanup
add cee8d076 #on directive in #switch as an alternative to #case
add 5035e076 Add "on" to list of built-in directive names
add 7c802f47 Convert some tabs to newlines in the grammar
add bb2b3664 Merge pull request #106 from scrhartley/switch-on
add ade44352 #switch #on PR post-merge adjustments: - Reorganized how
#case/#on/#default is parsed in JavaCC, mostly to achieve better error messages
(also I guess it's also easier to follow). - Reorganized SwitchBlock to branch
out for the #switch+#case and the #switch+#on logic earlier (less checks on
runtime, also maybe easier to follow). - Adjusted error message wording - Added
much more test cases - Added some of this to the Manual, but much more will
done there
add dbd2508e #switch #on PR post-merge adjustments: Removed accidentally
committed test code.
add f6b4de2c #switch #on PR post-merge adjustments: Finished Manual
updates for #on. Minor test additions, and code cleanup.
new f6a6cbb1 Merge remote-tracking branch 'origin/2.3-gae' into 2.3
The 1 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:
README.md | 5 +
.../freemarker/build/FreemarkerRootExtension.kt | 2 -
.../src/main/java/freemarker/core/BuiltIn.java | 5 +-
.../core/BuiltInsForExistenceHandling.java | 66 ++-
.../freemarker/core/BuiltInsForStringsBasic.java | 2 +-
.../src/main/java/freemarker/core/On.java | 95 +++++
.../src/main/java/freemarker/core/SwitchBlock.java | 96 +++--
.../src/main/java/freemarker/core/_CoreAPI.java | 1 +
.../freemarker/template/utility/StringUtil.java | 13 +-
.../src/main/javacc/freemarker/core/FTL.jj | 109 ++++-
.../core/BreakAndContinuePlacementTest.java | 22 +-
.../java/freemarker/core/StringBuiltInTest.java | 128 ++++++
.../src/test/java/freemarker/core/SwitchTest.java | 185 ++++++++
.../core/TemplateProcessingTracerTest.java | 17 +
.../src/test/resources/freemarker/core/ast-1.ast | 28 +-
.../src/test/resources/freemarker/core/ast-1.ftl | 13 +-
.../test/templatesuite/templates/switch.ftl | 2 +-
freemarker-manual/src/main/docgen/en_US/book.xml | 469 +++++++++++++++++++--
18 files changed, 1133 insertions(+), 125 deletions(-)
create mode 100644 freemarker-core/src/main/java/freemarker/core/On.java
create mode 100644
freemarker-core/src/test/java/freemarker/core/StringBuiltInTest.java
create mode 100644
freemarker-core/src/test/java/freemarker/core/SwitchTest.java
