diff --git a/ureport2-core/src/main/java/com/bstek/ureport/expression/parse/ExpressionVisitor.java b/ureport2-core/src/main/java/com/bstek/ureport/expression/parse/ExpressionVisitor.java index 6c7b595..f8f41cd 100644 --- a/ureport2-core/src/main/java/com/bstek/ureport/expression/parse/ExpressionVisitor.java +++ b/ureport2-core/src/main/java/com/bstek/ureport/expression/parse/ExpressionVisitor.java @@ -113,7 +113,7 @@ public class ExpressionVisitor extends ReportParserBaseVisitor{ expr.setExpression(parseItemContext(assignCtx.item())); return expr; }else if(returnCtx!=null){ - return visitExpr(returnCtx.expr()); + return parseExpr(returnCtx.expr()); }else{ throw new ReportParseException("Expression ["+ctx.getText()+"] is invalid."); } @@ -238,7 +238,7 @@ public class ExpressionVisitor extends ReportParserBaseVisitor{ } if(returnCtx!=null){ if(block==null)block=new ExpressionBlock(); - block.setReturnExpression(visitExpr(returnCtx.expr())); + block.setReturnExpression(parseExpr(returnCtx.expr())); } return block; }