[2nd Super Refactoring That Breaks The System: Part 1]

- Finishing implementing the type-system.
- Migrating more of the data-structures used in the compiler to the ones used by Lux itself.

1 files changed, 12 insertions, 2 deletions

diff --git a/src/lux/analyser/base.clj b/src/lux/analyser/base.clj
index 66451e97b..43bcd1181 100644
--- a/src/lux/analyser/base.clj
+++ b/src/lux/analyser/base.clj
@@ -1,8 +1,10 @@
 (ns lux.analyser.base
-  (:require [clojure.core.match :refer [match]]
+  (:require [clojure.core.match :as M :refer [match matchv]]
+            clojure.core.match.array
             (lux [base :as & :refer [exec return fail
                                      try-all-m map-m mapcat-m reduce-m
-                                     assert!]])))
+                                     assert!]]
+                 [type :as &type])))
 
 ;; [Resources]
 (defn expr-type [syntax+]
@@ -31,3 +33,11 @@
 
       :else
       (fail "[Analyser Error] Can't expand to other than 2 elements."))))
+
+(defn with-var [k]
+  (exec [=var &type/fresh-var
+         =ret (k =var)]
+    (match =ret
+      [::Expression ?expr ?type]
+      (exec [=type (&type/clean =var ?type)]
+        (return [::Expression ?expr =type])))))