From 3289b9dcf9d5d1c1e5c380e3185065c8fd32535f Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Mon, 16 Aug 2021 01:12:01 -0400
Subject: Made extension-definition macros specify their bindings the same way
 as syntax:.

---
 stdlib/source/specification/compositor/generation/case.lux      | 2 +-
 stdlib/source/specification/compositor/generation/common.lux    | 4 ++--
 stdlib/source/specification/compositor/generation/function.lux  | 2 +-
 stdlib/source/specification/compositor/generation/structure.lux | 4 ++--
 stdlib/source/specification/lux/abstract/apply.lux              | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'stdlib/source/specification')

diff --git a/stdlib/source/specification/compositor/generation/case.lux b/stdlib/source/specification/compositor/generation/case.lux
index e3b4f361b..371a89162 100644
--- a/stdlib/source/specification/compositor/generation/case.lux
+++ b/stdlib/source/specification/compositor/generation/case.lux
@@ -231,7 +231,7 @@
 (def: special_pattern_path
   Path
   ($_ synthesis.path/alt
-      (<| try.assumed
+      (<| try.trusted
           (phase.result [extension/synthesis.bundle
                          synthesis.init])
           (case.path phase/synthesis.phase
diff --git a/stdlib/source/specification/compositor/generation/common.lux b/stdlib/source/specification/compositor/generation/common.lux
index 93dd3bba5..6387b3013 100644
--- a/stdlib/source/specification/compositor/generation/common.lux
+++ b/stdlib/source/specification/compositor/generation/common.lux
@@ -187,8 +187,8 @@
            concatenatedS (#synthesis.Extension "lux text concat" (list sample_lowerS sample_upperS))
            pre_rep_once (format sample_lower sample_upper)
            post_rep_once (format sample_lower sample_alpha)
-           pre_rep_all (|> sample_lower (list.repeated sample_size) (text.join_with sample_upper))
-           post_rep_all (|> sample_lower (list.repeated sample_size) (text.join_with sample_alpha))]]
+           pre_rep_all (|> sample_lower (list.repeated sample_size) (text.interposed sample_upper))
+           post_rep_all (|> sample_lower (list.repeated sample_size) (text.interposed sample_alpha))]]
     ($_ _.and
         (_.test "Can compare texts for equality."
                 (and (|> (#synthesis.Extension "lux text =" (list sample_lowerS sample_lowerS))
diff --git a/stdlib/source/specification/compositor/generation/function.lux b/stdlib/source/specification/compositor/generation/function.lux
index f4697bd38..c3143b958 100644
--- a/stdlib/source/specification/compositor/generation/function.lux
+++ b/stdlib/source/specification/compositor/generation/function.lux
@@ -53,7 +53,7 @@
     [[arity local functionS] ..function
      partial_arity (|> r.nat (\ ! map (|>> (n.% arity) (n.max 1))))
      inputs (r.list arity r.safe_frac)
-     .let [expectation (maybe.assume (list.item (dec local) inputs))
+     .let [expectation (maybe.trusted (list.item (dec local) inputs))
            inputsS (list\map (|>> synthesis.f64) inputs)]]
     ($_ _.and
         (_.test "Can read arguments."
diff --git a/stdlib/source/specification/compositor/generation/structure.lux b/stdlib/source/specification/compositor/generation/structure.lux
index 7cd303c52..b1f0e5666 100644
--- a/stdlib/source/specification/compositor/generation/structure.lux
+++ b/stdlib/source/specification/compositor/generation/structure.lux
@@ -45,9 +45,9 @@
                 (case> (#try.Success valueT)
                        (let [valueT (:as (Array Any) valueT)]
                          (and (n.= 3 (array.size valueT))
-                              (let [tag_out (:as java/lang/Integer (maybe.assume (array.read! 0 valueT)))
+                              (let [tag_out (:as java/lang/Integer (maybe.trusted (array.read! 0 valueT)))
                                     last?_out (array.read! 1 valueT)
-                                    value_out (:as Any (maybe.assume (array.read! 2 valueT)))
+                                    value_out (:as Any (maybe.trusted (array.read! 2 valueT)))
                                     same_tag? (|> tag_out ffi.int_to_long (:as Nat) (n.= tag_in))
                                     same_flag? (case last?_out
                                                  (#.Some last?_out')
diff --git a/stdlib/source/specification/lux/abstract/apply.lux b/stdlib/source/specification/lux/abstract/apply.lux
index 9aaa00eac..71df69a83 100644
--- a/stdlib/source/specification/lux/abstract/apply.lux
+++ b/stdlib/source/specification/lux/abstract/apply.lux
@@ -53,7 +53,7 @@
     (_.test "Composition."
             ((comparison n.=)
              (_$ \apply
-                 (injection function.compose)
+                 (injection function.composite)
                  (injection increase)
                  (injection decrease)
                  (injection sample))
-- 
cgit v1.2.3