Merge branch '3' into feature/FREEMARKER-54
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/fc1f429c Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/fc1f429c Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/fc1f429c Branch: refs/heads/3 Commit: fc1f429cc4174b8ced71617074718715b81ee575 Parents: a571c24 cb4a93d Author: Woonsan Ko <[email protected]> Authored: Sat Jun 17 23:45:59 2017 -0400 Committer: Woonsan Ko <[email protected]> Committed: Sat Jun 17 23:45:59 2017 -0400 ---------------------------------------------------------------------- build.gradle | 7 +- .../org/apache/freemarker/core/ASTPrinter.java | 2 +- .../org/apache/freemarker/core/ast-1.ast | 2 +- .../org/apache/freemarker/core/ast-range.ast | 26 ++-- .../org/apache/freemarker/core/ASTComment.java | 2 +- .../apache/freemarker/core/ASTDebugBreak.java | 2 +- .../freemarker/core/ASTDirAssignment.java | 24 ++-- .../core/ASTDirAssignmentsContainer.java | 2 +- .../core/ASTDirAttemptRecoverContainer.java | 8 +- .../apache/freemarker/core/ASTDirAutoEsc.java | 6 +- .../org/apache/freemarker/core/ASTDirBreak.java | 4 +- .../core/ASTDirCapturingAssignment.java | 6 +- .../org/apache/freemarker/core/ASTDirCase.java | 4 +- .../apache/freemarker/core/ASTDirCompress.java | 6 +- .../freemarker/core/ASTDirElseOfList.java | 6 +- .../apache/freemarker/core/ASTDirEscape.java | 6 +- .../apache/freemarker/core/ASTDirFallback.java | 4 +- .../org/apache/freemarker/core/ASTDirFlush.java | 4 +- .../core/ASTDirIfElseIfElseContainer.java | 4 +- .../freemarker/core/ASTDirIfOrElseOrElseIf.java | 4 +- .../apache/freemarker/core/ASTDirImport.java | 4 +- .../apache/freemarker/core/ASTDirInclude.java | 4 +- .../org/apache/freemarker/core/ASTDirItems.java | 8 +- .../org/apache/freemarker/core/ASTDirList.java | 6 +- .../core/ASTDirListElseContainer.java | 4 +- .../org/apache/freemarker/core/ASTDirMacro.java | 6 +- .../apache/freemarker/core/ASTDirNested.java | 4 +- .../apache/freemarker/core/ASTDirNoAutoEsc.java | 6 +- .../apache/freemarker/core/ASTDirNoEscape.java | 8 +- .../freemarker/core/ASTDirOutputFormat.java | 8 +- .../apache/freemarker/core/ASTDirRecover.java | 6 +- .../apache/freemarker/core/ASTDirRecurse.java | 4 +- .../apache/freemarker/core/ASTDirReturn.java | 4 +- .../org/apache/freemarker/core/ASTDirSep.java | 8 +- .../apache/freemarker/core/ASTDirSetting.java | 4 +- .../org/apache/freemarker/core/ASTDirStop.java | 4 +- .../apache/freemarker/core/ASTDirSwitch.java | 6 +- .../apache/freemarker/core/ASTDirTOrTrOrTl.java | 4 +- .../freemarker/core/ASTDirUserDefined.java | 2 +- .../org/apache/freemarker/core/ASTDirVisit.java | 4 +- .../freemarker/core/ASTDollarInterpolation.java | 2 +- .../org/apache/freemarker/core/ASTElement.java | 2 +- .../freemarker/core/ASTExpAddOrConcat.java | 2 +- .../org/apache/freemarker/core/ASTExpAnd.java | 2 +- .../freemarker/core/ASTExpArithmetic.java | 129 +++++++++++++++++++ .../freemarker/core/ASTExpBooleanLiteral.java | 2 +- .../apache/freemarker/core/ASTExpBuiltIn.java | 2 +- .../freemarker/core/ASTExpBuiltInVariable.java | 2 +- .../freemarker/core/ASTExpComparison.java | 2 +- .../apache/freemarker/core/ASTExpDefault.java | 2 +- .../org/apache/freemarker/core/ASTExpDot.java | 4 +- .../freemarker/core/ASTExpDynamicKeyName.java | 2 +- .../apache/freemarker/core/ASTExpExists.java | 4 +- .../freemarker/core/ASTExpHashLiteral.java | 2 +- .../freemarker/core/ASTExpListLiteral.java | 2 +- .../freemarker/core/ASTExpMethodCall.java | 2 +- .../freemarker/core/ASTExpNegateOrPlus.java | 2 +- .../org/apache/freemarker/core/ASTExpNot.java | 2 +- .../freemarker/core/ASTExpNumberLiteral.java | 2 +- .../org/apache/freemarker/core/ASTExpOr.java | 2 +- .../freemarker/core/ASTExpParenthesis.java | 2 +- .../org/apache/freemarker/core/ASTExpRange.java | 4 +- .../freemarker/core/ASTExpStringLiteral.java | 2 +- .../apache/freemarker/core/ASTExpVariable.java | 2 +- .../freemarker/core/ASTHashInterpolation.java | 2 +- .../freemarker/core/ASTImplicitParent.java | 4 +- .../org/apache/freemarker/core/ASTNode.java | 9 +- .../apache/freemarker/core/ASTStaticText.java | 2 +- .../freemarker/core/ArithmeticExpression.java | 129 ------------------- .../core/BuiltInWithParseTimeParameters.java | 4 +- .../freemarker/core/ParsingConfiguration.java | 5 +- ...nterruptionSupportTemplatePostProcessor.java | 4 +- .../core/_ErrorDescriptionBuilder.java | 2 +- freemarker-core/src/main/javacc/FTL.jj | 12 +- freemarker-test-utils/build.gradle | 8 +- .../src/main/resources/logback-test.xml | 1 + 76 files changed, 300 insertions(+), 296 deletions(-) ----------------------------------------------------------------------
