Added a new custom type for pattern-matching macros.

1 files changed, 25 insertions, 22 deletions

diff --git a/stdlib/source/library/lux/math/number/nat.lux b/stdlib/source/library/lux/math/number/nat.lux
index 5f63ffb78..75bf0fe2b 100644
--- a/stdlib/source/library/lux/math/number/nat.lux
+++ b/stdlib/source/library/lux/math/number/nat.lux
@@ -191,8 +191,8 @@
 (def (binary_value digit)
   (-> Nat (Maybe Nat))
   (case digit
-    (pattern (char "0")) {.#Some 0}
-    (pattern (char "1")) {.#Some 1}
+    (char "0") {.#Some 0}
+    (char "1") {.#Some 1}
     _ {.#None}))
 
 (def (octal_character value)
@@ -211,14 +211,14 @@
 (def (octal_value digit)
   (-> Nat (Maybe Nat))
   (case digit
-    (pattern (char "0")) {.#Some 0}
-    (pattern (char "1")) {.#Some 1}
-    (pattern (char "2")) {.#Some 2}
-    (pattern (char "3")) {.#Some 3}
-    (pattern (char "4")) {.#Some 4}
-    (pattern (char "5")) {.#Some 5}
-    (pattern (char "6")) {.#Some 6}
-    (pattern (char "7")) {.#Some 7}
+    (char "0") {.#Some 0}
+    (char "1") {.#Some 1}
+    (char "2") {.#Some 2}
+    (char "3") {.#Some 3}
+    (char "4") {.#Some 4}
+    (char "5") {.#Some 5}
+    (char "6") {.#Some 6}
+    (char "7") {.#Some 7}
     _ {.#None}))
 
 (def (decimal_character value)
@@ -239,16 +239,16 @@
 (def (decimal_value digit)
   (-> Nat (Maybe Nat))
   (case digit
-    (pattern (char "0")) {.#Some 0}
-    (pattern (char "1")) {.#Some 1}
-    (pattern (char "2")) {.#Some 2}
-    (pattern (char "3")) {.#Some 3}
-    (pattern (char "4")) {.#Some 4}
-    (pattern (char "5")) {.#Some 5}
-    (pattern (char "6")) {.#Some 6}
-    (pattern (char "7")) {.#Some 7}
-    (pattern (char "8")) {.#Some 8}
-    (pattern (char "9")) {.#Some 9}
+    (char "0") {.#Some 0}
+    (char "1") {.#Some 1}
+    (char "2") {.#Some 2}
+    (char "3") {.#Some 3}
+    (char "4") {.#Some 4}
+    (char "5") {.#Some 5}
+    (char "6") {.#Some 6}
+    (char "7") {.#Some 7}
+    (char "8") {.#Some 8}
+    (char "9") {.#Some 9}
     _ {.#None}))
 
 (def (hexadecimal_character value)
@@ -276,12 +276,15 @@
   (-> Nat (Maybe Nat))
   (case digit
     (^.with_template [<character> <number>]
-      [(pattern (char <character>)) {.#Some <number>}])
+      [(char <character>)
+       {.#Some <number>}])
     (["0" 0] ["1" 1] ["2" 2] ["3" 3] ["4" 4]
      ["5" 5] ["6" 6] ["7" 7] ["8" 8] ["9" 9])
 
     (^.with_template [<lower> <upper> <number>]
-      [(^.or (pattern (char <lower>)) (pattern (char <upper>))) {.#Some <number>}])
+      [(^.or (char <lower>)
+             (char <upper>))
+       {.#Some <number>}])
     (["a" "A" 10] ["b" "B" 11] ["c" "C" 12]
      ["d" "D" 13] ["e" "E" 14] ["f" "F" 15])
     _ {.#None}))