Spider/spider-flow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

表达式null.方法/属性，以及map[null]、array[null]直接返回null

Browse Source
This commit is contained in:
mxd 2019-11-12 17:20:12 +08:00
parent 5540ea7bb3
commit b5eff983f1
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spider-flow-core/src/main/java/org/spiderflow/core/expression/parsing/Ast.java
View File

@ -749,9 +749,13 @@ public abstract class Ast {
@Override @Override
public Object evaluate (ExpressionTemplate template, ExpressionTemplateContext context) throws IOException { public Object evaluate (ExpressionTemplate template, ExpressionTemplateContext context) throws IOException {
Object mapOrArray = getMapOrArray().evaluate(template, context); Object mapOrArray = getMapOrArray().evaluate(template, context);
if (mapOrArray == null) ExpressionError.error("Couldn't find map or array in context.", getSpan()); if (mapOrArray == null) {
return null;
}
Object keyOrIndex = getKeyOrIndex().evaluate(template, context); Object keyOrIndex = getKeyOrIndex().evaluate(template, context);
if (keyOrIndex == null) ExpressionError.error("Couldn't evaluate key or index.", getKeyOrIndex().getSpan()); if (keyOrIndex == null) {
return null;
}
if (mapOrArray instanceof Map) { if (mapOrArray instanceof Map) {
return ((Map)mapOrArray).get(keyOrIndex); return ((Map)mapOrArray).get(keyOrIndex);
@ -831,7 +835,9 @@ public abstract class Ast {
@Override @Override
public Object evaluate (ExpressionTemplate template, ExpressionTemplateContext context) throws IOException { public Object evaluate (ExpressionTemplate template, ExpressionTemplateContext context) throws IOException {
Object object = getObject().evaluate(template, context); Object object = getObject().evaluate(template, context);
if (object == null) ExpressionError.error("Couldn't find object in context.", getSpan()); if (object == null) {
return null;
}
// special case for array.length // special case for array.length
if (object.getClass().isArray() && getName().getText().equals("length")) { if (object.getClass().isArray() && getName().getText().equals("length")) {
@ -1055,7 +1061,9 @@ public abstract class Ast {
public Object evaluate (ExpressionTemplate template, ExpressionTemplateContext context) throws IOException { public Object evaluate (ExpressionTemplate template, ExpressionTemplateContext context) throws IOException {
try { try {
Object object = getObject().evaluate(template, context); Object object = getObject().evaluate(template, context);
if (object == null) ExpressionError.error("对象为空", getSpan()); if (object == null) {
return null;
}
Object[] argumentValues = getCachedArguments(); Object[] argumentValues = getCachedArguments();
List<Expression> arguments = getArguments(); List<Expression> arguments = getArguments();