Merge pull request #209 from andrew-johnson-4/strict-functions-complex-1

Strict functions complex 1

Author: andrew-johnson-4

BOOTSTRAP/cli.s

@@ -68639,38 +68639,6 @@ uuid_0000000000000411:
 	call __assert_eq_C___
 	mov -72(%rbp),%r12
 	mov -80(%rbp),%r13
-	push %r12
-	push %r13
-	mov -88(%rbp),%r12
-	mov -96(%rbp),%r13
-	call uuid_0000000000000003
-	mov %r12, 0(%r8)
-	mov %r13, 8(%r8)
-	pop %r13
-	pop %r12
-	push %r8
-	call uuid_0000000000000003
-	mov %r12, 0(%r8)
-	mov %r13, 8(%r8)
-	mov %r8, %r12
-	pop %r13
-	call __expr_C__C_chain_C___
-	push %r12
-	push %r13
-	mov -104(%rbp),%r12
-	mov -112(%rbp),%r13
-	call uuid_0000000000000003
-	mov %r12, 0(%r8)
-	mov %r13, 8(%r8)
-	pop %r13
-	pop %r12
-	push %r8
-	call uuid_0000000000000003
-	mov %r12, 0(%r8)
-	mov %r13, 8(%r8)
-	mov %r8, %r12
-	pop %r13
-	call __expr_C__C_chain_C___
 	mov %r12, -120(%rbp)
 	mov %r13, -128(%rbp)
 	mov $0, %r12
@@ -68787,6 +68755,22 @@ uuid_0000000000000411:
 	push %r13
 	mov -104(%rbp),%r12
 	mov -112(%rbp),%r13
+	call __expr_C__C_get_frame_C___
+	call uuid_0000000000000003
+	mov %r12, 0(%r8)
+	mov %r13, 8(%r8)
+	pop %r13
+	pop %r12
+	push %r8
+	call uuid_0000000000000003
+	mov %r12, 0(%r8)
+	mov %r13, 8(%r8)
+	mov %r8, %r12
+	pop %r13
+	push %r12
+	push %r13
+	mov -104(%rbp),%r12
+	mov -112(%rbp),%r13
 	call __expr_C__C_get_prog_C___
 	call uuid_0000000000000003
 	mov %r12, 0(%r8)
@@ -68801,6 +68785,22 @@ uuid_0000000000000411:
 	pop %r13
 	push %r12
 	push %r13
+	mov -104(%rbp),%r12
+	mov -112(%rbp),%r13
+	call __expr_C__C_get_unframe_C___
+	call uuid_0000000000000003
+	mov %r12, 0(%r8)
+	mov %r13, 8(%r8)
+	pop %r13
+	pop %r12
+	push %r8
+	call uuid_0000000000000003
+	mov %r12, 0(%r8)
+	mov %r13, 8(%r8)
+	mov %r8, %r12
+	pop %r13
+	push %r12
+	push %r13
 	mov $uuid_0000000000000008, %r12
 	mov $0, %r13
 	call uuid_0000000000000003
@@ -68923,6 +68923,22 @@ uuid_0000000000000411:
 	push %r13
 	mov -88(%rbp),%r12
 	mov -96(%rbp),%r13
+	call __expr_C__C_get_frame_C___
+	call uuid_0000000000000003
+	mov %r12, 0(%r8)
+	mov %r13, 8(%r8)
+	pop %r13
+	pop %r12
+	push %r8
+	call uuid_0000000000000003
+	mov %r12, 0(%r8)
+	mov %r13, 8(%r8)
+	mov %r8, %r12
+	pop %r13
+	push %r12
+	push %r13
+	mov -88(%rbp),%r12
+	mov -96(%rbp),%r13
 	call __expr_C__C_get_prog_C___
 	call uuid_0000000000000003
 	mov %r12, 0(%r8)
@@ -68937,6 +68953,22 @@ uuid_0000000000000411:
 	pop %r13
 	push %r12
 	push %r13
+	mov -88(%rbp),%r12
+	mov -96(%rbp),%r13
+	call __expr_C__C_get_unframe_C___
+	call uuid_0000000000000003
+	mov %r12, 0(%r8)
+	mov %r13, 8(%r8)
+	pop %r13
+	pop %r12
+	push %r8
+	call uuid_0000000000000003
+	mov %r12, 0(%r8)
+	mov %r13, 8(%r8)
+	mov %r8, %r12
+	pop %r13
+	push %r12
+	push %r13
 	mov -392(%rbp),%r12
 	mov -400(%rbp),%r13
 	call uuid_0000000000000003

Cargo.toml

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

PRODUCTION/codegen-strict.lm

@@ -101,7 +101,7 @@ compile-expr-strict := λctx e offset used . (tail(
                (set e2 (compile-expr-strict( ctx t offset Used )))
                (set e3 (compile-expr-strict( ctx f offset Used )))
                (assert-eq( 'strict-compile-expr::while::ConditionMustBeBranchConditional (expr::get-type e1) BranchConditional ))
-               (set e4 (expr::chain( (expr::chain( e1 e2 )) e3 )) )
+               (set e4 e1)
                (local label-true-branch)
                (set label-true-branch (uuid()))
                (local label-false-branch)
@@ -111,10 +111,14 @@ compile-expr-strict := λctx e offset used . (tail(
                (set e4 (expr::set-prog( e4 (
                   (expr::get-prog e1)
                   \t (expr::get-expr e1) \s label-true-branch \n
+                  (expr::get-frame e3)
                   (expr::get-prog e3)
+                  (expr::get-unframe e3)
                   \t 'jmp \s label-end \n
                   label-true-branch ': \n
+                  (expr::get-frame e2)
                   (expr::get-prog e2)
+                  (expr::get-unframe e2)
                   label-end ': \n
                ))))
                e4

STDLIB/default-stdlib.lm

@@ -18,15 +18,15 @@ print := λ(: x S). (: (tail(
          (print (.1 (as x SAtom)))
       ) (
          (if (==( (.0 x) 1u64 )) (tail(
-#            (let c SNil)
+            (let c SNil)
             (print '\[_s)
-#            (print( (as (.1 (as x SCons)) U64) ))
-#            (mov( (.1 (as x SCons)) 0u64 c ))
-#            (print c)
+            (print( (as (.1 (as x SCons)) U64) ))
+            (mov( (.1 (as x SCons)) 0u64 c ))
+            (print c)
             (print '\s_s)
-#            (print( (as (.2 (as x SCons)) U64) ))
-#            (mov( (.2 (as x SCons)) 0u64 c ))
-#            (print c)
+            (print( (as (.2 (as x SCons)) U64) ))
+            (mov( (.2 (as x SCons)) 0u64 c ))
+            (print c)
             (print '\]_s)
             ()
          )) (tail(