* src/main/clojure/clojure/core/logic.clj: all silly type hints elimi…

…nated
clojure · Aug 1, 2012 · 5bec691 · 5bec691
1 parent 85abe67
commit 5bec691
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/main/clojure/clojure/core/logic.clj b/src/main/clojure/clojure/core/logic.clj
@@ -3157,6 +3157,13 @@
     (every? domain? (map #(walk s %) (rands c)))))
 
 (deftype FDConstraint [proc _id _meta]
+  clojure.lang.ILookup
+  (valAt [this k]
+    (.valAt this k nil))
+  (valAt [this k not-found]
+    (case k
+      :proc proc
+      not-found))
   Object
   (equals [this o]
     (if (instance? FDConstraint o)
@@ -3202,11 +3209,10 @@
   (FDConstraint. proc nil nil))
 
 (defmethod print-method FDConstraint [x ^Writer writer]
-  (let [^FDConstraint x x
+  (let [cid (if-let [cid (id x)]
-        cid (if-let [cid (id x)]
              (str cid ":")
              "")]
-    (.write writer (str "(" cid (rator (.proc x)) " " (apply str (interpose " " (rands (.proc x)))) ")"))))
+    (.write writer (str "(" cid (rator (:proc x)) " " (apply str (interpose " " (rands (:proc x)))) ")"))))
 
 (defmacro infd
   "Assign vars to domain. The domain must come last."