This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
commit e5dac71a556e034d2f8ad8f3d6a0f1a8fd11c96c Author: Gary Gregory <[email protected]> AuthorDate: Sat Jun 1 10:54:53 2024 -0400 Sort imports --- .../apache/commons/jexl3/internal/Debugger.java | 97 +++++++++++++++++++++- .../apache/commons/jexl3/internal/Interpreter.java | 96 ++++++++++++++++++++- .../commons/jexl3/internal/ScriptVisitor.java | 95 ++++++++++++++++++++- 3 files changed, 285 insertions(+), 3 deletions(-) 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 389816a9..508d61da 100644 --- a/src/main/java/org/apache/commons/jexl3/internal/Debugger.java +++ b/src/main/java/org/apache/commons/jexl3/internal/Debugger.java @@ -25,7 +25,102 @@ import org.apache.commons.jexl3.JexlExpression; import org.apache.commons.jexl3.JexlFeatures; import org.apache.commons.jexl3.JexlInfo; import org.apache.commons.jexl3.JexlScript; -import org.apache.commons.jexl3.parser.*; +import org.apache.commons.jexl3.parser.ASTAddNode; +import org.apache.commons.jexl3.parser.ASTAndNode; +import org.apache.commons.jexl3.parser.ASTAnnotatedStatement; +import org.apache.commons.jexl3.parser.ASTAnnotation; +import org.apache.commons.jexl3.parser.ASTArguments; +import org.apache.commons.jexl3.parser.ASTArrayAccess; +import org.apache.commons.jexl3.parser.ASTArrayLiteral; +import org.apache.commons.jexl3.parser.ASTAssignment; +import org.apache.commons.jexl3.parser.ASTBitwiseAndNode; +import org.apache.commons.jexl3.parser.ASTBitwiseComplNode; +import org.apache.commons.jexl3.parser.ASTBitwiseOrNode; +import org.apache.commons.jexl3.parser.ASTBitwiseXorNode; +import org.apache.commons.jexl3.parser.ASTBlock; +import org.apache.commons.jexl3.parser.ASTBreak; +import org.apache.commons.jexl3.parser.ASTConstructorNode; +import org.apache.commons.jexl3.parser.ASTContinue; +import org.apache.commons.jexl3.parser.ASTDecrementGetNode; +import org.apache.commons.jexl3.parser.ASTDefineVars; +import org.apache.commons.jexl3.parser.ASTDivNode; +import org.apache.commons.jexl3.parser.ASTDoWhileStatement; +import org.apache.commons.jexl3.parser.ASTEQNode; +import org.apache.commons.jexl3.parser.ASTEQSNode; +import org.apache.commons.jexl3.parser.ASTERNode; +import org.apache.commons.jexl3.parser.ASTEWNode; +import org.apache.commons.jexl3.parser.ASTEmptyFunction; +import org.apache.commons.jexl3.parser.ASTExtendedLiteral; +import org.apache.commons.jexl3.parser.ASTFalseNode; +import org.apache.commons.jexl3.parser.ASTForeachStatement; +import org.apache.commons.jexl3.parser.ASTFunctionNode; +import org.apache.commons.jexl3.parser.ASTGENode; +import org.apache.commons.jexl3.parser.ASTGTNode; +import org.apache.commons.jexl3.parser.ASTGetDecrementNode; +import org.apache.commons.jexl3.parser.ASTGetIncrementNode; +import org.apache.commons.jexl3.parser.ASTIdentifier; +import org.apache.commons.jexl3.parser.ASTIdentifierAccess; +import org.apache.commons.jexl3.parser.ASTIfStatement; +import org.apache.commons.jexl3.parser.ASTIncrementGetNode; +import org.apache.commons.jexl3.parser.ASTInstanceOf; +import org.apache.commons.jexl3.parser.ASTJexlLambda; +import org.apache.commons.jexl3.parser.ASTJexlScript; +import org.apache.commons.jexl3.parser.ASTJxltLiteral; +import org.apache.commons.jexl3.parser.ASTLENode; +import org.apache.commons.jexl3.parser.ASTLTNode; +import org.apache.commons.jexl3.parser.ASTMapEntry; +import org.apache.commons.jexl3.parser.ASTMapLiteral; +import org.apache.commons.jexl3.parser.ASTMethodNode; +import org.apache.commons.jexl3.parser.ASTModNode; +import org.apache.commons.jexl3.parser.ASTMulNode; +import org.apache.commons.jexl3.parser.ASTNENode; +import org.apache.commons.jexl3.parser.ASTNESNode; +import org.apache.commons.jexl3.parser.ASTNEWNode; +import org.apache.commons.jexl3.parser.ASTNRNode; +import org.apache.commons.jexl3.parser.ASTNSWNode; +import org.apache.commons.jexl3.parser.ASTNotInstanceOf; +import org.apache.commons.jexl3.parser.ASTNotNode; +import org.apache.commons.jexl3.parser.ASTNullLiteral; +import org.apache.commons.jexl3.parser.ASTNullpNode; +import org.apache.commons.jexl3.parser.ASTNumberLiteral; +import org.apache.commons.jexl3.parser.ASTOrNode; +import org.apache.commons.jexl3.parser.ASTQualifiedIdentifier; +import org.apache.commons.jexl3.parser.ASTRangeNode; +import org.apache.commons.jexl3.parser.ASTReference; +import org.apache.commons.jexl3.parser.ASTReferenceExpression; +import org.apache.commons.jexl3.parser.ASTRegexLiteral; +import org.apache.commons.jexl3.parser.ASTReturnStatement; +import org.apache.commons.jexl3.parser.ASTSWNode; +import org.apache.commons.jexl3.parser.ASTSetAddNode; +import org.apache.commons.jexl3.parser.ASTSetAndNode; +import org.apache.commons.jexl3.parser.ASTSetDivNode; +import org.apache.commons.jexl3.parser.ASTSetLiteral; +import org.apache.commons.jexl3.parser.ASTSetModNode; +import org.apache.commons.jexl3.parser.ASTSetMultNode; +import org.apache.commons.jexl3.parser.ASTSetOrNode; +import org.apache.commons.jexl3.parser.ASTSetShiftLeftNode; +import org.apache.commons.jexl3.parser.ASTSetShiftRightNode; +import org.apache.commons.jexl3.parser.ASTSetShiftRightUnsignedNode; +import org.apache.commons.jexl3.parser.ASTSetSubNode; +import org.apache.commons.jexl3.parser.ASTSetXorNode; +import org.apache.commons.jexl3.parser.ASTShiftLeftNode; +import org.apache.commons.jexl3.parser.ASTShiftRightNode; +import org.apache.commons.jexl3.parser.ASTShiftRightUnsignedNode; +import org.apache.commons.jexl3.parser.ASTSizeFunction; +import org.apache.commons.jexl3.parser.ASTStringLiteral; +import org.apache.commons.jexl3.parser.ASTSubNode; +import org.apache.commons.jexl3.parser.ASTTernaryNode; +import org.apache.commons.jexl3.parser.ASTThrowStatement; +import org.apache.commons.jexl3.parser.ASTTrueNode; +import org.apache.commons.jexl3.parser.ASTTryResources; +import org.apache.commons.jexl3.parser.ASTTryStatement; +import org.apache.commons.jexl3.parser.ASTUnaryMinusNode; +import org.apache.commons.jexl3.parser.ASTUnaryPlusNode; +import org.apache.commons.jexl3.parser.ASTVar; +import org.apache.commons.jexl3.parser.ASTWhileStatement; +import org.apache.commons.jexl3.parser.JexlNode; +import org.apache.commons.jexl3.parser.ParserVisitor; +import org.apache.commons.jexl3.parser.StringParser; /** * Helps pinpoint the cause of problems in expressions that fail during evaluation. 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 f8f2d278..4e7fad20 100644 --- a/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java +++ b/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java @@ -35,7 +35,101 @@ import org.apache.commons.jexl3.JexlScript; import org.apache.commons.jexl3.JxltEngine; import org.apache.commons.jexl3.introspection.JexlMethod; import org.apache.commons.jexl3.introspection.JexlPropertyGet; -import org.apache.commons.jexl3.parser.*; +import org.apache.commons.jexl3.parser.ASTAddNode; +import org.apache.commons.jexl3.parser.ASTAndNode; +import org.apache.commons.jexl3.parser.ASTAnnotatedStatement; +import org.apache.commons.jexl3.parser.ASTAnnotation; +import org.apache.commons.jexl3.parser.ASTArguments; +import org.apache.commons.jexl3.parser.ASTArrayAccess; +import org.apache.commons.jexl3.parser.ASTArrayLiteral; +import org.apache.commons.jexl3.parser.ASTAssignment; +import org.apache.commons.jexl3.parser.ASTBitwiseAndNode; +import org.apache.commons.jexl3.parser.ASTBitwiseComplNode; +import org.apache.commons.jexl3.parser.ASTBitwiseOrNode; +import org.apache.commons.jexl3.parser.ASTBitwiseXorNode; +import org.apache.commons.jexl3.parser.ASTBlock; +import org.apache.commons.jexl3.parser.ASTBreak; +import org.apache.commons.jexl3.parser.ASTConstructorNode; +import org.apache.commons.jexl3.parser.ASTContinue; +import org.apache.commons.jexl3.parser.ASTDecrementGetNode; +import org.apache.commons.jexl3.parser.ASTDefineVars; +import org.apache.commons.jexl3.parser.ASTDivNode; +import org.apache.commons.jexl3.parser.ASTDoWhileStatement; +import org.apache.commons.jexl3.parser.ASTEQNode; +import org.apache.commons.jexl3.parser.ASTEQSNode; +import org.apache.commons.jexl3.parser.ASTERNode; +import org.apache.commons.jexl3.parser.ASTEWNode; +import org.apache.commons.jexl3.parser.ASTEmptyFunction; +import org.apache.commons.jexl3.parser.ASTExtendedLiteral; +import org.apache.commons.jexl3.parser.ASTFalseNode; +import org.apache.commons.jexl3.parser.ASTForeachStatement; +import org.apache.commons.jexl3.parser.ASTFunctionNode; +import org.apache.commons.jexl3.parser.ASTGENode; +import org.apache.commons.jexl3.parser.ASTGTNode; +import org.apache.commons.jexl3.parser.ASTGetDecrementNode; +import org.apache.commons.jexl3.parser.ASTGetIncrementNode; +import org.apache.commons.jexl3.parser.ASTIdentifier; +import org.apache.commons.jexl3.parser.ASTIdentifierAccess; +import org.apache.commons.jexl3.parser.ASTIdentifierAccessJxlt; +import org.apache.commons.jexl3.parser.ASTIfStatement; +import org.apache.commons.jexl3.parser.ASTIncrementGetNode; +import org.apache.commons.jexl3.parser.ASTInstanceOf; +import org.apache.commons.jexl3.parser.ASTJexlLambda; +import org.apache.commons.jexl3.parser.ASTJexlScript; +import org.apache.commons.jexl3.parser.ASTJxltLiteral; +import org.apache.commons.jexl3.parser.ASTLENode; +import org.apache.commons.jexl3.parser.ASTLTNode; +import org.apache.commons.jexl3.parser.ASTMapEntry; +import org.apache.commons.jexl3.parser.ASTMapLiteral; +import org.apache.commons.jexl3.parser.ASTMethodNode; +import org.apache.commons.jexl3.parser.ASTModNode; +import org.apache.commons.jexl3.parser.ASTMulNode; +import org.apache.commons.jexl3.parser.ASTNENode; +import org.apache.commons.jexl3.parser.ASTNESNode; +import org.apache.commons.jexl3.parser.ASTNEWNode; +import org.apache.commons.jexl3.parser.ASTNRNode; +import org.apache.commons.jexl3.parser.ASTNSWNode; +import org.apache.commons.jexl3.parser.ASTNotInstanceOf; +import org.apache.commons.jexl3.parser.ASTNotNode; +import org.apache.commons.jexl3.parser.ASTNullLiteral; +import org.apache.commons.jexl3.parser.ASTNullpNode; +import org.apache.commons.jexl3.parser.ASTNumberLiteral; +import org.apache.commons.jexl3.parser.ASTOrNode; +import org.apache.commons.jexl3.parser.ASTQualifiedIdentifier; +import org.apache.commons.jexl3.parser.ASTRangeNode; +import org.apache.commons.jexl3.parser.ASTReference; +import org.apache.commons.jexl3.parser.ASTReferenceExpression; +import org.apache.commons.jexl3.parser.ASTRegexLiteral; +import org.apache.commons.jexl3.parser.ASTReturnStatement; +import org.apache.commons.jexl3.parser.ASTSWNode; +import org.apache.commons.jexl3.parser.ASTSetAddNode; +import org.apache.commons.jexl3.parser.ASTSetAndNode; +import org.apache.commons.jexl3.parser.ASTSetDivNode; +import org.apache.commons.jexl3.parser.ASTSetLiteral; +import org.apache.commons.jexl3.parser.ASTSetModNode; +import org.apache.commons.jexl3.parser.ASTSetMultNode; +import org.apache.commons.jexl3.parser.ASTSetOrNode; +import org.apache.commons.jexl3.parser.ASTSetShiftLeftNode; +import org.apache.commons.jexl3.parser.ASTSetShiftRightNode; +import org.apache.commons.jexl3.parser.ASTSetShiftRightUnsignedNode; +import org.apache.commons.jexl3.parser.ASTSetSubNode; +import org.apache.commons.jexl3.parser.ASTSetXorNode; +import org.apache.commons.jexl3.parser.ASTShiftLeftNode; +import org.apache.commons.jexl3.parser.ASTShiftRightNode; +import org.apache.commons.jexl3.parser.ASTShiftRightUnsignedNode; +import org.apache.commons.jexl3.parser.ASTSizeFunction; +import org.apache.commons.jexl3.parser.ASTStringLiteral; +import org.apache.commons.jexl3.parser.ASTSubNode; +import org.apache.commons.jexl3.parser.ASTTernaryNode; +import org.apache.commons.jexl3.parser.ASTThrowStatement; +import org.apache.commons.jexl3.parser.ASTTrueNode; +import org.apache.commons.jexl3.parser.ASTTryResources; +import org.apache.commons.jexl3.parser.ASTTryStatement; +import org.apache.commons.jexl3.parser.ASTUnaryMinusNode; +import org.apache.commons.jexl3.parser.ASTUnaryPlusNode; +import org.apache.commons.jexl3.parser.ASTVar; +import org.apache.commons.jexl3.parser.ASTWhileStatement; +import org.apache.commons.jexl3.parser.JexlNode; /** * An interpreter of JEXL syntax. diff --git a/src/main/java/org/apache/commons/jexl3/internal/ScriptVisitor.java b/src/main/java/org/apache/commons/jexl3/internal/ScriptVisitor.java index 32c17ef0..966c1ad6 100644 --- a/src/main/java/org/apache/commons/jexl3/internal/ScriptVisitor.java +++ b/src/main/java/org/apache/commons/jexl3/internal/ScriptVisitor.java @@ -18,7 +18,100 @@ package org.apache.commons.jexl3.internal; import org.apache.commons.jexl3.JexlExpression; import org.apache.commons.jexl3.JexlScript; -import org.apache.commons.jexl3.parser.*; +import org.apache.commons.jexl3.parser.ASTAddNode; +import org.apache.commons.jexl3.parser.ASTAndNode; +import org.apache.commons.jexl3.parser.ASTAnnotatedStatement; +import org.apache.commons.jexl3.parser.ASTAnnotation; +import org.apache.commons.jexl3.parser.ASTArguments; +import org.apache.commons.jexl3.parser.ASTArrayAccess; +import org.apache.commons.jexl3.parser.ASTArrayLiteral; +import org.apache.commons.jexl3.parser.ASTAssignment; +import org.apache.commons.jexl3.parser.ASTBitwiseAndNode; +import org.apache.commons.jexl3.parser.ASTBitwiseComplNode; +import org.apache.commons.jexl3.parser.ASTBitwiseOrNode; +import org.apache.commons.jexl3.parser.ASTBitwiseXorNode; +import org.apache.commons.jexl3.parser.ASTBlock; +import org.apache.commons.jexl3.parser.ASTBreak; +import org.apache.commons.jexl3.parser.ASTConstructorNode; +import org.apache.commons.jexl3.parser.ASTContinue; +import org.apache.commons.jexl3.parser.ASTDecrementGetNode; +import org.apache.commons.jexl3.parser.ASTDefineVars; +import org.apache.commons.jexl3.parser.ASTDivNode; +import org.apache.commons.jexl3.parser.ASTDoWhileStatement; +import org.apache.commons.jexl3.parser.ASTEQNode; +import org.apache.commons.jexl3.parser.ASTEQSNode; +import org.apache.commons.jexl3.parser.ASTERNode; +import org.apache.commons.jexl3.parser.ASTEWNode; +import org.apache.commons.jexl3.parser.ASTEmptyFunction; +import org.apache.commons.jexl3.parser.ASTExtendedLiteral; +import org.apache.commons.jexl3.parser.ASTFalseNode; +import org.apache.commons.jexl3.parser.ASTForeachStatement; +import org.apache.commons.jexl3.parser.ASTFunctionNode; +import org.apache.commons.jexl3.parser.ASTGENode; +import org.apache.commons.jexl3.parser.ASTGTNode; +import org.apache.commons.jexl3.parser.ASTGetDecrementNode; +import org.apache.commons.jexl3.parser.ASTGetIncrementNode; +import org.apache.commons.jexl3.parser.ASTIdentifier; +import org.apache.commons.jexl3.parser.ASTIdentifierAccess; +import org.apache.commons.jexl3.parser.ASTIfStatement; +import org.apache.commons.jexl3.parser.ASTIncrementGetNode; +import org.apache.commons.jexl3.parser.ASTInstanceOf; +import org.apache.commons.jexl3.parser.ASTJexlScript; +import org.apache.commons.jexl3.parser.ASTJxltLiteral; +import org.apache.commons.jexl3.parser.ASTLENode; +import org.apache.commons.jexl3.parser.ASTLTNode; +import org.apache.commons.jexl3.parser.ASTMapEntry; +import org.apache.commons.jexl3.parser.ASTMapLiteral; +import org.apache.commons.jexl3.parser.ASTMethodNode; +import org.apache.commons.jexl3.parser.ASTModNode; +import org.apache.commons.jexl3.parser.ASTMulNode; +import org.apache.commons.jexl3.parser.ASTNENode; +import org.apache.commons.jexl3.parser.ASTNESNode; +import org.apache.commons.jexl3.parser.ASTNEWNode; +import org.apache.commons.jexl3.parser.ASTNRNode; +import org.apache.commons.jexl3.parser.ASTNSWNode; +import org.apache.commons.jexl3.parser.ASTNotInstanceOf; +import org.apache.commons.jexl3.parser.ASTNotNode; +import org.apache.commons.jexl3.parser.ASTNullLiteral; +import org.apache.commons.jexl3.parser.ASTNullpNode; +import org.apache.commons.jexl3.parser.ASTNumberLiteral; +import org.apache.commons.jexl3.parser.ASTOrNode; +import org.apache.commons.jexl3.parser.ASTQualifiedIdentifier; +import org.apache.commons.jexl3.parser.ASTRangeNode; +import org.apache.commons.jexl3.parser.ASTReference; +import org.apache.commons.jexl3.parser.ASTReferenceExpression; +import org.apache.commons.jexl3.parser.ASTRegexLiteral; +import org.apache.commons.jexl3.parser.ASTReturnStatement; +import org.apache.commons.jexl3.parser.ASTSWNode; +import org.apache.commons.jexl3.parser.ASTSetAddNode; +import org.apache.commons.jexl3.parser.ASTSetAndNode; +import org.apache.commons.jexl3.parser.ASTSetDivNode; +import org.apache.commons.jexl3.parser.ASTSetLiteral; +import org.apache.commons.jexl3.parser.ASTSetModNode; +import org.apache.commons.jexl3.parser.ASTSetMultNode; +import org.apache.commons.jexl3.parser.ASTSetOrNode; +import org.apache.commons.jexl3.parser.ASTSetShiftLeftNode; +import org.apache.commons.jexl3.parser.ASTSetShiftRightNode; +import org.apache.commons.jexl3.parser.ASTSetShiftRightUnsignedNode; +import org.apache.commons.jexl3.parser.ASTSetSubNode; +import org.apache.commons.jexl3.parser.ASTSetXorNode; +import org.apache.commons.jexl3.parser.ASTShiftLeftNode; +import org.apache.commons.jexl3.parser.ASTShiftRightNode; +import org.apache.commons.jexl3.parser.ASTShiftRightUnsignedNode; +import org.apache.commons.jexl3.parser.ASTSizeFunction; +import org.apache.commons.jexl3.parser.ASTStringLiteral; +import org.apache.commons.jexl3.parser.ASTSubNode; +import org.apache.commons.jexl3.parser.ASTTernaryNode; +import org.apache.commons.jexl3.parser.ASTThrowStatement; +import org.apache.commons.jexl3.parser.ASTTrueNode; +import org.apache.commons.jexl3.parser.ASTTryResources; +import org.apache.commons.jexl3.parser.ASTTryStatement; +import org.apache.commons.jexl3.parser.ASTUnaryMinusNode; +import org.apache.commons.jexl3.parser.ASTUnaryPlusNode; +import org.apache.commons.jexl3.parser.ASTVar; +import org.apache.commons.jexl3.parser.ASTWhileStatement; +import org.apache.commons.jexl3.parser.JexlNode; +import org.apache.commons.jexl3.parser.ParserVisitor; /** * Concrete visitor base, used for feature and operator controllers.
