- Migrated the format of analysis nodes from a custom data-type, to just Code nodes.

1 files changed, 14 insertions, 13 deletions

diff --git a/new-luxc/source/luxc/analyser/primitive.lux b/new-luxc/source/luxc/analyser/primitive.lux
index 0023e43e0..c7f7243fd 100644
--- a/new-luxc/source/luxc/analyser/primitive.lux
+++ b/new-luxc/source/luxc/analyser/primitive.lux
@@ -1,8 +1,9 @@
 (;module:
   lux
   (lux (control monad)
-       [meta #+ Monad<Meta>]
-       (meta (type ["TC" check])))
+       [meta]
+       (meta [code]
+             (type ["tc" check])))
   (luxc ["&" base]
         (lang ["la" analysis #+ Analysis])))
 
@@ -10,24 +11,24 @@
 (do-template [<name> <type> <tag>]
   [(def: #export (<name> value)
      (-> <type> (Meta Analysis))
-     (do Monad<Meta>
+     (do meta;Monad<Meta>
        [expected meta;expected-type
         _ (&;with-type-env
-            (TC;check expected <type>))]
+            (tc;check expected <type>))]
        (wrap (<tag> value))))]
 
-  [analyse-bool Bool #la;Bool]
-  [analyse-nat  Nat  #la;Nat]
-  [analyse-int  Int  #la;Int]
-  [analyse-deg  Deg  #la;Deg]
-  [analyse-frac Frac #la;Frac]
-  [analyse-text Text #la;Text]
+  [analyse-bool Bool code;bool]
+  [analyse-nat  Nat  code;nat]
+  [analyse-int  Int  code;int]
+  [analyse-deg  Deg  code;deg]
+  [analyse-frac Frac code;frac]
+  [analyse-text Text code;text]
   )
 
 (def: #export analyse-unit
   (Meta Analysis)
-  (do Monad<Meta>
+  (do meta;Monad<Meta>
     [expected meta;expected-type
      _ (&;with-type-env
-         (TC;check expected Unit))]
-    (wrap #la;Unit)))
+         (tc;check expected Unit))]
+    (wrap (` []))))