refactoring with code

gyc567 · Jul 18, 2016 · 6d76f07 · 6d76f07
1 parent c7c5a63
commit 6d76f07
Showing 1 changed file with 29 additions and 3 deletions.
diff --git a/src/main/java/com/github/eric/Function.java b/src/main/java/com/github/eric/Function.java
@@ -10,6 +10,14 @@ public class Function {
     private List args;
     private int reslut;
 
+    public List getArgs() {
+        return args;
+    }
+
+    public void setArgs(List args) {
+        this.args = args;
+    }
+
     public Operator getOperator() {
         return operator;
     }
@@ -33,16 +41,34 @@ public Function transform(ValuePair valuePair)
     if(valuePair.first==null)
         return null;
 
-        Object first = valuePair.first;
+        Object first = ValuePairUtils.first(valuePair);
+        Object rest = ValuePairUtils.rest(valuePair);
+        Function function=new Function();
         if(first instanceof String)
         {
             if(((String) first).equalsIgnoreCase("+"))
             {
-                Function function=new Function();
+
                 function.setOperator(Operator.PLUS);
             }
+        }else if(rest instanceof ValuePair)
+        {
+            ValuePair vp= (ValuePair) rest;
+            function=travleValuePair(function,vp);
         }
-        return null;
+        return function;
+    }
+
+    private Function travleValuePair(Function function, ValuePair vp) {
+        if (vp==null||vp.first==null)
+            return function;
+
+        Object first = vp.first;
+        function.getArgs().add(first);
+        if(vp.rest
+                !=null)
+            function.getArgs().add(vp.rest);
+        return function;
     }
 
 }