From 544df91c27806b6d981707c456b7a98e482956dc Mon Sep 17 00:00:00 2001
From: Mike Cifelli <macifell@us.ibm.com>
Date: Tue, 28 Feb 2017 12:26:18 -0500
Subject: [PATCH] Simplified the EQUAL function logic

---
 src/function/builtin/predicate/EQUAL.java | 42 -----------------------
 1 file changed, 42 deletions(-)

diff --git a/src/function/builtin/predicate/EQUAL.java b/src/function/builtin/predicate/EQUAL.java
index 1ab136f..c44784f 100644
--- a/src/function/builtin/predicate/EQUAL.java
+++ b/src/function/builtin/predicate/EQUAL.java
@@ -1,7 +1,6 @@
 package function.builtin.predicate;
 
 import function.*;
-import function.builtin.cons.LIST;
 import sexpression.*;
 
 @FunctionNames({ "EQUAL" })
@@ -17,10 +16,6 @@ public class EQUAL extends LispFunction {
     public SExpression call(Cons argumentList) {
         argumentValidator.validate(argumentList);
 
-        return callRecursive(argumentList);
-    }
-
-    private SExpression callRecursive(Cons argumentList) {
         Cons rest = (Cons) argumentList.getRest();
         SExpression firstArgument = argumentList.getFirst();
         SExpression secondArgument = rest.getFirst();
@@ -29,43 +24,6 @@ public class EQUAL extends LispFunction {
     }
 
     private SExpression equal(SExpression firstArgument, SExpression secondArgument) {
-        if (isListPair(firstArgument, secondArgument))
-            return listEqual(firstArgument, secondArgument);
-
-        return atomEqual(firstArgument, secondArgument);
-    }
-
-    private boolean isListPair(SExpression firstArgument, SExpression secondArgument) {
-        return firstArgument.isCons() && secondArgument.isCons();
-    }
-
-    private SExpression listEqual(SExpression firstArgument, SExpression secondArgument) {
-        Cons listOne = (Cons) firstArgument;
-        Cons listTwo = (Cons) secondArgument;
-        SExpression listOneFirst = listOne.getFirst();
-        SExpression listTwoFirst = listTwo.getFirst();
-        SExpression listOneRest = listOne.getRest();
-        SExpression listTwoRest = listTwo.getRest();
-
-        SExpression firstEqual = callRecursive(makeArgumentList(listOneFirst, listTwoFirst));
-        SExpression restEqual = callRecursive(makeArgumentList(listOneRest, listTwoRest));
-
-        return logicalConjunction(firstEqual, restEqual);
-    }
-
-    private Cons makeArgumentList(SExpression one, SExpression two) {
-        return new Cons(one, LIST.makeList(two));
-    }
-
-    private SExpression logicalConjunction(SExpression firstEqual, SExpression restEqual) {
-        return bothAreTrue(firstEqual, restEqual) ? Symbol.T : Nil.getInstance();
-    }
-
-    private boolean bothAreTrue(SExpression firstEqual, SExpression restEqual) {
-        return (firstEqual == Symbol.T) && (restEqual == Symbol.T);
-    }
-
-    private SExpression atomEqual(SExpression firstArgument, SExpression secondArgument) {
         return isEqual(firstArgument, secondArgument) ? Symbol.T : Nil.getInstance();
     }