This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch 2.3-gae
in repository https://gitbox.apache.org/repos/asf/freemarker.git
discard 84f86bc2 Manual: Typo fix
omit f29a7cb5 Still version related fixes/adjustments...
omit 70797b7c version.properties adjustments
omit f6b4de2c #switch #on PR post-merge adjustments: Finished Manual
updates for #on. Minor test additions, and code cleanup.
omit dbd2508e #switch #on PR post-merge adjustments: Removed accidentally
committed test code.
omit 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
omit bb2b3664 Merge pull request #106 from scrhartley/switch-on
omit 7c802f47 Convert some tabs to newlines in the grammar
omit 5035e076 Add "on" to list of built-in directive names
omit cee8d076 #on directive in #switch as an alternative to #case
new e3258943 Version number fixes/adjustments
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (84f86bc2)
\
N -- N -- N refs/heads/2.3-gae (e3258943)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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 -
.../src/main/javacc/freemarker/core/FTL.jj | 109 ++---------
.../core/BreakAndContinuePlacementTest.java | 22 +--
.../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 | 212 ++++-----------------
11 files changed, 116 insertions(+), 664 deletions(-)
delete mode 100644 freemarker-core/src/main/java/freemarker/core/On.java
delete mode 100644
freemarker-core/src/test/java/freemarker/core/SwitchTest.java
