- Fixed some small issues uncovered by new-luxc.

5 files changed, 16 insertions, 13 deletions

diff --git a/stdlib/source/lux.lux b/stdlib/source/lux.lux
index ebac83f40..cdfe0e313 100644
--- a/stdlib/source/lux.lux
+++ b/stdlib/source/lux.lux
@@ -1031,8 +1031,8 @@
 (macro:' #export (comment tokens)
          (#Cons [(tag$ ["lux" "doc"])
                  (text$ "## Throws away any code given to it.
-                  ## Great for commenting-out code, while retaining syntax high-lighting and formatting in your text editor.
-                  (comment 1 2 3 4)")]
+                         ## Great for commenting-out code, while retaining syntax high-lighting and formatting in your text editor.
+                         (comment 1 2 3 4)")]
                 #Nil)
          (return #Nil))
 
@@ -1309,9 +1309,9 @@
 (macro:' #export (-> tokens)
          (#Cons [(tag$ ["lux" "doc"])
                  (text$ "## Function types:
-                  (-> Int Int Int)
+                         (-> Int Int Int)
 
-                  ## This is the type of a function that takes 2 Ints and returns an Int.")]
+                         ## This is the type of a function that takes 2 Ints and returns an Int.")]
                 #Nil)
          ("lux case" (list/reverse tokens)
           {(#Cons output inputs)
@@ -1327,7 +1327,7 @@
 (macro:' #export (list xs)
          (#Cons [(tag$ ["lux" "doc"])
                  (text$ "## List-construction macro.
-                  (list 1 2 3)")]
+                         (list 1 2 3)")]
                 #Nil)
          (return (#Cons (list/fold (function'' [head tail]
                                                (form$ (#Cons (tag$ ["lux" "Cons"])
@@ -1340,8 +1340,8 @@
 (macro:' #export (list& xs)
          (#Cons [(tag$ ["lux" "doc"])
                  (text$ "## List-construction macro, with the last element being a tail-list.
-                  ## In other words, this macro prepends elements to another list.
-                  (list& 1 2 3 (list 4 5 6))")]
+                         ## In other words, this macro prepends elements to another list.
+                         (list& 1 2 3 (list 4 5 6))")]
                 #Nil)
          ("lux case" (list/reverse xs)
           {(#Cons last init)
diff --git a/stdlib/source/lux/data/coll/ordered/dict.lux b/stdlib/source/lux/data/coll/ordered/dict.lux
index b011bc366..3b19c232a 100644
--- a/stdlib/source/lux/data/coll/ordered/dict.lux
+++ b/stdlib/source/lux/data/coll/ordered/dict.lux
@@ -459,7 +459,10 @@
                                                     (#.Some fused)
                                                     (get@ #right right)))))
           ))
-      )))
+      )
+
+    _
+    (undefined)))
 
 (def: #export (remove key dict)
   (All [k v] (-> k (Dict k v) (Dict k v)))
diff --git a/stdlib/source/lux/data/text/regex.lux b/stdlib/source/lux/data/text/regex.lux
index ab85158cf..b7c2e613f 100644
--- a/stdlib/source/lux/data/text/regex.lux
+++ b/stdlib/source/lux/data/text/regex.lux
@@ -272,14 +272,14 @@
                                              [Int (List Code) (List (List Code))])
                                          (function [part [idx names steps]]
                                            (case part
-                                             (^or (#e.Error complex) (#e.Success [#Non-Capturing complex]))
+                                             (^or (#.Left complex) (#.Right [#Non-Capturing complex]))
                                              [idx
                                               names
                                               (list& (list g!temp complex
                                                            (' #let) (` [(~ g!total) (:: (~! text.Monoid<Text>) (~' compose) (~ g!total) (~ g!temp))]))
                                                      steps)]
                                              
-                                             (#e.Success [(#Capturing [?name num-captures]) scoped])
+                                             (#.Right [(#Capturing [?name num-captures]) scoped])
                                              (let [[idx! name!] (case ?name
                                                                   (#.Some _name)
                                                                   [idx (code.symbol ["" _name])]
diff --git a/stdlib/test/test/lux/data/coll/stack.lux b/stdlib/test/test/lux/data/coll/stack.lux
index 2cbd2a1ab..c5f1e598f 100644
--- a/stdlib/test/test/lux/data/coll/stack.lux
+++ b/stdlib/test/test/lux/data/coll/stack.lux
@@ -30,7 +30,7 @@
                     (#.Some _) (not (&.empty? sample))))
 
             (test "Popping empty stacks doesn't change anything.
-                But, if they're non-empty, the top of the stack is removed."
+                   But, if they're non-empty, the top of the stack is removed."
                   (let [sample' (&.pop sample)]
                     (or (n/= (&.size sample) (n/inc (&.size sample')))
                         (and (&.empty? sample) (&.empty? sample')))
diff --git a/stdlib/test/test/lux/math/logic/fuzzy.lux b/stdlib/test/test/lux/math/logic/fuzzy.lux
index 50423a973..a1c01408c 100644
--- a/stdlib/test/test/lux/math/logic/fuzzy.lux
+++ b/stdlib/test/test/lux/math/logic/fuzzy.lux
@@ -160,12 +160,12 @@
          sample (|> r.nat (:: @ map (n/% +20)))]
         ($_ seq
             (test "Values that satisfy a predicate have membership = 1.
-               Values that don't have membership = 0."
+                   Values that don't have membership = 0."
                   (B/= (d/= ~true (&.membership sample (&.from-predicate n/even?)))
                        (n/even? sample)))
 
             (test "Values that belong to a set have membership = 1.
-               Values that don't have membership = 0."
+                   Values that don't have membership = 0."
                   (B/= (d/= ~true (&.membership sample (&.from-set set-10)))
                        (set.member? set-10 sample)))
             ))))