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 02ec27ea69d17349018fb2765af41352d4a7e275 Merge: 74c473b0 7d9f5e57 Author: ddekany <[email protected]> AuthorDate: Wed Aug 28 19:55:21 2024 +0200 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 .../src/main/java/freemarker/core/On.java | 95 +++++++++ .../src/main/java/freemarker/core/SwitchBlock.java | 96 ++++++---- .../src/main/java/freemarker/core/_CoreAPI.java | 1 + .../main/java/freemarker/debug/DebuggerClient.java | 3 +- .../java/freemarker/debug/impl/DebuggerServer.java | 10 +- .../ext/beans/DefaultMemberAccessPolicy.java | 3 +- .../MemberSelectorListMemberAccessPolicy.java | 5 +- .../src/main/javacc/freemarker/core/FTL.jj | 109 +++++++++-- .../core/BreakAndContinuePlacementTest.java | 22 ++- .../src/test/java/freemarker/core/SwitchTest.java | 185 ++++++++++++++++++ ...TemplateConfigurationWithTemplateCacheTest.java | 11 +- .../core/TemplateProcessingTracerTest.java | 17 ++ .../src/test/resources/freemarker/core/ast-1.ast | 28 ++- .../src/test/resources/freemarker/core/ast-1.ftl | 13 +- .../freemarker/test/servlet/WebAppTestCase.java | 6 +- .../test/templatesuite/templates/switch.ftl | 2 +- freemarker-manual/src/main/docgen/en_US/book.xml | 212 +++++++++++++++++---- .../src/main/java/freemarker/core/ASTPrinter.java | 5 +- .../java/freemarker/test/ResourcesExtractor.java | 3 +- .../main/java/freemarker/test/TemplateTest.java | 2 +- .../java/freemarker/test/utility/FileTestCase.java | 3 +- 21 files changed, 692 insertions(+), 139 deletions(-)
