[mvel] 36/42: Merge tag 'upstream/2.2.1'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository mvel.

commit 278d8b7bae5f967172e84508222e1a3ec7a82de2
Merge: f12803b 5ae2e41
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 18 17:11:42 2016 +0100

    Merge tag 'upstream/2.2.1'
    
    Upstream version 2.2.1

 pom.xml                                            |   2 +-
 src/main/java/org/mvel2/MVELRuntime.java           |   5 +-
 src/main/java/org/mvel2/Operator.java              |   2 +
 src/main/java/org/mvel2/ParserConfiguration.java   |  10 +
 src/main/java/org/mvel2/ParserContext.java         |  75 +++--
 src/main/java/org/mvel2/PropertyAccessor.java      |  72 +++--
 src/main/java/org/mvel2/ast/AssignmentNode.java    |   7 +-
 src/main/java/org/mvel2/ast/BinaryOperation.java   |  28 +-
 src/main/java/org/mvel2/ast/Fold.java              |   2 +
 src/main/java/org/mvel2/ast/ForEachNode.java       |   2 -
 src/main/java/org/mvel2/ast/ForNode.java           |   6 +-
 src/main/java/org/mvel2/ast/Function.java          |  91 +++---
 src/main/java/org/mvel2/ast/FunctionInstance.java  |  22 ++
 .../java/org/mvel2/ast/IndexedAssignmentNode.java  |   7 +
 .../org/mvel2/ast/InvokationContextFactory.java    |  62 ++++
 src/main/java/org/mvel2/ast/NewObjectNode.java     |  64 ++--
 .../java/org/mvel2/ast/NewObjectPrototype.java     |  31 ++
 src/main/java/org/mvel2/ast/Proto.java             |  54 ----
 .../org/mvel2/ast/PrototypalFunctionInstance.java  |  30 ++
 src/main/java/org/mvel2/ast/RegExMatch.java        |   4 +
 src/main/java/org/mvel2/ast/Sign.java              |   3 +
 src/main/java/org/mvel2/ast/Stacklang.java         |  17 +-
 .../java/org/mvel2/compiler/AbstractParser.java    |  40 +--
 .../org/mvel2/compiler/ExpressionCompiler.java     |  19 +-
 .../java/org/mvel2/compiler/PropertyVerifier.java  | 107 ++++--
 .../impl/CachingMapVariableResolverFactory.java    |   9 -
 .../impl/StackDelimiterResolverFactory.java        |  24 ++
 src/main/java/org/mvel2/math/MathProcessor.java    |  11 +-
 .../org/mvel2/optimizers/OptimizerFactory.java     |   4 +-
 .../optimizers/dynamic/DynamicGetAccessor.java     |  12 +-
 .../mvel2/optimizers/dynamic/DynamicOptimizer.java |  40 ++-
 .../optimizers/impl/asm/ASMAccessorOptimizer.java  | 199 ++++++------
 .../impl/refl/ReflectiveAccessorOptimizer.java     |  44 ++-
 .../impl/refl/collection/ArrayCreator.java         |   4 +
 .../optimizers/impl/refl/nodes/ArrayAccessor.java  |  11 +-
 .../impl/refl/nodes/DynamicFieldAccessor.java      |   2 +-
 .../impl/refl/nodes/FunctionAccessor.java          |   6 +-
 .../optimizers/impl/refl/nodes/MethodAccessor.java |  23 +-
 .../templates/res/CompiledNamedIncludeNode.java    |   4 +
 src/main/java/org/mvel2/util/ASTBinaryTree.java    |   1 +
 src/main/java/org/mvel2/util/ErrorUtil.java        |   9 +
 src/main/java/org/mvel2/util/ExecutionStack.java   |  49 ++-
 src/main/java/org/mvel2/util/FunctionParser.java   |  12 +-
 src/main/java/org/mvel2/util/JITClassLoader.java   |  27 +-
 src/main/java/org/mvel2/util/ParseTools.java       | 215 ++++++------
 src/main/java/org/mvel2/util/PropertyTools.java    |   7 +-
 src/main/java/org/mvel2/util/ReflectionUtil.java   |  40 +--
 src/main/java/org/mvel2/util/StringAppender.java   |  48 +--
 src/main/java/org/mvel2/util/Varargs.java          |   3 +-
 .../java/org/mvel2/tests/classes/ClassTests.java   |  20 ++
 src/test/java/org/mvel2/tests/classes/demo.mvel    |  56 ++++
 .../java/org/mvel2/tests/core/ArraysTests.java     |  12 +
 .../org/mvel2/tests/core/CommentParsingTests.java  |  25 +-
 .../java/org/mvel2/tests/core/ComparisonTests.java |  64 ++++
 .../org/mvel2/tests/core/ControlFlowTests.java     |  12 +-
 .../org/mvel2/tests/core/CoreConfidenceTests.java  | 360 ++++++++++++++++++---
 .../java/org/mvel2/tests/core/FunctionsTest.java   |  14 +
 src/test/java/org/mvel2/tests/core/I18nTest.java   |  43 +++
 src/test/java/org/mvel2/tests/core/MVELTest.java   |   2 +
 src/test/java/org/mvel2/tests/core/Main.java       |  45 +++
 .../org/mvel2/tests/core/ProjectionsTests.java     |  65 ++++
 .../org/mvel2/tests/core/PropertyAccessTests.java  | 107 +++++-
 .../java/org/mvel2/tests/core/StacklangTests.java  |  26 +-
 .../java/org/mvel2/tests/core/res/AStatic.java     |  20 ++
 src/test/java/org/mvel2/tests/core/res/Foo.java    |   4 +-
 src/test/java/org/mvel2/tests/core/res/Runner.java |  38 +++
 .../org/mvel2/tests/core/res/ScenarioType.java     |   8 +
 src/test/java/org/mvel2/tests/fuzz/Fuzzer.java     |   6 +-
 .../tests/perftests/ConcurrentEvaluationTests.java |  63 ++++
 .../tests/perftests/NestedSubstatementTests.java   |  38 +++
 .../org/mvel2/tests/templates/TemplateTests.java   |  46 ++-
 src/test/resources/eventing-example.jar            | Bin 4441 -> 0 bytes
 72 files changed, 1962 insertions(+), 678 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mvel.git