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 74c473b0 Merge remote-tracking branch 'origin/2.3-gae' into 2.3
add 213cba6e use StandardCharsets instead of string
add dda4fafc Merge pull request #108 from
hduelme/use-StandardCharsets-instead-of-string
add fb80ca9c Compile regex for cleanStr only once
add 30a6e329 Merge pull request #112 from timlueg/2.3-gae
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 7a429fe7 Merge pull request #114 from scrhartley/switch-on
add 7d9f5e57 #switch #on PR post-merge adjustments:
new 02ec27ea 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:
.../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(-)
create mode 100644 freemarker-core/src/main/java/freemarker/core/On.java
create mode 100644
freemarker-core/src/test/java/freemarker/core/SwitchTest.java
