重构Fel类

add方法在编译时支持未知类型的参数
解决\n等转义字符带来的问题
加入print函数

Author: yuqingsong

Fel.g

@@ -47,7 +47,7 @@ public static SecurityMgr newSecurityMgr() {
 
 	public static EventMgr newEventMgr(){
 		EventMgr mgr = new EventMgr();
-		mgr.addListener(new EventListener<Event>() {
+	/*	mgr.addListener(new EventListener<Event>() {
 			
 			@Override
 			public Object onEvent(Event event) {
@@ -58,7 +58,7 @@ public Object onEvent(Event event) {
 			public String getId() {
 				return Events.UNDEFINED_VARIABLE;
 			}
-		});
+		});*/
 		return mgr;
 	}
 

src/main/com/greenpineyu/fel/common/FelBuilder.java

@@ -417,7 +417,7 @@ public static <T extends Comparable<T>> int compare(T a,T b){
 	 * @param obj
 	 * @return
 	 */
-	public static Object calArray(Object obj) {
+/*	public static Object calArray(Object obj) {
 		if (!(obj instanceof Object[]))
 			return obj;
 		
@@ -428,7 +428,7 @@ public static Object calArray(Object obj) {
 			}
 		}
 		return result;
-	}
+	}*/
 
 
 	/**

src/main/com/greenpineyu/fel/common/Null.java

@@ -1,5 +1,7 @@
 package com.greenpineyu.fel.common;
 
+import com.greenpineyu.fel.compile.SourceBuilder;
+
 
 public class ObjectUtils {
 	 /**
@@ -49,7 +51,9 @@ public static boolean equals(Object object1, Object object2) {
      * @since 2.0
      */
     public static String toString(Object obj) {
-        return obj == null ? "" : obj.toString();
+        //return obj == null ? "" : obj.toString();
+    	//modify by yqs
+    	return obj == null ? "null" : obj.toString();
     }
 
     /**
@@ -74,4 +78,10 @@ public static String toString(Object obj) {
     public static boolean notEqual(Object object1, Object object2) {
         return ObjectUtils.equals(object1, object2) == false;
     }
+    
+    //append by yqs
+	static public Object print(Object arg){
+		System.out.print(arg);
+		return SourceBuilder.VOID;
+	}
 }

src/main/com/greenpineyu/fel/common/NumberUtil.java

@@ -4,6 +4,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.greenpineyu.fel.context.FelContext;
+
 public class ReflectUtil {
 
 	/**
@@ -220,7 +222,7 @@ private static Method match(String methodName, Class<?>[] paramValueTypes,
 	}
 
 	public static boolean isTypeMatch(Class<?> c1,Class<?> c2){
-		if(c1 == c2||c2==Null.class){
+		if(c1 == c2||c2==FelContext.NULL.getClass()){
 			//当c2为Null.class时，表示参数值是null,null值可以与任何类型匹配类型
 			return true;
 		}

src/main/com/greenpineyu/fel/common/ObjectUtils.java

@@ -102,7 +102,7 @@ public Expression compile(FelContext ctx, FelNode node, String originalExp) {
 				ConstExpSrc s = (ConstExpSrc) src;
 				return s.getValue();
 			}
-			src.setSource("// 表达式:" + originalExp + "\n" + src.getSource());
+			src.setSource("/*表达式:" + originalExp + "*/\n" + src.getSource());
 			// System.out.println("****************\n" + src.getSource());
 			return complier.compile(src);
 		} catch (Exception e) {

src/main/com/greenpineyu/fel/common/ReflectUtil.java

@@ -11,6 +11,24 @@ public class FelMethod implements SourceBuilder {
 	private Class<?> returnType;
 
 	private String code;
+	
+	/**
+	 * 类型是否VOID
+	 * @param c
+	 * @return
+	 */
+	public static boolean isVoidType(Class<?> c){
+		return c == VOID.getClass();
+	}
+	
+	/**
+	 * 对象是否VOID
+	 * @param obj
+	 * @return
+	 */
+	public static boolean isVoid(Object obj){
+		return obj == VOID;
+	}
 
 
 	public FelMethod(Class<?> returnType,String code){
@@ -37,6 +55,7 @@ public String source(FelContext ctx, FelNode node) {
 	public void setCode(String code) {
 		this.code = code;
 	}
+	
 
 
 }

src/main/com/greenpineyu/fel/compile/CompileService.java

@@ -41,6 +41,9 @@ public String source(FelContext ctx, FelNode node) {
 		Interpreter inte = node.getInterpreter();
 			SourceBuilder nodeBuilder = node.toMethod(ctx);
 			Class<?> type =nodeBuilder.returnType(ctx, node);
+			if(type == FelContext.NOT_FOUND_TYPE){
+				type = Object.class;
+			}
 			String code = "("+type.getName()+")";
 			String varName = VarBuffer.push(inte,Interpreter.class);
 			String nodeVarName = VarBuffer.push(node, FelNode.class);

src/main/com/greenpineyu/fel/compile/FelMethod.java

@@ -10,6 +10,11 @@
  */
 public interface SourceBuilder {
 
+	/**
+	 * 返回void类型
+	 */
+	Object VOID=new Object(){};
+	
 	/**
 	 * 类型
 	 * @param ctx TODO