From 190b512a822fefbb9c66271feb189cc6ccebaf85 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Wed, 15 Nov 2017 23:22:30 -0400
Subject: - Re-named "lux/meta" to to "lux/macro".

---
 new-luxc/source/luxc/lang/analysis/structure.lux | 46 ++++++++++++------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'new-luxc/source/luxc/lang/analysis/structure.lux')

diff --git a/new-luxc/source/luxc/lang/analysis/structure.lux b/new-luxc/source/luxc/lang/analysis/structure.lux
index 70744ba5b..2292d93cf 100644
--- a/new-luxc/source/luxc/lang/analysis/structure.lux
+++ b/new-luxc/source/luxc/lang/analysis/structure.lux
@@ -9,8 +9,8 @@
              (coll [list "list/" Functor<List>]
                    [dict #+ Dict])
              text/format)
-       [meta]
-       (meta [code])
+       [macro]
+       (macro [code])
        (lang [type]
              (type ["tc" check])))
   (luxc ["&" lang]
@@ -32,8 +32,8 @@
 
 (def: #export (analyse-sum analyse tag valueC)
   (-> &;Analyser Nat Code (Meta la;Analysis))
-  (do meta;Monad<Meta>
-    [expectedT meta;expected-type]
+  (do macro;Monad<Meta>
+    [expectedT macro;expected-type]
     (&;with-stacked-errors
       (function [_] (Not-Variant-Type (format " Type: " (%type expectedT) "\n"
                                               "Value: " (%code  valueC) "\n"
@@ -115,8 +115,8 @@
 
 (def: (analyse-typed-product analyse membersC+)
   (-> &;Analyser (List Code) (Meta la;Analysis))
-  (do meta;Monad<Meta>
-    [expectedT meta;expected-type]
+  (do macro;Monad<Meta>
+    [expectedT macro;expected-type]
     (loop [expectedT expectedT
            membersC+ membersC+]
       (case [expectedT membersC+]
@@ -154,7 +154,7 @@
         ## and what was analysed.
         [tailT tailC]
         (do @
-          [g!tail (meta;gensym "tail")]
+          [g!tail (macro;gensym "tail")]
           (&;with-type tailT
             (analyse (` ("lux case" [(~@ tailC)]
                          (~ g!tail)
@@ -163,8 +163,8 @@
 
 (def: #export (analyse-product analyse membersC)
   (-> &;Analyser (List Code) (Meta la;Analysis))
-  (do meta;Monad<Meta>
-    [expectedT meta;expected-type]
+  (do macro;Monad<Meta>
+    [expectedT macro;expected-type]
     (&;with-stacked-errors
       (function [_] (Not-Tuple-Type (format " Type: " (%type expectedT) "\n"
                                             "Value: " (%code (` [(~@ membersC)])))))
@@ -234,10 +234,10 @@
 
 (def: #export (analyse-tagged-sum analyse tag valueC)
   (-> &;Analyser Ident Code (Meta la;Analysis))
-  (do meta;Monad<Meta>
-    [tag (meta;normalize tag)
-     [idx group variantT] (meta;resolve-tag tag)
-     expectedT meta;expected-type]
+  (do macro;Monad<Meta>
+    [tag (macro;normalize tag)
+     [idx group variantT] (macro;resolve-tag tag)
+     expectedT macro;expected-type]
     (case expectedT
       (#;Var _)
       (do @
@@ -256,12 +256,12 @@
 ## canonical form (with their corresponding module identified).
 (def: #export (normalize record)
   (-> (List [Code Code]) (Meta (List [Ident Code])))
-  (monad;map meta;Monad<Meta>
+  (monad;map macro;Monad<Meta>
              (function [[key val]]
                (case key
                  [_ (#;Tag key)]
-                 (do meta;Monad<Meta>
-                   [key (meta;normalize key)]
+                 (do macro;Monad<Meta>
+                   [key (macro;normalize key)]
                    (wrap [key val]))
 
                  _
@@ -277,12 +277,12 @@
   (case record
     ## empty-record = empty-tuple = unit = []
     #;Nil
-    (:: meta;Monad<Meta> wrap [(list) Unit])
+    (:: macro;Monad<Meta> wrap [(list) Unit])
 
     (#;Cons [head-k head-v] _)
-    (do meta;Monad<Meta>
-      [head-k (meta;normalize head-k)
-       [_ tag-set recordT] (meta;resolve-tag head-k)
+    (do macro;Monad<Meta>
+      [head-k (macro;normalize head-k)
+       [_ tag-set recordT] (macro;resolve-tag head-k)
        #let [size-record (list;size record)
              size-ts (list;size tag-set)]
        _ (if (n.= size-ts size-record)
@@ -296,7 +296,7 @@
        idx->val (monad;fold @
                             (function [[key val] idx->val]
                               (do @
-                                [key (meta;normalize key)]
+                                [key (macro;normalize key)]
                                 (case (dict;get key tag->idx)
                                   #;None
                                   (&;throw Tag-Does-Not-Belong-To-Record
@@ -321,10 +321,10 @@
 
 (def: #export (analyse-record analyse members)
   (-> &;Analyser (List [Code Code]) (Meta la;Analysis))
-  (do meta;Monad<Meta>
+  (do macro;Monad<Meta>
     [members (normalize members)
      [membersC recordT] (order members)
-     expectedT meta;expected-type]
+     expectedT macro;expected-type]
     (case expectedT
       (#;Var _)
       (do @
-- 
cgit v1.2.3