From eff4c59794868b89d60fdc411f9b544a270b817e Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Mon, 2 Aug 2021 20:26:21 -0400
Subject: Fixed a bug in the new compiler which allowed the same module to be
 imported more than once.

---
 stdlib/source/program/aedifex.lux              |  6 +++---
 stdlib/source/program/aedifex/command/deps.lux |  8 ++++----
 stdlib/source/program/compositor/export.lux    |  2 +-
 stdlib/source/program/scriptum.lux             | 12 ++++++------
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'stdlib/source/program')

diff --git a/stdlib/source/program/aedifex.lux b/stdlib/source/program/aedifex.lux
index 664883ab0..060f38855 100644
--- a/stdlib/source/program/aedifex.lux
+++ b/stdlib/source/program/aedifex.lux
@@ -97,9 +97,9 @@
                                     {options (Dictionary Text Address)})
   (exception.report
    ["Repository" (%.text repository)]
-   ["Options" (exception.enumerate (function (_ [name repo])
-                                     (format (%.text name) " := " (%.text repo)))
-                                   (dictionary.entries options))]))
+   ["Options" (exception.listing (function (_ [name repo])
+                                   (format (%.text name) " := " (%.text repo)))
+                                 (dictionary.entries options))]))
 
 (def: succeed!
   (IO Any)
diff --git a/stdlib/source/program/aedifex/command/deps.lux b/stdlib/source/program/aedifex/command/deps.lux
index 0238f64cd..3d26a042b 100644
--- a/stdlib/source/program/aedifex/command/deps.lux
+++ b/stdlib/source/program/aedifex/command/deps.lux
@@ -60,18 +60,18 @@
        _ (console.write_line (exception.report
                               ["Local successes" (|> local_successes
                                                      (list.sort (\ ///dependency.order <))
-                                                     (exception.enumerate ..format))]
+                                                     (exception.listing ..format))]
                               ["Local failures" (|> local_failures
                                                     (list.sort (\ ///dependency.order <))
-                                                    (exception.enumerate ..format))]
+                                                    (exception.listing ..format))]
                               ["Remote successes" (|> remote_successes
                                                       (set.of_list ///dependency.hash)
                                                       (set.difference (set.of_list ///dependency.hash local_successes))
                                                       set.to_list
                                                       (list.sort (\ ///dependency.order <))
-                                                      (exception.enumerate ..format))]
+                                                      (exception.listing ..format))]
                               ["Remote failures" (|> remote_failures
                                                      (list.sort (\ ///dependency.order <))
-                                                     (exception.enumerate ..format))])
+                                                     (exception.listing ..format))])
                              console)]
       (in resolution))))
diff --git a/stdlib/source/program/compositor/export.lux b/stdlib/source/program/compositor/export.lux
index 46cf9c8ec..239341e5d 100644
--- a/stdlib/source/program/compositor/export.lux
+++ b/stdlib/source/program/compositor/export.lux
@@ -42,7 +42,7 @@
 (def: #export (library fs sources)
   (-> (file.System Async) (List Source) (Async (Try tar.Tar)))
   (do (try.with async.monad)
-    [files (io.enumerate fs sources)]
+    [files (io.listing fs sources)]
     (|> (dictionary.entries files)
         (monad.map try.monad
                    (function (_ [path source_code])
diff --git a/stdlib/source/program/scriptum.lux b/stdlib/source/program/scriptum.lux
index da76896eb..941c55087 100644
--- a/stdlib/source/program/scriptum.lux
+++ b/stdlib/source/program/scriptum.lux
@@ -41,7 +41,7 @@
 
 (def: (parameter_type_name id)
   (-> Nat Text)
-  (case (text.nth id ..name_options)
+  (case (text.char id ..name_options)
     (#.Some char)
     (text.of_char char)
 
@@ -51,7 +51,7 @@
 
 (def: type_var_names
   (Sequence Text)
-  (|> 0 (sequence.iterate inc) (sequence\map parameter_type_name)))
+  (|> 0 (sequence.iterations inc) (sequence\map parameter_type_name)))
 
 (template [<name> <partition>]
   [(def: (<name> id)
@@ -70,7 +70,7 @@
   (-> [Text (List Text)] Nat Nat Text)
   (if (type_arg? id)
     (let [arg_id (..arg_id level id)]
-      (case (list.nth arg_id type_function_arguments)
+      (case (list.item arg_id type_function_arguments)
         (#.Some found)
         found
 
@@ -78,7 +78,7 @@
         (|> type_var_names
             (sequence.only (function (_ var_name)
                              (not (list.member? text.equivalence type_function_arguments var_name))))
-            (sequence.nth arg_id))))      
+            (sequence.item arg_id))))      
     type_func_name))
 
 (def: (level_to_args offset level)
@@ -378,7 +378,7 @@
                            ")"))))
 
     _
-    (meta.failure (exception.construct anonymous_type_definition type))))
+    (meta.failure (exception.error anonymous_type_definition type))))
 
 (def: (document_types module types)
   (-> Text (List Value) (Meta (Markdown Block)))
@@ -496,7 +496,7 @@
       [outcome (\ file.default write (\ utf8.codec encode (md.markdown documentation)) path)]
       (in (case outcome
             (#try.Failure error)
-            (debug.log! (exception.construct io_error error))
+            (debug.log! (exception.error io_error error))
 
             (#try.Success _)
             [])))))
-- 
cgit v1.2.3