Merge pull request #1207 from andrew-johnson-4/lm-to-lsts-wqpefkp

Lm to lsts wqpefkp
andrew-johnson-4 · Jan 31, 2025 · a4c7711 · a4c7711
2 parents 0c1a236 + 93f95bf
commit a4c7711
Show file tree

Hide file tree

Showing 6 changed files with 21,739 additions and 22,139 deletions.
diff --git a/BOOTSTRAP/cli.c b/BOOTSTRAP/cli.c
diff --git a/SRC/index-types.lm b/SRC/index-types.lm
@@ -16,8 +16,6 @@ import SRC/index-of-tag.lm;
 import SRC/is-sized-array.lsts;
 import SRC/maybe-specialize.lm;
 
-import SRC/is-constructor.lm;
-
 import SRC/union.lm;
 import SRC/tag-of.lm;
 import SRC/has-infinite.lm;
@@ -30,7 +28,6 @@ import SRC/cons-tail.lm;
 import SRC/apply.lm;
 import SRC/apply.lsts;
 import SRC/apply-plural.lm;
-import SRC/reduce-plural.lm;
 import SRC/apply-or-cons-and-specialize.lm;
 import SRC/try-specialize.lm;
 

diff --git a/SRC/is-constructor.lm b/SRC/is-constructor.lm
diff --git a/SRC/reduce-plural.lm b/SRC/reduce-plural.lm
diff --git a/SRC/reduce-plural.lsts b/SRC/reduce-plural.lsts
@@ -0,0 +1,15 @@
+
+let reduce-plural(dpts: List<Type>): List<Type> = (
+   let pts = [] :: List<Tuple<Type,Type>>;
+   for pt in dpts { pts = cons(Tuple{denormalize-arrow(pt),pt},pts); };
+   let return = [] :: List<Type>;
+   for Tuple{try-denormal=first, try=second} in pts {
+      for Tuple{tst-denormal=first, tst=second} in pts {
+         if not(is(try-denormal,tst-denormal)) && can-unify(try-denormal.domain, tst-denormal.domain) {
+            try = TAny{};
+         }
+      };
+      if non-zero(try) { return = cons(try, return); }
+   };
+   return;
+);
diff --git a/SRC/unit-inference.lsts b/SRC/unit-inference.lsts
@@ -13,6 +13,7 @@ import SRC/tctx-substitute.lm;
 import SRC/tctx-union.lsts;
 import SRC/tctx-and.lsts;
 import SRC/tctx-bind.lsts;
+import SRC/reduce-plural.lsts;
 
 # corollaries
 import SRC/quick-prop.lsts;