freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [03/15] incubator-freemarker git commit: Merge remote-tracking branch 'github/avoid-too-much-recursion-when-visiting-template-elements-2.3-ga' into 2.3-gae
Date Sun, 13 Dec 2015 16:02:20 GMT
Merge remote-tracking branch 'github/avoid-too-much-recursion-when-visiting-template-elements-2.3-ga'
into 2.3-gae

GitHub pull request #6

This patch decreases the stack usage of template execution.


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/113d6702
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/113d6702
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/113d6702

Branch: refs/heads/2.3-gae
Commit: 113d67027f8213146fed2a917c03c7f0651cb6b1
Parents: 116b817 16f1559
Author: ddekany <ddekany@apache.org>
Authored: Sun Nov 29 17:29:34 2015 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Sun Nov 29 17:32:56 2015 +0100

----------------------------------------------------------------------
 src/main/java/freemarker/core/Assignment.java   |  3 +-
 .../freemarker/core/AssignmentInstruction.java  |  8 +--
 src/main/java/freemarker/core/AttemptBlock.java |  3 +-
 src/main/java/freemarker/core/AutoEscBlock.java |  6 +-
 .../java/freemarker/core/BlockAssignment.java   |  3 +-
 .../java/freemarker/core/BodyInstruction.java   |  3 +-
 .../java/freemarker/core/BreakInstruction.java  |  2 +-
 src/main/java/freemarker/core/Case.java         |  6 +-
 src/main/java/freemarker/core/Comment.java      |  3 +-
 .../java/freemarker/core/CompressedBlock.java   |  3 +-
 .../java/freemarker/core/ConditionalBlock.java  |  7 +-
 src/main/java/freemarker/core/DebugBreak.java   |  6 +-
 .../java/freemarker/core/DollarVariable.java    |  3 +-
 src/main/java/freemarker/core/ElseOfList.java   |  6 +-
 src/main/java/freemarker/core/Environment.java  | 67 +++++++++++---------
 src/main/java/freemarker/core/EscapeBlock.java  | 10 ++-
 .../freemarker/core/FallbackInstruction.java    |  3 +-
 .../java/freemarker/core/FlushInstruction.java  |  3 +-
 src/main/java/freemarker/core/IfBlock.java      |  6 +-
 src/main/java/freemarker/core/Include.java      |  3 +-
 src/main/java/freemarker/core/Items.java        |  3 +-
 .../java/freemarker/core/IteratorBlock.java     | 13 ++--
 src/main/java/freemarker/core/LibraryLoad.java  |  3 +-
 .../java/freemarker/core/ListElseContainer.java |  5 +-
 src/main/java/freemarker/core/Macro.java        |  5 +-
 src/main/java/freemarker/core/MixedContent.java |  7 +-
 .../java/freemarker/core/NoAutoEscBlock.java    |  6 +-
 .../java/freemarker/core/NoEscapeBlock.java     |  6 +-
 .../java/freemarker/core/NumericalOutput.java   |  3 +-
 .../java/freemarker/core/OutputFormatBlock.java |  6 +-
 .../java/freemarker/core/PropertySetting.java   |  3 +-
 .../java/freemarker/core/RecoveryBlock.java     |  6 +-
 src/main/java/freemarker/core/RecurseNode.java  |  3 +-
 .../java/freemarker/core/ReturnInstruction.java |  3 +-
 src/main/java/freemarker/core/Sep.java          |  5 +-
 .../java/freemarker/core/StopInstruction.java   |  2 +-
 src/main/java/freemarker/core/SwitchBlock.java  |  7 +-
 .../java/freemarker/core/TemplateElement.java   | 11 +++-
 .../core/TemplateElementsToVisit.java           | 31 +++++++++
 src/main/java/freemarker/core/TextBlock.java    |  3 +-
 ...nterruptionSupportTemplatePostProcessor.java |  3 +-
 .../java/freemarker/core/TransformBlock.java    |  3 +-
 .../java/freemarker/core/TrimInstruction.java   |  3 +-
 src/main/java/freemarker/core/UnifiedCall.java  |  5 +-
 src/main/java/freemarker/core/VisitNode.java    |  3 +-
 45 files changed, 175 insertions(+), 127 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/113d6702/src/main/java/freemarker/core/Environment.java
----------------------------------------------------------------------


Mime
View raw message