refactoring with code

gyc567 · Jul 16, 2016 · 060324e · 060324e
1 parent 09c4224
commit 060324e
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/src/main/java/com/github/eric/LispComplier.java b/src/main/java/com/github/eric/LispComplier.java
@@ -9,28 +9,27 @@ public static int calculate(int result, Object args) {
         if (args == null) {
             return result;
         }
+        if (args instanceof Integer) {
+            result += (Integer) args;
+            return result;
+        }
         if (args instanceof ValuePair) {
             Object first = ValuePairUtils.first(args);
-            if (first instanceof Integer)
+            if (first instanceof Integer) {
                 result += ((Integer) first).intValue();
-
-        }else if(args instanceof  Integer)
-        {
-            result+=(Integer) args;
-            return result;
+            }
         }
         return calculate(result, ValuePairUtils.rest(args));
     }
 
 
     public static Object eval(ValuePair valuePair) {
         String fn = (String) valuePair.first;
-        Integer rt=0;
+        Integer rt = 0;
         if (fn != null && fn.equals("+")) {
             ValuePair args = (ValuePair) valuePair.rest;
 
-            rt= calculate(rt,args);
-
+            rt = calculate(rt, args);
 
 
         }