Deduplicate predefined libraries

Author: chengluyu

hkmc2/shared/src/test/mlscript-compile/List.mjs

@@ -4,7 +4,7 @@
 
 module Stack with ...
 
-class Cons[A](head: A, tail)
+class (::) Cons[A](head: A, tail)
 module Nil
 
 fun isEmpty(xs) = xs is Nil

hkmc2/shared/src/test/mlscript-compile/List.mls

@@ -4,6 +4,9 @@ const Str$class = class Str {
   }
   concat(a, b) {
     return a + b;
+  } 
+  string(value) {
+    return globalThis.String(value);
   }
   toString() { return "Str"; }
 }; const Str = new Str$class;

hkmc2/shared/src/test/mlscript-compile/Stack.mls

@@ -3,3 +3,4 @@ module Str with ...
 
 fun (~) concat(a, b) = a + b
 
+fun string(value) = globalThis.String(value)

hkmc2/shared/src/test/mlscript-compile/Str.mjs

@@ -1,8 +1,8 @@
-import "../../../mlscript-compile/String.mls"
+import "../../../mlscript-compile/Str.mls"
 import "../../../mlscript-compile/Option.mls"
 
 open Option
-open String
+open Str
 
 abstract class EitherOrBoth[out A, out B]: (Left[A, B] | Right[A, B] | Both[A, B])
 class Left[out A, out B](value: A) extends EitherOrBoth[A, B]
@@ -73,6 +73,6 @@ fun isBoth[A, B](eob: EitherOrBoth[A, B]): Bool =
 
 fun eobToString[A, B](eob: EitherOrBoth[A, B]): Str =
   if eob is
-    Left(left) then "Left(" ++ toString(left) ++ ")"
-    Right(right) then "Right(" ++ toString(right) ++ ")"
-    Both(left, right) then "Both(" ++ toString(left) ++ ", " ++ toString(right) ++ ")"
+    Left(left) then "Left(" ~ string(left) ~ ")"
+    Right(right) then "Right(" ~ string(right) ~ ")"
+    Both(left, right) then "Both(" ~ string(left) ~ ", " ~ string(right) ~ ")"

hkmc2/shared/src/test/mlscript-compile/Str.mls

@@ -1,10 +1,10 @@
-import "../../../mlscript-compile/List.mls"
+import "../../../mlscript-compile/Stack.mls"
 import "../../../mlscript-compile/Option.mls"
-import "../../../mlscript-compile/String.mls"
+import "../../../mlscript-compile/Str.mls"
 
-open List
+open Stack
 open Option
-open String
+open Str
 
 fun (|>) pipe(x, f) = f(x)
 
@@ -24,16 +24,16 @@ fun join(sep) =
   fun aux(acc, xs) =
     if xs is
       Nil then acc
-      Cons(x, xs') then aux(acc ++ sep ++ toString(x), xs')
+      Cons(x, xs') then aux(acc ~ sep ~ string(x), xs')
   (xs) =>
     if xs is
-      Cons(x, xs') then aux(toString(x), xs')
+      Cons(x, xs') then aux(string(x), xs')
       Nil then ""
 
 join(", ")(1 :: 2 :: 3 :: Nil)
 (1 :: 2 :: 3 :: Nil) |> join(", ")
 
-fun showList(xs) = "[" ++ join(", ")(xs) ++ "]"
+fun showList(xs) = "[" ~ join(", ")(xs) ~ "]"
 
 fun (:::) appendAll(xs, ys) =
   if xs is

hkmc2/shared/src/test/mlscript-compile/String.mjs

@@ -1,8 +1,10 @@
-import "../../../mlscript-compile/List.mls"
-import "../../../mlscript-compile/String.mls"
+import "../../../mlscript-compile/Stack.mls"
+import "../../../mlscript-compile/Str.mls"
 
-open List
-open String
+open Stack
+open Str
+
+type List[A] = Nil | Cons[A]
 
 fun (|>) pipe(x, f) = f(x)
 
@@ -21,12 +23,12 @@ fun join(sep) =
   fun aux(acc, xs) =
     if xs is
       Nil then acc
-      Cons(x, xs') then aux(acc ++ sep ++ toString(x), xs')
+      Cons(x, xs') then aux(acc ~ sep ~ string(x), xs')
   (xs) =>
     if xs is
-      Cons(x, xs') then aux(toString(x), xs')
+      Cons(x, xs') then aux(string(x), xs')
       Nil then ""
-fun showList(xs) = "[" ++ join(", ")(xs) ++ "]"
+fun showList(xs) = "[" ~ join(", ")(xs) ~ "]"
 fun foldLeft(f)(z) =
   fun aux(acc, xs) =
     if xs is
@@ -37,7 +39,7 @@ fun map(f, xs) =
   if xs is
     Nil then Nil
     Cons(x, xs') then f(x) :: map(f, xs')
-fun showListList(xs) = "[" ++ join(", ")(map(showList, xs)) ++ "]"
+fun showListList(xs) = "[" ~ join(", ")(map(showList, xs)) ~ "]"
 
 fun insertAllPositions(z) =
   fun aux(prev, acc, xs) =

hkmc2/shared/src/test/mlscript-compile/String.mls

@@ -1,7 +1,7 @@
-import "../../../mlscript-compile/List.mls"
+import "../../../mlscript-compile/Stack.mls"
 import "../../../mlscript-compile/Option.mls"
 
-open List
+open Stack
 open Option
 
 :global