This is an automated email from the ASF dual-hosted git repository. henrib pushed a commit to branch JEXL-175 in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
commit 30d19752d75d27ca56ce9e2b936abf32576b4344 Merge: 732f933 006e455 Author: henrib <[email protected]> AuthorDate: Wed Sep 12 15:47:16 2018 +0200 Merge branch 'master' into experimental-regex RELEASE-NOTES.txt | 7 +- .../org/apache/commons/jexl3/JexlException.java | 52 ++- .../org/apache/commons/jexl3/JexlOperator.java | 13 +- .../java/org/apache/commons/jexl3/JexlScript.java | 42 ++- .../org/apache/commons/jexl3/ObjectContext.java | 4 +- .../org/apache/commons/jexl3/internal/Closure.java | 26 +- .../apache/commons/jexl3/internal/Debugger.java | 14 +- .../apache/commons/jexl3/internal/Interpreter.java | 363 ++++++--------------- .../commons/jexl3/internal/InterpreterBase.java | 338 ++++++++++++++++++- .../org/apache/commons/jexl3/internal/Scope.java | 37 ++- .../org/apache/commons/jexl3/internal/Script.java | 95 +----- .../commons/jexl3/internal/TemplateDebugger.java | 8 + .../apache/commons/jexl3/parser/ASTJexlLambda.java | 18 - .../apache/commons/jexl3/parser/ASTJexlScript.java | 16 +- .../org/apache/commons/jexl3/parser/JexlNode.java | 3 + src/site/xdoc/changes.xml | 9 + .../java/org/apache/commons/jexl3/CaptureLog.java | 13 + .../org/apache/commons/jexl3/ClassCreator.java | 2 +- .../org/apache/commons/jexl3/Issues200Test.java | 240 +++++++++++++- .../org/apache/commons/jexl3/JexlTestCase.java | 6 +- .../java/org/apache/commons/jexl3/LambdaTest.java | 98 +++++- 21 files changed, 956 insertions(+), 448 deletions(-) diff --cc src/main/java/org/apache/commons/jexl3/internal/Interpreter.java index 5098b9c,259b8d1..50e0f97 --- a/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java +++ b/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java @@@ -112,11 -110,8 +111,9 @@@ import java.util.HashMap import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.regex.Pattern; import java.util.concurrent.Callable; - import org.apache.commons.jexl3.JxltEngine; - /** * An interpreter of JEXL syntax.
