match literal works

Author: andrew-johnson-4

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lambda_mountain"
-version = "1.11.79"
+version = "1.11.80"
 authors = ["Andrew <andrew@subarctic.org>"]
 license = "MIT"
 description = "Lambda Mountain"

Makefile

@@ -1,6 +1,6 @@
 
 nostd: prod
-	./production --nostd -o tmp.s tests/strict/match1.lm
+	./production --nostd -o tmp.s tests/strict/match2.lm
 	as -o tmp.o tmp.s
 	ld -o tmp tmp.o
 	./tmp && echo $?

STDLIB/default-primitives.lm

@@ -183,6 +183,12 @@ fragment == := λ(: l U64+GlobalVariable)(: r U64+Literal+Constant). (: (
    ))
    (.expression( 'je ))
 ) BranchConditional);
+fragment == := λ(: l U64+LocalVariable)(: r U64+Literal+Constant). (: (
+   (.program (
+      \t 'cmp \s '$ (.expression r) , (.expression l) \[ '%rbp \] \n
+   ))
+   (.expression( 'je ))
+) BranchConditional);
 fragment == := λ(: l U64+Literal+Constant)(: r U64+GlobalVariable). (: (
    (.program (
       \t 'mov \s '$ (.expression r) , '%r15 \n

STDLIB/default-rules.lm

@@ -23,48 +23,7 @@ macro ('match-pats-condition term (:Variable: v)) (
    (tail( (let v term) (branchtrue()) ))
 );
 
-#macro ('match-pats( term matched return (ps (lhs rhs)) )) (
-#   (match-pats( term matched return ps ))
-#   (if matched () (
-#      (set matched True)
-#      (match-destructure( term matched return lhs ))
-#      (if matched (
-#         (set return rhs)
-#      ) ())
-#   ))
-#);
-#macro ('match-destructure( term matched return () )) (
-#   (if matched (
-#      (if term (
-#         (set matched ())
-#      ) ())
-#   ) ())
-#);
-#macro ('match-destructure( term matched return (:Literal: l) )) (
-#   (if matched (
-#      (if (is-atom term) (
-#         (if (eq( term l )) () (
-#            (set matched ())
-#         ))
-#      ) (
-#         (set matched ())
-#      ))
-#   ) ())
-#);
-#macro ('match-destructure( term matched return (:Variable: v) )) (
-#   (let v term)
-#);
-#macro ('match-destructure( term matched return (l r) )) (
-#   (if matched (
-#      (if (is-cons term) (
-#         (let (uuid x) term)
-#         (set term (head (uuid x)))
-#         (match-destructure( term matched return l ))
-#         (set term (tail (uuid x)))
-#         (match-destructure( term matched return r ))
-#         (set term (uuid x))
-#      ) (
-#         (set matched ())
-#      ))
-#   ) ())
-#);
+macro ('match-pats-condition term (:Literal: l)) (
+   (==( term l ))
+);
+

tests/strict/match2.lm

@@ -0,0 +1,26 @@
+
+import STDLIB/default-instruction-set.lm;
+import STDLIB/default-primitives.lm;
+import STDLIB/default-rules.lm;
+import STDLIB/default-stdlib.lm;
+
+main := (tail(
+   (match 1u64 (
+      ()
+      (1u64 (print 1u64))
+      (2u64 (print 2u64))
+      (3u64 (print 3u64))
+   ))
+   (match 2u64 (
+      ()
+      (1u64 (print 1u64))
+      (2u64 (print 2u64))
+      (3u64 (print 3u64))
+   ))
+   (match 3u64 (
+      ()
+      (1u64 (print 1u64))
+      (2u64 (print 2u64))
+      (3u64 (print 3u64))
+   ))
+));

tests/strict/match2.lm.out

@@ -0,0 +1 @@
+123