This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch 2.3 in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit f6a6cbb13f7fd8e410edef2356f1cfb24b2bc3dc Merge: d146f340 f6b4de2c Author: ddekany <[email protected]> AuthorDate: Mon Aug 19 12:16:26 2024 +0200 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 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(-)
