revert to a working version

Author: andrew-johnson-4

Makefile

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

PRODUCTION/preprocess.lm

@@ -1,6 +1,6 @@
 
-preprocess := λ program . (tail(
-   (preprocess-typecheck program)
+preprocess := λprogram . (tail(
+   ()
    (preprocess-apply-macros program)
 ));
 
@@ -53,16 +53,7 @@ try-destructure-macro := λlhs e . (match (lhs e) (
       (if (eq( pl el )) Accept ())
    ))
    ( ( (App( (Literal :Literal:) (Variable pv) )) (Literal el)) (
-      (if (typecheck-is-constructor el)
-          ()
-          (Accept (KV( pv e )))
-      )
-   ))
-   ( ( (App( (Literal :Tag:) (Variable pv) )) (Literal el)) (
-      (if (typecheck-is-constructor el)
-          (Accept (KV( pv (typecheck-is-constructor el) )))
-          ()
-      )
+      (Accept (KV( pv e )))
    ))
    ( ( (App( (Literal :Variable:) (Variable pv) )) (Variable el)) (
       (Accept (KV( pv e )))

PRODUCTION/typecheck.lm

@@ -7,7 +7,7 @@ typecheck-global-context                 := ();
 typecheck-size                           := ();
 typecheck-fragment-types                 := ();
 
-preprocess-typecheck := λprogram . (tail(
+typecheck := λprogram . (tail(
    (local p)
    (set p program)
    (local ordered-type-exprs)
@@ -20,9 +20,6 @@ preprocess-typecheck := λprogram . (tail(
       (typecheck-infer-type-expr( (tail ordered-type-exprs) ))
       (set ordered-type-exprs (head ordered-type-exprs))
    ))
-));
-
-typecheck := λprogram . (tail(
    (set typecheck-types-have-changed True)
    (while typecheck-types-have-changed (
       (set typecheck-types-have-changed ())
@@ -768,21 +765,15 @@ typecheck-infer-expr := λctx e used . (tail(
             ))
          ) ())
       ))
-      ( (Literal True) (tail(
-         (typecheck-ascript( e (And( U8 (And( Literal Constant )) )) ))
-      )))
-      ( (Literal False) (tail(
-         (typecheck-ascript( e (And( U8 (And( Literal Constant )) )) ))
-      )))
-      ( (Literal lit) (tail(
+      ( (Literal lit) (
          (local ctype)
          (set ctype (typecheck-infer-constructor-type lit))
          (if ctype (
             (typecheck-ascript( e (And( (And( lit ctype )) Constant )) ))
          ) (
             (typecheck-ascript( e Atom ))
          ))
-      )))
+      ))
       ( (App( (App( (Variable 'set) (Variable lhs) )) rhs )) (tail(
          (typecheck-infer-expr( ctx rhs Used ))
          (typecheck-ascript( e Nil ))

STDLIB/default-rules.lm

@@ -27,7 +27,7 @@ macro ('match-pats-condition term (:Literal: l)) (
    (==( term l ))
 );
 
-macro ('match-pats-condition term (:Tag: l)) (
-   (==( (.0( term )) l ))
-);
+#macro ('match-pats-condition term (:Tag: l)) (
+#   (==( (.0( term )) l ))
+#);