Migrating default extensions to the new format [Part 2]

1 files changed, 12 insertions, 12 deletions

diff --git a/stdlib/source/library/lux/meta/macro/pattern.lux b/stdlib/source/library/lux/meta/macro/pattern.lux
index f4f352efc..e642b1cd3 100644
--- a/stdlib/source/library/lux/meta/macro/pattern.lux
+++ b/stdlib/source/library/lux/meta/macro/pattern.lux
@@ -21,8 +21,8 @@
     (.let [[prelude _] (symbol ._)]
       (when tokens
         (list [@ {.#Symbol ["" name]}])
-        {.#Right [lux (list (.` ("lux in-module" (., [@ {.#Text prelude}])
-                                 (., [@ {.#Symbol [prelude name]}]))))]}
+        {.#Right [lux (list (.` (.in_module# (., [@ {.#Text prelude}])
+                                             (., [@ {.#Symbol [prelude name]}]))))]}
 
         _
         {.#Left ""}))))
@@ -95,7 +95,7 @@
                    [bindings' (monad.each maybe.monad symbol_short bindings)
                     data' (monad.each maybe.monad tuple_list data)]
                    (.let [num_bindings (list.size bindings')]
-                     (if (list.every? (|>> ("lux i64 =" num_bindings))
+                     (if (list.every? (|>> (.i64_=# num_bindings))
                                       (list#each list.size data'))
                        (.let [apply (is (-> Replacement_Environment (List Code))
                                         (function (_ env) (list#each (realized_template env) templates)))]
@@ -175,19 +175,19 @@
                                   false)]
             expected ..expected_type]
            (in (list g!temp
-                     (.` ({{.#Some (., g!temp)}
+                     (.` (.when (.is# {.#Apply (., (type_code expected)) Maybe}
+                                      (.when (., g!temp)
+                                        (.,* (multiG g!temp [mlc body]))
+
+                                        (.,* (if initial_bind?
+                                               (list)
+                                               (list g!temp (.` {.#None}))))))
+                           {.#Some (., g!temp)}
                            (., g!temp)
 
                            {.#None}
                            (.when (., g!temp)
-                             (.,* next_branches))}
-                          ("lux type check" {.#Apply (., (type_code expected)) Maybe}
-                           (.when (., g!temp)
-                             (.,* (multiG g!temp [mlc body]))
-
-                             (.,* (if initial_bind?
-                                    (list)
-                                    (list g!temp (.` {.#None}))))))))))))
+                             (.,* next_branches))))))))
        
        _
        (///.failure (..wrong_syntax_error (symbol ..multi)))))))