Merge pull request #215 from andrew-johnson-4/strict-compiler-dev-2-2

Strict compiler dev 2 2

Author: andrew-johnson-4

Cargo.toml

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

STDLIB/default-primitives.lm

@@ -82,6 +82,13 @@ fragment < := λ(: l LocalVariable+U64)(: r GlobalVariable+U64). (: (
    (.expression( 'jb ))
 ) BranchConditional);
 
+fragment branchtrue := λ(: _ Nil). (: (
+   (.expression( 'jmp ))
+) BranchConditional);
+fragment branchfalse := λ(: _ Nil). (: (
+   (.expression( 'nop ))
+) BranchConditional);
+
 fragment + := λ(: l LocalVariable+U8)(: r LocalVariable+U8). (: (
    (.program(
       \t 'mov \s (.expression l) \[ '%rbp \] , \s '%al \n

STDLIB/default-rules.lm

@@ -7,11 +7,22 @@ macro ('match t ps) (tail(
    (match-pats( (uuid term) ps (fail PatternMatchFailure_s) ))
 ));
 
-macro ('match-pats( term ps remainder )) (
+macro ('match-pats( term () remainder )) (
    remainder
 );
 
-#macro ('match-pats( term matched return () )) ();
+macro ('match-pats( term (ps (lhs rhs)) remainder )) (
+   (match-pats(
+      term
+      ps
+      (if (match-pats-condition lhs) rhs remainder)
+   ))
+);
+
+macro ('match-pats-condition any) (
+   (branchtrue())
+);
+
 #macro ('match-pats( term matched return (ps (lhs rhs)) )) (
 #   (match-pats( term matched return ps ))
 #   (if matched () (