From a62ce3f9c2b605e0033f4772b0f64c4525de4d86 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Wed, 11 Aug 2021 02:38:59 -0400
Subject: Relocated maybe and lazy from data to control.

---
 stdlib/source/program/scriptum.lux | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'stdlib/source/program/scriptum.lux')

diff --git a/stdlib/source/program/scriptum.lux b/stdlib/source/program/scriptum.lux
index b18ce7bff..9128fdc60 100644
--- a/stdlib/source/program/scriptum.lux
+++ b/stdlib/source/program/scriptum.lux
@@ -9,12 +9,12 @@
      ["." enum]]
     [control
      [pipe (#+ when> new>)]
+     ["." maybe]
      ["." try (#+ Try)]
      ["." exception (#+ exception:)]
      ["." io (#+ IO io)]
      ["." function]]
     [data
-     ["." maybe]
      ["." product]
      [format
       ["md" markdown (#+ Markdown Span Block)]]
@@ -214,20 +214,20 @@
       (format "(primitive " (%.text name) ")")
 
       _
-      (format "(primitive " (%.text name) " " (|> params (list\map (pprint_type level type_func_name module)) (list.interpose " ") (text.join_with "")) ")"))
+      (format "(primitive " (%.text name) " " (|> params (list\map (pprint_type level type_func_name module)) (list.interposed " ") (text.join_with "")) ")"))
 
     (#.Sum _)
     (let [members (type.flat_variant type)]
-      (format "(Or " (|> members (list\map (pprint_type level type_func_name module)) (list.interpose " ") (text.join_with "")) ")"))
+      (format "(Or " (|> members (list\map (pprint_type level type_func_name module)) (list.interposed " ") (text.join_with "")) ")"))
 
     (#.Product _)
     (let [members (type.flat_tuple type)]
-      (format "[" (|> members (list\map (pprint_type level type_func_name module)) (list.interpose " ") (text.join_with "")) "]"))
+      (format "[" (|> members (list\map (pprint_type level type_func_name module)) (list.interposed " ") (text.join_with "")) "]"))
 
     (#.Function input output)
     (let [[ins out] (type.flat_function type)]
       (format  "(-> "
-               (|> ins (list\map (pprint_type level type_func_name module)) (list.interpose " ") (text.join_with ""))
+               (|> ins (list\map (pprint_type level type_func_name module)) (list.interposed " ") (text.join_with ""))
                " "
                (pprint_type level type_func_name module out)
                ")"))
@@ -246,7 +246,7 @@
        (let [[level' body] (<flat> type)
              args (level_parameters level level')
              body_doc (pprint_type (n.+ level level') type_func_name module body)]
-         (format "(" <name> " " "[" (|> args (list.interpose " ") (text.join_with "")) "]"
+         (format "(" <name> " " "[" (|> args (list.interposed " ") (text.join_with "")) "]"
                  (format " " body_doc)
                  ")"))])
     ([#.UnivQ "All" type.flat_univ_q]
@@ -254,7 +254,7 @@
 
     (#.Apply param fun)
     (let [[type_func type_arguments] (type.flat_application type)]
-      (format  "(" (pprint_type level type_func_name module type_func) " " (|> type_arguments (list\map (pprint_type level type_func_name module)) (list.interpose " ") (text.join_with "")) ")"))
+      (format  "(" (pprint_type level type_func_name module type_func) " " (|> type_arguments (list\map (pprint_type level type_func_name module)) (list.interposed " ") (text.join_with "")) ")"))
 
     (#.Named [_module _name] type)
     (if (text\= module _module)
@@ -319,10 +319,10 @@
               #implementations (list)
               #values (list)}]
     (|> (list\fold add_definition init defs)
-        (update@ #types (list.sort name_sort))
-        (update@ #macros (list.sort name_sort))
-        (update@ #implementations (list.sort name_sort))
-        (update@ #values (list.sort name_sort)))))
+        (update@ #types (list.sorted name_sort))
+        (update@ #macros (list.sorted name_sort))
+        (update@ #implementations (list.sorted name_sort))
+        (update@ #values (list.sorted name_sort)))))
 
 (def: (unravel_type_func level type)
   (-> Nat Type Type)
@@ -506,13 +506,13 @@
     [all_modules meta.modules
      .let [lux_modules (|> all_modules
                            (list.only (function.compose lux_module? product.left))
-                           (list.sort name_sort))]
+                           (list.sorted name_sort))]
      lux_exports (monad.map ! (function.compose meta.exports product.left)
                             lux_modules)
      module_documentation (|> (list\map organize_definitions lux_exports)
                               (list.zipped/2 lux_modules)
                               (monad.map ! document_module))
-     .let [_ (io.run (monad.map io.monad save_documentation! module_documentation))]]
+     .let [_ (io.run! (monad.map io.monad save_documentation! module_documentation))]]
     (in (list))))
 
 (gen_documentation!)
-- 
cgit v1.2.3