From f77acc12df0076c65122385846caf46e75b575de Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sun, 30 Apr 2017 23:14:10 -0400
Subject: - Renamed fields of scopes.

---
 stdlib/source/lux.lux       | 26 +++++++++++++-------------
 stdlib/source/lux/macro.lux |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'stdlib/source')

diff --git a/stdlib/source/lux.lux b/stdlib/source/lux.lux
index e1244d970..1632e6eab 100644
--- a/stdlib/source/lux.lux
+++ b/stdlib/source/lux.lux
@@ -352,24 +352,24 @@
                        default-def-meta-exported))))
 
 ## (type: Scope
-##   {#name           (List Text)
-##    #inner-closures Int
-##    #locals         (Bindings Text Void)
-##    #closure        (Bindings Text Void)})
+##   {#name     (List Text)
+##    #inner    Nat
+##    #locals   (Bindings Text Void)
+##    #captured (Bindings Text Void)})
 (_lux_def Scope
   (#NamedT ["lux" "Scope"]
-           (#ProdT ## "lux;name"
+           (#ProdT ## name
             (#AppT List Text)
-            (#ProdT ## "lux;inner-closures"
-             Int
-             (#ProdT ## "lux;locals"
+            (#ProdT ## inner
+             Nat
+             (#ProdT ## locals
               (#AppT (#AppT Bindings Text) Void)
-              ## "lux;closure"
+              ## captured
               (#AppT (#AppT Bindings Text) Void)))))
   (#Cons [["lux" "tags"] (#ListA (#Cons (#TextA "name")
-                                        (#Cons (#TextA "inner-closures")
+                                        (#Cons (#TextA "inner")
                                                (#Cons (#TextA "locals")
-                                                      (#Cons (#TextA "closure")
+                                                      (#Cons (#TextA "captured")
                                                              #Nil)))))]
          default-def-meta-exported))
 
@@ -1878,7 +1878,7 @@
      #seed seed #expected  expected #cursor  cursor
      #scope-type-vars scope-type-vars}
     (_lux_case (reverse scopes)
-      (#Cons {#name (#;Cons module-name #Nil) #inner-closures _ #locals _ #closure _} _)
+      (#Cons {#name (#;Cons module-name #Nil) #inner _ #locals _ #captured _} _)
       (#Right [state module-name])
 
       _
@@ -4130,7 +4130,7 @@
     (find (: (-> Scope (Maybe Type))
              (function [env]
                (case env
-                 {#name _ #inner-closures _ #locals {#counter _ #mappings locals} #closure {#counter _ #mappings closure}}
+                 {#name _ #inner _ #locals {#counter _ #mappings locals} #captured {#counter _ #mappings closure}}
                  (try-both (find (: (-> [Text Void] (Maybe Type))
                                     (function [[bname analysis]]
                                       (let [[[type _] _] (:! (Meta [Type Cursor] Void)
diff --git a/stdlib/source/lux/macro.lux b/stdlib/source/lux/macro.lux
index 93920c67b..77902ba1a 100644
--- a/stdlib/source/lux/macro.lux
+++ b/stdlib/source/lux/macro.lux
@@ -431,13 +431,13 @@
                              (or (any? test (:! (List [Text (Meta [Type Cursor] Void)])
                                                 (get@ [#;locals #;mappings] env)))
                                  (any? test (:! (List [Text (Meta [Type Cursor] Void)])
-                                                (get@ [#;closure #;mappings] env)))))
+                                                (get@ [#;captured #;mappings] env)))))
                            (get@ #;scopes state))
                [_ [[type _] _]] (try-both (find test)
                                           (:! (List [Text (Meta [Type Cursor] Void)])
                                               (get@ [#;locals #;mappings] scope))
                                           (:! (List [Text (Meta [Type Cursor] Void)])
-                                              (get@ [#;closure #;mappings] scope)))]
+                                              (get@ [#;captured #;mappings] scope)))]
               (wrap type))
         (#;Some var-type)
         (#;Right [state var-type])
-- 
cgit v1.2.3