From ffb8b3b7b59499783f92c8dffc7a515ee6463c83 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Thu, 30 Apr 2015 00:02:00 -0400
Subject: - Improved the way vars are deleted by including code to remove all
 references to the removed var from other vars.

---
 src/lux/type.clj | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/lux/type.clj b/src/lux/type.clj
index 684ff374d..b1b77d5ab 100644
--- a/src/lux/type.clj
+++ b/src/lux/type.clj
@@ -188,16 +188,36 @@
                           state)
                id))))
 
+(declare clean*)
 (defn ^:private delete-var [id]
   (fn [state]
-    ;; (prn 'delete-var id)
-    (if-let [tvar (->> state (&/get$ &/$TYPES) (&/get$ &/$MAPPINGS) (&/|get id))]
-      (return* (&/update$ &/$TYPES #(->> %
-                                            (&/update$ &/$COUNTER dec)
-                                            (&/update$ &/$MAPPINGS (fn [ms] (&/|remove id ms))))
-                          state)
-               nil)
-      (fail* (str "[Type Error] Unknown type-var: " id)))))
+    (&/run-state (|do [mappings* (&/map% (fn [binding]
+                                           (|let [[?id ?type] binding]
+                                             (if (= id ?id)
+                                               (return binding)
+                                               (matchv ::M/objects [?type]
+                                                 [["lux;Some" ?type*]]
+                                                 (matchv ::M/objects [?type*]
+                                                   [["lux;VarT" ?id*]]
+                                                   (if (= id ?id*)
+                                                     (return (&/T ?id (&/V "lux;None" nil)))
+                                                     (|do [?type** (clean* id ?type*)]
+                                                       (return (&/T ?id (&/V "lux;Some" ?type**)))))
+
+                                                   [_]
+                                                   (|do [?type** (clean* id ?type*)]
+                                                     (return (&/T ?id (&/V "lux;Some" ?type**)))))
+                                                 
+                                                 [["lux;None" _]]
+                                                 (return binding)))))
+                                         (->> state (&/get$ &/$TYPES) (&/get$ &/$MAPPINGS)))]
+                   (fn [state]
+                     (return* (&/update$ &/$TYPES #(->> %
+                                                        (&/update$ &/$COUNTER dec)
+                                                        (&/set$ &/$MAPPINGS (&/|remove id mappings*)))
+                                         state)
+                              nil)))
+                 state)))
 
 (defn with-var [k]
   (|do [id create-var
-- 
cgit v1.2.3