修复表达式解析不带括号出现错误的BUG

SievyMatt · Aug 6, 2018 · 17f0673 · 17f0673
1 parent b56d442
commit 17f0673
Showing 1 changed file with 2 additions and 2 deletions.
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
@@ -113,7 +113,7 @@ public Expression visitExpression(ExpressionContext ctx) {
 			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 @@ private ExpressionBlock parseBlock(BlockContext blockCtx){
 		}
 		if(returnCtx!=null){
 			if(block==null)block=new ExpressionBlock();
-			block.setReturnExpression(visitExpr(returnCtx.expr()));
+			block.setReturnExpression(parseExpr(returnCtx.expr()));
 		}
 		return block;
 	}