Merge pull request #1140 from andrew-johnson-4/lm-to-lsts-fjo2

Lm to lsts fjo2

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lambda_mountain"
-version = "1.20.36"
+version = "1.20.37"
 authors = ["Andrew <[email protected]>"]
 license = "MIT"
 description = "Typed Macro Assembler (backed by Coq proofs-of-correctness)"

SRC/has-infinite.lm

@@ -6,10 +6,8 @@ has-infinite := λ(: base-type Type)(: tag String)(: arity U64)(: tt List<Type>)
       ()
       ( LEOF () )
       ( (LCons( p1 ts )) (
-         (if (is-parameter-flat( tag arity pi )) (
-            (if (==( base-type p1 )) (
-               (set return 1_u64)
-            ) ())
+         (if (==( base-type p1 )) (
+            (set return 1_u64)
          ) ())
          (set return (max(
             (has-infinite( base-type tag arity ts (+( pi 1_u64 )) ))

SRC/index-types.lm

@@ -11,7 +11,6 @@ import SRC/infer-expr.lm;
 import SRC/phi-transition.lsts;
 import SRC/phi-merge.lsts;
 import SRC/alias.lm;
-import SRC/is-parameter-flat.lm;
 import SRC/is-special.lm;
 import SRC/is-lone-tag.lm;
 import SRC/global-is-seen.lm;
@@ -20,7 +19,6 @@ import SRC/index-of-tag.lm;
 import SRC/size-of-class.lm;
 import SRC/is-only-child.lsts;
 import SRC/is-sized-array.lsts;
-import SRC/type-complex-fields.lm;
 import SRC/get-vararg-inner.lm;
 import SRC/maybe-specialize.lm;
 import SRC/maybe-local-variable.lm;
@@ -75,7 +73,6 @@ import SRC/typeof-var-raw.lm;
 
 import SRC/typecheck.lm;
 import SRC/specialize.lm;
-import SRC/mark-constructor-flat-parameters.lm;
 import SRC/infer-type-constructor.lm;
 import SRC/infer-global-context.lm;
 import SRC/assert-well-typed.lm;

SRC/infer-type-constructor.lm

@@ -26,7 +26,6 @@ infer-type-constructor := λ(: base-type Type)(: body AST). (: (
       ( (App( (Lit( tag _ )) args )) (
          (let atype (type-of-s-with-fields( base-type tag args 1_u64 )))
          (add-concrete-type-instance atype)
-         (mark-constructor-flat-parameters( base-type atype ))
          (if (has-forward( atype )) (
             (print 'Size\sOf\sType\sCannot\sBe\sDetermined\sDue\sTo\sForward\sReference:\s_s)
             (print tag)(print '\n_s)
@@ -43,7 +42,6 @@ infer-type-constructor := λ(: base-type Type)(: body AST). (: (
          )))
          (add-quick-prop( (t1(+( 'Tag::_s tag ))) base-type (t2( 'CaseNumber_s (t1(to-string(index-of-tag tag))) )) ))
          (add-quick-prop( (t1(+( 'Tag::_s tag ))) (t3( 'Array_s base-type TAny )) (t2( 'CaseNumber_s (t1(to-string(index-of-tag tag))) )) ))
-         (set-type-fields( base-type atype ))
          (index-fields-of-tag( tag base-type base-type atype ))
          (set global-type-context (.bind( global-type-context tag (t3( 'Arrow_s atype rtype )) body )))
       ))