diff options
| author | Eduardo Julian | 2015-04-30 00:02:00 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2015-04-30 00:02:00 -0400 |
| commit | ffb8b3b7b59499783f92c8dffc7a515ee6463c83 (patch) | |
| tree | 1744dd396c057a774eb4a47893b847ce1d50f18e /src | |
| parent | b1d166bcf88c24c2a1847866d1cf4e944fb80788 (diff) | |
- Improved the way vars are deleted by including code to remove all references to the removed var from other vars.
Diffstat (limited to '')
| -rw-r--r-- | src/lux/type.clj | 36 |
1 files changed, 28 insertions, 8 deletions
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 |