From e00ba096c8837abe85d366e0c1293c09dbe84d81 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Wed, 18 Aug 2021 03:29:15 -0400
Subject: Some bug fixes.

---
 stdlib/source/specification/compositor/common.lux               | 6 +++---
 stdlib/source/specification/compositor/generation/case.lux      | 8 ++++----
 stdlib/source/specification/compositor/generation/function.lux  | 6 +++---
 stdlib/source/specification/compositor/generation/structure.lux | 4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'stdlib/source/specification/compositor')

diff --git a/stdlib/source/specification/compositor/common.lux b/stdlib/source/specification/compositor/common.lux
index 3a7f70731..f663de359 100644
--- a/stdlib/source/specification/compositor/common.lux
+++ b/stdlib/source/specification/compositor/common.lux
@@ -73,9 +73,9 @@
     [?state (platform.initialize target expander analysis_bundle platform generation_bundle directive_bundle program extender)]
     (in (do try.monad
           [[directive_bundle directive_state] ?state
-           .let [generation_state (get@ [#directive.generation
-                                         #directive.state]
-                                        directive_state)]]
+           .let [generation_state (value@ [#directive.generation
+                                           #directive.state]
+                                          directive_state)]]
           (in [[directive_bundle directive_state]
                (..runner platform generation_state)
                (..definer platform generation_state)])))))
diff --git a/stdlib/source/specification/compositor/generation/case.lux b/stdlib/source/specification/compositor/generation/case.lux
index 371a89162..8508220ed 100644
--- a/stdlib/source/specification/compositor/generation/case.lux
+++ b/stdlib/source/specification/compositor/generation/case.lux
@@ -36,7 +36,7 @@
 
 (def: (tail? size idx)
   (-> Nat Nat Bit)
-  (n.= (dec size) idx))
+  (n.= (-- size) idx))
 
 (def: .public (verify expected)
   (-> Frac (Try Any) Bit)
@@ -70,9 +70,9 @@
                  [subS subP] case
                  .let [unitS (synthesis.text synthesis.unit)
                        caseS (synthesis.tuple
-                              (list.joined (list (list.repeated idx unitS)
-                                                 (list subS)
-                                                 (list.repeated (|> size dec (n.- idx)) unitS))))
+                              (list.together (list (list.repeated idx unitS)
+                                                   (list subS)
+                                                   (list.repeated (|> size -- (n.- idx)) unitS))))
                        caseP ($_ synthesis.path/seq
                                  (if (tail? size idx)
                                    (synthesis.member/right idx)
diff --git a/stdlib/source/specification/compositor/generation/function.lux b/stdlib/source/specification/compositor/generation/function.lux
index c3143b958..8a090094f 100644
--- a/stdlib/source/specification/compositor/generation/function.lux
+++ b/stdlib/source/specification/compositor/generation/function.lux
@@ -34,7 +34,7 @@
 
 (def: (local arity)
   (-> Arity (Random Register))
-  (|> r.nat (r\map (|>> (n.% arity) inc))))
+  (|> r.nat (r\map (|>> (n.% arity) ++))))
 
 (def: function
   (Random [Arity Register Synthesis])
@@ -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.trusted (list.item (dec local) inputs))
+     .let [expectation (maybe.trusted (list.item (-- local) inputs))
            inputsS (list\map (|>> synthesis.f64) inputs)]]
     ($_ _.and
         (_.test "Can read arguments."
@@ -77,7 +77,7 @@
                                           (enum.range n.enum 1)
                                           (list\map (|>> #reference.Local)))
                           variableS (if (n.<= partial_arity local)
-                                      (synthesis.variable/foreign (dec local))
+                                      (synthesis.variable/foreign (-- local))
                                       (synthesis.variable/local (|> local (n.- partial_arity))))
                           inner_arity (n.- partial_arity arity)
                           innerS (synthesis.function/abstraction
diff --git a/stdlib/source/specification/compositor/generation/structure.lux b/stdlib/source/specification/compositor/generation/structure.lux
index b1f0e5666..de61ed882 100644
--- a/stdlib/source/specification/compositor/generation/structure.lux
+++ b/stdlib/source/specification/compositor/generation/structure.lux
@@ -33,11 +33,11 @@
   (do {! r.monad}
     [num_tags (|> r.nat (\ ! map (|>> (n.% 10) (n.max 2))))
      tag_in (|> r.nat (\ ! map (n.% num_tags)))
-     .let [last?_in (|> num_tags dec (n.= tag_in))]
+     .let [last?_in (|> num_tags -- (n.= tag_in))]
      value_in r.i64]
     (_.test (%.name (name_of synthesis.variant))
             (|> (synthesis.variant {#analysis.lefts (if last?_in
-                                                      (dec tag_in)
+                                                      (-- tag_in)
                                                       tag_in)
                                     #analysis.right? last?_in
                                     #analysis.value (synthesis.i64 value_in)})
-- 
cgit v1.2.3