Browse Source

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

master
youseries 6 years ago
parent
commit
17f0673049
  1. 4
      ureport2-core/src/main/java/com/bstek/ureport/expression/parse/ExpressionVisitor.java

4
ureport2-core/src/main/java/com/bstek/ureport/expression/parse/ExpressionVisitor.java

@ -113,7 +113,7 @@ public class ExpressionVisitor extends ReportParserBaseVisitor<Expression>{
expr.setExpression(parseItemContext(assignCtx.item())); expr.setExpression(parseItemContext(assignCtx.item()));
return expr; return expr;
}else if(returnCtx!=null){ }else if(returnCtx!=null){
return visitExpr(returnCtx.expr()); return parseExpr(returnCtx.expr());
}else{ }else{
throw new ReportParseException("Expression ["+ctx.getText()+"] is invalid."); throw new ReportParseException("Expression ["+ctx.getText()+"] is invalid.");
} }
@ -238,7 +238,7 @@ public class ExpressionVisitor extends ReportParserBaseVisitor<Expression>{
} }
if(returnCtx!=null){ if(returnCtx!=null){
if(block==null)block=new ExpressionBlock(); if(block==null)block=new ExpressionBlock();
block.setReturnExpression(visitExpr(returnCtx.expr())); block.setReturnExpression(parseExpr(returnCtx.expr()));
} }
return block; return block;
} }

Loading…
Cancel
Save