From 19c589edc2c1dd77550e26d4f5cf78ec772da337 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Tue, 31 Oct 2017 22:26:13 -0400
Subject: - Migrated the format of analysis nodes from a custom data-type, to
 just Code nodes.

---
 new-luxc/source/luxc/analyser/procedure/common.lux | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'new-luxc/source/luxc/analyser/procedure/common.lux')

diff --git a/new-luxc/source/luxc/analyser/procedure/common.lux b/new-luxc/source/luxc/analyser/procedure/common.lux
index f64c537cb..0fad41958 100644
--- a/new-luxc/source/luxc/analyser/procedure/common.lux
+++ b/new-luxc/source/luxc/analyser/procedure/common.lux
@@ -7,8 +7,9 @@
              (coll [list "list/" Functor<List>]
                    [array]
                    [dict #+ Dict]))
-       [meta #+ Monad<Meta>]
-       (meta (type ["tc" check]))
+       [meta]
+       (meta [code]
+             (type ["tc" check]))
        [io])
   (luxc ["&" base]
         (lang ["la" analysis])
@@ -48,7 +49,7 @@
     (function [analyse eval args]
       (let [num-actual (list;size args)]
         (if (n.= num-expected num-actual)
-          (do Monad<Meta>
+          (do meta;Monad<Meta>
             [argsA (monad;map @
                               (function [[argT argC]]
                                 (&;with-expected-type argT
@@ -57,7 +58,7 @@
              expected meta;expected-type
              _ (&;with-type-env
                  (tc;check expected output-type))]
-            (wrap (#la;Procedure proc argsA)))
+            (wrap (la;procedure proc argsA)))
           (&;fail (wrong-arity proc num-expected num-actual)))))))
 
 (def: #export (nullary valueT proc)
@@ -95,7 +96,7 @@
       (function [[var-id varT]]
         (case args
           (^ (list opC))
-          (do Monad<Meta>
+          (do meta;Monad<Meta>
             [opA (&;with-expected-type (type (io;IO varT))
                    (analyse opC))
              outputT (&;with-type-env
@@ -103,7 +104,7 @@
              expected meta;expected-type
              _ (&;with-type-env
                  (tc;check expected outputT))]
-            (wrap (#la;Procedure proc (list opA))))
+            (wrap (la;procedure proc (list opA))))
           
           _
           (&;fail (wrong-arity proc +1 (list;size args))))))))
@@ -352,7 +353,7 @@
       (function [[var-id varT]]
         (case args
           (^ (list initC))
-          (do Monad<Meta>
+          (do meta;Monad<Meta>
             [initA (&;with-expected-type varT
                      (analyse initC))
              outputT (&;with-type-env
@@ -360,7 +361,7 @@
              expected meta;expected-type
              _ (&;with-type-env
                  (tc;check expected outputT))]
-            (wrap (#la;Procedure proc (list initA))))
+            (wrap (la;procedure proc (list initA))))
           
           _
           (&;fail (wrong-arity proc +1 (list;size args))))))))
-- 
cgit v1.2.3