Browse Source

jfinal 4.8 release ^_^

James 6 years ago
parent
commit
6cdc89246e

+ 2 - 3
src/main/java/com/jfinal/template/stat/ast/Set.java

@@ -17,10 +17,8 @@
 package com.jfinal.template.stat.ast;
 package com.jfinal.template.stat.ast;
 
 
 import com.jfinal.template.Env;
 import com.jfinal.template.Env;
-import com.jfinal.template.expr.ast.Assign;
 import com.jfinal.template.expr.ast.Expr;
 import com.jfinal.template.expr.ast.Expr;
 import com.jfinal.template.expr.ast.ExprList;
 import com.jfinal.template.expr.ast.ExprList;
-import com.jfinal.template.expr.ast.IncDec;
 import com.jfinal.template.io.Writer;
 import com.jfinal.template.io.Writer;
 import com.jfinal.template.stat.Location;
 import com.jfinal.template.stat.Location;
 import com.jfinal.template.stat.ParseException;
 import com.jfinal.template.stat.ParseException;
@@ -44,11 +42,12 @@ public class Set extends Stat {
 			throw new ParseException("The parameter of #set directive can not be blank", location);
 			throw new ParseException("The parameter of #set directive can not be blank", location);
 		}
 		}
 		
 		
+		/* 放开对表达式类型的限定
 		for (Expr expr : exprList.getExprArray()) {
 		for (Expr expr : exprList.getExprArray()) {
 			if ( !(expr instanceof Assign || expr instanceof IncDec) ) {
 			if ( !(expr instanceof Assign || expr instanceof IncDec) ) {
 				throw new ParseException("#set directive only supports assignment expressions", location);
 				throw new ParseException("#set directive only supports assignment expressions", location);
 			}
 			}
-		}
+		}*/
 		
 		
 		this.expr = exprList.getActualExpr();
 		this.expr = exprList.getActualExpr();
 	}
 	}

+ 2 - 3
src/main/java/com/jfinal/template/stat/ast/SetGlobal.java

@@ -17,10 +17,8 @@
 package com.jfinal.template.stat.ast;
 package com.jfinal.template.stat.ast;
 
 
 import com.jfinal.template.Env;
 import com.jfinal.template.Env;
-import com.jfinal.template.expr.ast.Assign;
 import com.jfinal.template.expr.ast.Expr;
 import com.jfinal.template.expr.ast.Expr;
 import com.jfinal.template.expr.ast.ExprList;
 import com.jfinal.template.expr.ast.ExprList;
-import com.jfinal.template.expr.ast.IncDec;
 import com.jfinal.template.io.Writer;
 import com.jfinal.template.io.Writer;
 import com.jfinal.template.stat.Ctrl;
 import com.jfinal.template.stat.Ctrl;
 import com.jfinal.template.stat.Location;
 import com.jfinal.template.stat.Location;
@@ -41,11 +39,12 @@ public class SetGlobal  extends Stat {
 			throw new ParseException("The parameter of #setGlobal directive can not be blank", location);
 			throw new ParseException("The parameter of #setGlobal directive can not be blank", location);
 		}
 		}
 		
 		
+		/* 放开对表达式类型的限定
 		for (Expr expr : exprList.getExprArray()) {
 		for (Expr expr : exprList.getExprArray()) {
 			if ( !(expr instanceof Assign || expr instanceof IncDec) ) {
 			if ( !(expr instanceof Assign || expr instanceof IncDec) ) {
 				throw new ParseException("#setGlobal directive only supports assignment expressions", location);
 				throw new ParseException("#setGlobal directive only supports assignment expressions", location);
 			}
 			}
-		}
+		}*/
 		
 		
 		this.expr = exprList.getActualExpr();
 		this.expr = exprList.getActualExpr();
 	}
 	}

+ 2 - 3
src/main/java/com/jfinal/template/stat/ast/SetLocal.java

@@ -17,10 +17,8 @@
 package com.jfinal.template.stat.ast;
 package com.jfinal.template.stat.ast;
 
 
 import com.jfinal.template.Env;
 import com.jfinal.template.Env;
-import com.jfinal.template.expr.ast.Assign;
 import com.jfinal.template.expr.ast.Expr;
 import com.jfinal.template.expr.ast.Expr;
 import com.jfinal.template.expr.ast.ExprList;
 import com.jfinal.template.expr.ast.ExprList;
-import com.jfinal.template.expr.ast.IncDec;
 import com.jfinal.template.io.Writer;
 import com.jfinal.template.io.Writer;
 import com.jfinal.template.stat.Ctrl;
 import com.jfinal.template.stat.Ctrl;
 import com.jfinal.template.stat.Location;
 import com.jfinal.template.stat.Location;
@@ -42,11 +40,12 @@ public class SetLocal  extends Stat {
 			throw new ParseException("The parameter of #setLocal directive can not be blank", location);
 			throw new ParseException("The parameter of #setLocal directive can not be blank", location);
 		}
 		}
 		
 		
+		/* 放开对表达式类型的限定
 		for (Expr expr : exprList.getExprArray()) {
 		for (Expr expr : exprList.getExprArray()) {
 			if ( !(expr instanceof Assign || expr instanceof IncDec) ) {
 			if ( !(expr instanceof Assign || expr instanceof IncDec) ) {
 				throw new ParseException("#setLocal directive only supports assignment expressions", location);
 				throw new ParseException("#setLocal directive only supports assignment expressions", location);
 			}
 			}
-		}
+		}*/
 		
 		
 		this.expr = exprList.getActualExpr();
 		this.expr = exprList.getActualExpr();
 	}
 	}