offsets are probably wrong, but this should work

Author: andrew-johnson-4

Makefile

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

PRODUCTION/codegen-strict.lm

@@ -69,6 +69,10 @@ compile-expr-strict := λctx e offset used . (tail(
                      \o \s 'unlet \s lname \s '= \s (quote-s rhs) \s ': \s (quote-s(typecheck-lookup rhs)) \n
                      (expr::get-unframe e1) \t 'add \s '$ sz , \s '%rsp \n
                   ))))
+                  (set e1 (expr::set-altframe( e1 (
+                     \o \s 'altlet \s lname \s '= \s (quote-s rhs) \s ': \s (quote-s(typecheck-lookup rhs)) \n
+                     \t 'sub \s '$ sz , \s '%rsp \n
+                  ))))
                ))
                (set ctx (context::bind( (expr::get-context e1) lname
                   (typecheck-ascript( (LocalVariable offset) (typecheck-lookup rhs) ))
@@ -159,8 +163,6 @@ 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 )))
-               (local e2-size)
-               (print-s (E2Offset (expr::get-offset e2)))(print-s \n)
                (set e3 (compile-expr-strict( (expr::get-context e2) f (expr::get-offset e2) Used )))
                (match (expr::get-type e1) (
                   ()
@@ -181,19 +183,15 @@ compile-expr-strict := λctx e offset used . (tail(
                (local label-end)
                (set label-end (uuid()))
                (set e4 (expr::set-prog( e4 (
-                  (expr::get-frame e2)
-                  (expr::get-frame e3)
                   (expr::get-prog e1)
                   \t (expr::get-expr e1) \s label-true-branch \n
-                  (expr::get-frame e3)
+                  (expr::get-altframe e2)
                   (expr::get-prog e3)
-                  (expr::get-unframe e3)
                   \t 'jmp \s label-end \n
                   label-true-branch ': \n
                   (expr::get-prog e2)
+                  (expr::get-altframe e3)
                   label-end ': \n
-                  (expr::get-unframe e2)
-                  (expr::get-unframe e3)
                ))))
                (set e4 (expr::set-context( e4 (expr::get-context e3) )))
                (set e4 (expr::set-offset( e4 (expr::get-offset e3) )))

PRODUCTION/expression.lm

@@ -1,48 +1,52 @@
 
-expr::new := λ . (StrictExpr(() () () () () () () () 0));
+expr::new := λ . (StrictExpr(() () () () () () () () 0 ()));
 expr::get-type := λe . (match e (
    ()
    ((Expr(f p u t d pc off)) ())
-   ((StrictExpr(tt f u t d p e c o)) tt)
+   ((StrictExpr(tt f u t d p e c o a)) tt)
 ));
 expr::get-frame := λe . (match e (
    ()
    ((Expr(f p u t d pc off)) f)
-   ((StrictExpr(tt f u t d p e c o)) f)
+   ((StrictExpr(tt f u t d p e c o a)) f)
 ));
 expr::get-unframe := λe . (match e (
    ()
    ((Expr(f p u t d pc off)) u)
-   ((StrictExpr(tt f u t d p e c o)) u)
+   ((StrictExpr(tt f u t d p e c o a)) u)
 ));
 expr::get-text := λe . (match e (
    ()
    ((Expr(f p u t d pc off)) t)
-   ((StrictExpr(tt f u t d p e c o)) t)
+   ((StrictExpr(tt f u t d p e c o a)) t)
 ));
 expr::get-data := λe . (match e (
    ()
    ((Expr(f p u t d pc off)) d)
-   ((StrictExpr(tt f u t d p e c o)) d)
+   ((StrictExpr(tt f u t d p e c o a)) d)
 ));
 expr::get-prog := λe . (match e (
    ()
    ((Expr(f p u t d pc off)) p)
-   ((StrictExpr(tt f u t d p e c o)) p)
+   ((StrictExpr(tt f u t d p e c o a)) p)
 ));
 expr::get-expr := λe . (match e (
    ()
-   ((StrictExpr(tt f u t d p x c o)) x)
+   ((StrictExpr(tt f u t d p x c o a)) x)
 ));
 expr::get-context := λe . (match e (
    ()
    ((Expr(f p u t d pc off)) pc)
-   ((StrictExpr(tt f u t d p e c o)) c)
+   ((StrictExpr(tt f u t d p e c o a)) c)
 ));
 expr::get-offset := λe . (match e (
    ()
    ((Expr(f p u t d pc off)) off )
-   ((StrictExpr(tt f u t d p e c o)) o )
+   ((StrictExpr(tt f u t d p e c o a)) o )
+));
+expr::get-altframe := λe . (match e (
+   ()
+   ((StrictExpr(tt f u t d p e c o a)) a )
 ));
 expr::set-frame := λe x . (
    (StrictExpr(
@@ -55,6 +59,7 @@ expr::set-frame := λe x . (
       (expr::get-expr e)
       (expr::get-context e)
       (expr::get-offset e)
+      (expr::get-altframe e)
    ))
 );
 expr::set-unframe := λe x . (
@@ -68,6 +73,7 @@ expr::set-unframe := λe x . (
       (expr::get-expr e)
       (expr::get-context e)
       (expr::get-offset e)
+      (expr::get-altframe e)
    ))
 );
 expr::set-text := λe x . (
@@ -81,6 +87,7 @@ expr::set-text := λe x . (
       (expr::get-expr e)
       (expr::get-context e)
       (expr::get-offset e)
+      (expr::get-altframe e)
    ))
 );
 expr::set-data := λe x . (
@@ -94,6 +101,7 @@ expr::set-data := λe x . (
       (expr::get-expr e)
       (expr::get-context e)
       (expr::get-offset e)
+      (expr::get-altframe e)
    ))
 );
 expr::set-prog := λe x . (
@@ -107,6 +115,7 @@ expr::set-prog := λe x . (
       (expr::get-expr e)
       (expr::get-context e)
       (expr::get-offset e)
+      (expr::get-altframe e)
    ))
 );
 expr::set-expr := λe x . (
@@ -120,6 +129,7 @@ expr::set-expr := λe x . (
       x
       (expr::get-context e)
       (expr::get-offset e)
+      (expr::get-altframe e)
    ))
 );
 expr::set-context := λe x . (
@@ -133,6 +143,7 @@ expr::set-context := λe x . (
       (expr::get-expr e)
       x
       (expr::get-offset e)
+      (expr::get-altframe e)
    ))
 );
 expr::set-offset := λe x . (
@@ -146,6 +157,7 @@ expr::set-offset := λe x . (
       (expr::get-expr e)
       (expr::get-context e)
       x
+      (expr::get-altframe e)
    ))
 );
 expr::set-type := λe x . (
@@ -159,6 +171,21 @@ expr::set-type := λe x . (
       (expr::get-expr e)
       (expr::get-context e)
       (expr::get-offset e)
+      (expr::get-altframe e)
+   ))
+);
+expr::set-altframe := λe x . (
+   (StrictExpr(
+      (expr::get-type e)
+      (expr::get-frame e)
+      (expr::get-unframe e)
+      (expr::get-text e)
+      (expr::get-data e)
+      (expr::get-prog e)
+      (expr::get-expr e)
+      (expr::get-context e)
+      (expr::get-offset e)
+      x
    ))
 );
 
@@ -184,6 +211,9 @@ expr::chain := λ e1 e2 . (tail(
    (set e1 (expr::set-unframe(
       e1 ( (expr::get-unframe e1) (expr::get-unframe e2) )
    )))
+   (set e1 (expr::set-altframe(
+      e1 ( (expr::get-altframe e1) (expr::get-altframe e2) )
+   )))
    (set e1 (expr::set-offset( e1 (expr::get-offset e2) )))
    (set e1 (expr::set-context( e1 (expr::get-context e2) )))
    e1