need to work on stack imbalance

Author: andrew-johnson-4

Makefile

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

PRODUCTION/codegen-strict.lm

@@ -163,7 +163,7 @@ compile-expr-strict := λctx e offset used . (tail(
             ( (App( (App( (App( (Variable 'if) cond )) t )) f )) (tail(
                (set e1 (compile-expr-strict( ctx cond offset Used )))
                (set e2 (compile-expr-strict( (expr::get-context e1) t (expr::get-offset e1) Used )))
-               (set e3 (compile-expr-strict( (expr::get-context e2) f (expr::get-offset e2) Used )))
+               (set e3 (compile-expr-strict( (expr::get-context e1) f (expr::get-offset e1) Used )))
                (match (expr::get-type e1) (
                   ()
                   (BranchConditional ())
@@ -185,22 +185,19 @@ 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-altframe e2)
+                  (expr::get-frame e3)
+                  (expr::get-altframe e1)
                   (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-altframe e3)
+                  (expr::get-unframe e2)
                   label-end ': \n
                ))))
                (set e4 (expr::set-context( e4 (expr::get-context e3) )))
-               (set e4 (expr::set-offset( e4 (expr::get-offset e3) )))
-               (set e4 (expr::set-frame( e4 (
-                  (expr::get-frame e1) (expr::get-frame e2) (expr::get-frame e3)
-               ))))
-               (set e4 (expr::set-unframe( e4 (
-                  (expr::get-unframe e1) (expr::get-unframe e2) (expr::get-unframe e3)
-               ))))
+               (set e4 (expr::set-offset( e4 (expr::get-offset e1) )))
                e4
             )))
             ( (App( (Variable 'label) (Variable label-name) )) (

tests/strict/match2.lm

@@ -11,16 +11,17 @@ main := (tail(
       (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))
-   ))
+#   (match 3u64 (
+#      ()
+#      (1u64 (print 1u64))
+#      (2u64 (print 2u64))
+#      (3u64 (print 3u64))
+#   ))
 ));