[mvel] 40/42: Merge tag 'upstream/2.2.7'

[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 a742cd0c3eb148cd5de6b39f8f5b8f7f7a3f0d64
Merge: 3569ad4 1c45e1a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 18 17:34:40 2016 +0100

    Merge tag 'upstream/2.2.7'
    
    Upstream version 2.2.7

 pom.xml                                            |  67 ++++-
 src/main/java/org/mvel2/CompileException.java      |  14 +-
 src/main/java/org/mvel2/MVEL.java                  |  15 +-
 .../java/org/mvel2/MVELInterpretedRuntime.java     |  21 +-
 src/main/java/org/mvel2/MVELRuntime.java           |   3 +-
 src/main/java/org/mvel2/ParserConfiguration.java   |  16 +-
 src/main/java/org/mvel2/ParserContext.java         |  21 +-
 .../java/org/mvel2/PropertyAccessException.java    |  28 +-
 src/main/java/org/mvel2/PropertyAccessor.java      |  57 ++--
 src/main/java/org/mvel2/ast/And.java               |   4 +-
 src/main/java/org/mvel2/ast/AssignmentNode.java    |   8 +-
 src/main/java/org/mvel2/ast/Convertable.java       |   2 +-
 .../java/org/mvel2/ast/DeepAssignmentNode.java     |   6 +-
 src/main/java/org/mvel2/ast/DoNode.java            |   2 +-
 src/main/java/org/mvel2/ast/DoUntilNode.java       |   2 +-
 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           |   2 +-
 src/main/java/org/mvel2/ast/Function.java          |   7 +-
 src/main/java/org/mvel2/ast/IfNode.java            |   2 +-
 src/main/java/org/mvel2/ast/ImportNode.java        |   3 +-
 .../java/org/mvel2/ast/InlineCollectionNode.java   |   8 +-
 src/main/java/org/mvel2/ast/Instance.java          |   3 +-
 src/main/java/org/mvel2/ast/Invert.java            |   2 +-
 .../org/mvel2/ast/LiteralDeepPropertyNode.java     |   3 +-
 src/main/java/org/mvel2/ast/NewObjectNode.java     |   2 +-
 src/main/java/org/mvel2/ast/Or.java                |   4 +-
 src/main/java/org/mvel2/ast/ProtoVarNode.java      |   2 +-
 src/main/java/org/mvel2/ast/RegExMatch.java        |   2 +-
 src/main/java/org/mvel2/ast/ReturnNode.java        |   3 +-
 src/main/java/org/mvel2/ast/Soundslike.java        |   2 +-
 src/main/java/org/mvel2/ast/Strsim.java            |   2 +-
 src/main/java/org/mvel2/ast/TypedVarNode.java      |   2 +-
 src/main/java/org/mvel2/ast/Union.java             |   4 +-
 src/main/java/org/mvel2/ast/UntilNode.java         |   2 +-
 src/main/java/org/mvel2/ast/WhileNode.java         |   2 +-
 .../java/org/mvel2/compiler/AbstractParser.java    | 171 +++++-------
 src/main/java/org/mvel2/compiler/BlankLiteral.java |  11 +-
 .../org/mvel2/compiler/ExpressionCompiler.java     |  35 +--
 .../java/org/mvel2/compiler/PropertyVerifier.java  |  58 ++--
 src/main/java/org/mvel2/math/MathProcessor.java    |   6 +-
 .../org/mvel2/optimizers/AbstractOptimizer.java    |  36 +--
 .../org/mvel2/optimizers/OptimizerFactory.java     |   6 +-
 .../dynamic/DynamicCollectionAccessor.java         |   7 +-
 .../optimizers/dynamic/DynamicGetAccessor.java     |  13 +-
 .../mvel2/optimizers/dynamic/DynamicOptimizer.java |  10 +-
 .../optimizers/impl/asm/ASMAccessorOptimizer.java  |  71 +++--
 .../impl/refl/ReflectiveAccessorOptimizer.java     | 136 +++++----
 .../impl/refl/nodes/ConstructorAccessor.java       |  29 +-
 .../impl/refl/nodes/InvokableAccessor.java         |  41 +++
 .../optimizers/impl/refl/nodes/MethodAccessor.java |  45 +--
 .../mvel2/optimizers/impl/refl/nodes/Union.java    |  10 +-
 .../optimizers/impl/refl/nodes/WithAccessor.java   |   7 +-
 src/main/java/org/mvel2/sh/ShellSession.java       |   6 +-
 src/main/java/org/mvel2/util/CompilerTools.java    |  37 ++-
 src/main/java/org/mvel2/util/FunctionParser.java   |   4 +-
 src/main/java/org/mvel2/util/ParseTools.java       | 147 ++++------
 src/main/java/org/mvel2/util/PropertyTools.java    |  19 +-
 .../mvel2/compiler/GenericsTypeInferenceTest.java  |  23 +-
 .../java/org/mvel2/tests/core/AbstractTest.java    |  50 ++--
 .../java/org/mvel2/tests/core/ArithmeticTests.java |  12 +-
 .../java/org/mvel2/tests/core/ArraysTests.java     |   5 +-
 .../org/mvel2/tests/core/CoreConfidenceTests.java  | 303 +++++++++++++++------
 .../java/org/mvel2/tests/core/DebuggerTests.java   |  89 +++---
 .../mvel2/tests/core/InlineCollectionsTests.java   |  10 +-
 .../org/mvel2/tests/core/MacroProcessorTest.java   |  35 +--
 .../java/org/mvel2/tests/core/MutationsTests.java  |  17 +-
 .../mvel2/tests/core/TypesAndInferenceTests.java   | 133 +++++----
 src/test/java/org/mvel2/tests/core/WithTests.java  |  41 +--
 69 files changed, 1055 insertions(+), 895 deletions(-)

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