This is an automated email from the ASF dual-hosted git repository.
henrib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
The following commit(s) were added to refs/heads/master by this push:
new 5b0d350 JEXL: avoid reusing arguments
5b0d350 is described below
commit 5b0d350d5b237d1ba8f8349a5f39c3849430ac5e
Author: henrib <hen...@apache.org>
AuthorDate: Thu Sep 16 14:25:55 2021 +0200
JEXL: avoid reusing arguments
---
src/main/java/org/apache/commons/jexl3/JexlOptions.java | 7 ++++---
src/main/java/org/apache/commons/jexl3/internal/Debugger.java | 5 +++--
src/main/java/org/apache/commons/jexl3/internal/Engine.java | 5 +----
.../java/org/apache/commons/jexl3/internal/Interpreter.java | 10 ++++++----
4 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/apache/commons/jexl3/JexlOptions.java
b/src/main/java/org/apache/commons/jexl3/JexlOptions.java
index 7b8de6e..e72b9e7 100644
--- a/src/main/java/org/apache/commons/jexl3/JexlOptions.java
+++ b/src/main/java/org/apache/commons/jexl3/JexlOptions.java
@@ -120,11 +120,12 @@ public final class JexlOptions {
* <p>A '+flag' or 'flag' will set flag as true, '-flag' set as false.
* The possible flag names are:
* cancellable, strict, silent, safe, lexical, antish, lexicalShade
- * @param mask the initial mask state
+ * @param initial the initial mask state
* @param flags the flags to set
* @return the flag mask updated
*/
- public static int parseFlags(int mask, final String...flags) {
+ public static int parseFlags(int initial, final String...flags) {
+ int mask = initial;
for(String name : flags) {
boolean b = true;
if (name.charAt(0) == '+') {
@@ -408,4 +409,4 @@ public final class JexlOptions {
return new JexlOptions().set(this);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Debugger.java
b/src/main/java/org/apache/commons/jexl3/internal/Debugger.java
index 9562c4d..fd54f2f 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Debugger.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Debugger.java
@@ -701,7 +701,8 @@ public class Debugger extends ParserVisitor implements
JexlInfo.Detail {
}
@Override
- protected Object visit(final ASTJexlScript node, Object data) {
+ protected Object visit(final ASTJexlScript node, Object arg) {
+ Object data = arg;
// if lambda, produce parameters
if (node instanceof ASTJexlLambda) {
final JexlNode parent = node.jjtGetParent();
@@ -1079,4 +1080,4 @@ public class Debugger extends ParserVisitor implements
JexlInfo.Detail {
}
return data;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Engine.java
b/src/main/java/org/apache/commons/jexl3/internal/Engine.java
index 6b78ad4..b75a7e8 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Engine.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Engine.java
@@ -527,9 +527,6 @@ public class Engine extends JexlEngine {
@Override
public void setProperty(JexlContext context, final Object bean, final
String expr, final Object value) {
- if (context == null) {
- context = EMPTY_CONTEXT;
- }
// synthesize expr using register
String src = trimSource(expr);
src = "#0" + (src.charAt(0) == '[' ? "" : ".") + src + "=" + "#1";
@@ -538,7 +535,7 @@ public class Engine extends JexlEngine {
final ASTJexlScript script = parse(null, PROPERTY_FEATURES, src,
scope);
final JexlNode node = script.jjtGetChild(0);
final Frame frame = script.createFrame(bean, value);
- final Interpreter interpreter = createInterpreter(context, frame,
options);
+ final Interpreter interpreter = createInterpreter(context != null?
context : EMPTY_CONTEXT, frame, options);
interpreter.visitLexicalNode(node, null);
} catch (final JexlException xjexl) {
if (silent) {
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
b/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
index 2aec6ac..a1136da 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
@@ -1475,11 +1475,12 @@ public class Interpreter extends InterpreterBase {
/**
* Execute a method call, ie syntactically written as name.call(...).
* @param node the actual method call node
- * @param object non null when name.call is an antish variable
+ * @param antish non null when name.call is an antish variable
* @param data the context
* @return the method call result
*/
- private Object visit(final ASTMethodNode node, Object object, final Object
data) {
+ private Object visit(final ASTMethodNode node, final Object antish, final
Object data) {
+ Object object = antish;
// left contains the reference to the method
final JexlNode methodNode = node.jjtGetChild(0);
Object method;
@@ -1538,11 +1539,11 @@ public class Interpreter extends InterpreterBase {
*
* @param node the method node
* @param target the target of the method, what it should be invoked upon
- * @param functor the object carrying the method or function or the method
identifier
+ * @param funcNode the object carrying the method or function or the
method identifier
* @param argNode the node carrying the arguments
* @return the result of the method invocation
*/
- protected Object call(final JexlNode node, final Object target, Object
functor, final ASTArguments argNode) {
+ protected Object call(final JexlNode node, final Object target, final
Object funcNode, final ASTArguments argNode) {
cancelCheck(node);
// evaluate the arguments
final Object[] argv = visit(argNode, null);
@@ -1551,6 +1552,7 @@ public class Interpreter extends InterpreterBase {
final String methodName;
boolean cacheable = cache;
boolean isavar = false;
+ Object functor = funcNode;
if (functor instanceof ASTIdentifier) {
// function call, target is context or namespace (if there was one)
final ASTIdentifier methodIdentifier = (ASTIdentifier) functor;
