Improvements and fixes for UCS

shared/src/main/scala/mlscript/NewLexer.scala

@@ -57,7 +57,7 @@ class NewLexer(origin: Origin, raise: Diagnostic => Unit, dbg: Bool) {
     else (cur.reverseIterator.mkString, i)
 
   @tailrec final
-  def str(i: Int, escapeMode: Bool = false, cur: Ls[Char] = Nil): (Str, Int) =
+  def str(i: Int, escapeMode: Bool, cur: Ls[Char] = Nil): (Str, Int) =
     if (escapeMode)
       if (i < length)
         bytes(i) match {
@@ -106,7 +106,7 @@ class NewLexer(origin: Origin, raise: Diagnostic => Unit, dbg: Bool) {
         lex(j, ind, next(j, COMMA))
       case '"' =>
         val j = i + 1
-        val (chars, k) = str(j)
+        val (chars, k) = str(j, false)
         val k2 = if (bytes.lift(k) === Some('"')) k + 1 else {
           pe(msg"unclosed quotation mark")
           k

shared/src/main/scala/mlscript/ucs/Clause.scala

@@ -38,33 +38,33 @@ object Clause {
     override val scrutinee: Scrutinee,
     literal: SimpleTerm
   )(override val locations: Ls[Loc]) extends MatchClause {
-    override def toString(): String = s"«$scrutinee is $literal" + bindingsToString
+    override def toString: String = s"«$scrutinee is $literal" + bindingsToString
   }
 
   final case class MatchAny(override val scrutinee: Scrutinee)(override val locations: Ls[Loc]) extends MatchClause {
-    override def toString(): String = s"«$scrutinee is any" + bindingsToString
+    override def toString: String = s"«$scrutinee is any" + bindingsToString
   }
 
   final case class MatchClass(
     override val scrutinee: Scrutinee,
     className: Var,
     fields: Ls[Str -> Var]
   )(override val locations: Ls[Loc]) extends MatchClause {
-    override def toString(): String = s"«$scrutinee is $className»" + bindingsToString
+    override def toString: String = s"«$scrutinee is $className»" + bindingsToString
   }
 
   final case class MatchTuple(
     scrutinee: Scrutinee,
     arity: Int,
     fields: Ls[Str -> Var]
   )(override val locations: Ls[Loc]) extends Clause {
-    override def toString(): String = s"«$scrutinee is Tuple#$arity»" + bindingsToString
+    override def toString: String = s"«$scrutinee is Tuple#$arity»" + bindingsToString
   }
 
   final case class BooleanTest(test: Term)(
     override val locations: Ls[Loc]
   ) extends Clause {
-    override def toString(): String = s"«$test»" + bindingsToString
+    override def toString: String = s"«$test»" + bindingsToString
   }
 
   /**
@@ -73,6 +73,6 @@ object Clause {
   final case class Binding(name: Var, term: Term, isField: Bool)(
     override val locations: Ls[Loc]
   ) extends Clause {
-    override def toString(): String = s"«$name = $term»" + bindingsToString
+    override def toString: String = s"«$name = $term»" + bindingsToString
   }
 }

shared/src/main/scala/mlscript/ucs/Conjunction.scala

@@ -9,7 +9,7 @@ import scala.annotation.tailrec
   * A `Conjunction` represents a list of `Clause`s.
   */
 final case class Conjunction(clauses: Ls[Clause], trailingBindings: Ls[LetBinding]) {
-  override def toString(): String =
+  override def toString: String =
     clauses.mkString("", " and ", "") + {
       (if (trailingBindings.isEmpty) "" else " ") +
         (trailingBindings match {

shared/src/main/scala/mlscript/ucs/Desugarer.scala

@@ -765,48 +765,6 @@ class Desugarer extends TypeDefs { self: Typer =>
     }
   }(_ => s"[checkExhaustive] ${t.describe}")
 
-  // private def summarizePatterns(t: MutCaseOf)(implicit ctx: Ctx, raise: Raise): ExhaustivenessMap = traceUCS("[summarizePatterns]") {
-  //   val m = MutMap.empty[Str \/ Int, MutMap[Var, MutCase]]
-  //   def rec(t: MutCaseOf): Unit = traceUCS(s"[rec] ${t.describe}") {
-  //     t match {
-  //       case Consequent(term) => ()
-  //       case MissingCase => ()
-  //       case IfThenElse(_, whenTrue, whenFalse) =>
-  //         rec(whenTrue)
-  //         rec(whenFalse)
-  //       case Match(scrutinee, branches, default) =>
-  //         val key = getScurtineeKey(scrutinee)
-  //         val patternMap = m.getOrElseUpdate(key, MutMap.empty)
-  //         branches.foreach {
-  //           case mutCase @ MutCase.Literal(literal, consequent) =>
-  //             literal match {
-  //               case tof @ Var(n) if n === "true" || n === "false" =>
-  //                 if (!patternMap.contains(tof)) {
-  //                   patternMap += ((tof, mutCase))
-  //                 }
-  //               case _ => () // TODO: Summarize literals.
-  //             }
-  //             rec(consequent)
-  //           case mutCase @ MutCase.Constructor((className, _), consequent) =>
-  //             if (!patternMap.contains(className)) {
-  //               patternMap += ((className, mutCase))
-  //             }
-  //             rec(consequent)
-  //         }
-  //         default.foreach(rec)
-  //     }
-  //   }()
-  //   rec(t)
-  //   printlnUCS("Summarized patterns")
-  //   if (m.isEmpty)
-  //     printlnUCS("  <Empty>")
-  //   else
-  //     m.foreach { case (scrutinee, patterns) =>
-  //       printlnUCS(s"  * $scrutinee => " + patterns.keysIterator.mkString(", "))
-  //     }
-  //   Map.from(m.iterator.map { case (key, patternMap) => key -> Map.from(patternMap) })
-  // }(_ => "[summarizePatterns]")
-
   /**
     * Make a term from a mutable case tree.
     * This should be called after exhaustiveness checking.
@@ -993,17 +951,6 @@ class Desugarer extends TypeDefs { self: Typer =>
           className -> td.baseClasses.iterator.map(_.name).toList
         } |> Map.from
       Desugarer.transitiveClosure(superClassMap)
-      // ctx.tyDefs2
-      // val superClassMap = ctx.tyDefs2.iterator.map { case (className, dti) =>
-      //   className -> dti.decl.body
-      // } |> Map.from
-      // printlnUCS("• ctx.tyDefs")
-      // if (superClassMap.isEmpty)
-      //   printlnUCS("  * <Empty>")
-      // else
-      //   superClassMap.foreach { case (className, superClassNames) =>
-      //     printlnUCS(s"  * $className <- ${superClassNames.mkString(", ")}")
-      //   }
     }(_ => "[getClassHierarchy]")
 }
 

shared/src/main/scala/mlscript/ucs/LetBinding.scala

@@ -13,13 +13,13 @@ object LetBinding {
 
   object Kind {
     case object ScrutineeAlias extends Kind {
-      override def toString(): String = "scrutinee alias"
+      override def toString: String = "scrutinee alias"
     }
     case object FieldExtraction extends Kind {
-      override def toString(): String = "pattern destruction"
+      override def toString: String = "pattern destruction"
     }
     case object InterleavedLet extends Kind {
-      override def toString(): String = "interleaved let"
+      override def toString: String = "interleaved let"
     }
   }
 }

shared/src/test/diff/nu/repro_EvalNegNeg.mls

@@ -40,7 +40,6 @@ fun mk(n) = if n is
 //│   where
 //│     'E :> Add['E] | Lit | Neg['E]
 
-// TODO support this in UCS
 :stats
 TestLang.eval(mk(0))
 //│ int

shared/src/test/diff/tapl/NuSimplyTyped.mls

@@ -1,27 +1,6 @@
 :NewParser
 :NewDefs
 
-:escape
-// You can push debug messages to this magic array.
-let Array: { from: anything => { push: anything => anything, join: string => string } }
-let _Array = Array
-let logs: { push: anything => anything, join: string => string } = _Array.from([])
-let debug: anything => anything = x => logs.push(x)
-fun showDebug = logs.join("\n")
-//│ let Array: {from: anything -> {join: string -> string, push: anything -> anything}}
-//│ let _Array: {from: anything -> {join: string -> string, push: anything -> anything}}
-//│ let logs: {join: string -> string, push: anything -> anything}
-//│ let debug: anything -> anything
-//│ fun showDebug: string
-//│ Array
-//│       = <missing implementation>
-//│ _Array
-//│        = [Function: Array]
-//│ logs
-//│      = []
-//│ debug
-//│       = [Function: debug]
-
 let str = toString
 fun concat2(a, b) = concat(a)(b)
 fun concat3(a, b, c) = concat2(a, concat2(b, c))

shared/src/test/diff/tapl/NuUntyped.mls

@@ -1,27 +1,6 @@
 :NewParser
 :NewDefs
 
-:escape
-// You can push debug messages to this magic array.
-let Array: { from: anything => { push: anything => anything, join: string => string } }
-let _Array = Array
-let logs: { push: anything => anything, join: string => string } = _Array.from([])
-let debug: anything => anything = x => logs.push(x)
-fun showDebug = logs.join("\n")
-//│ let Array: {from: anything -> {join: string -> string, push: anything -> anything}}
-//│ let _Array: {from: anything -> {join: string -> string, push: anything -> anything}}
-//│ let logs: {join: string -> string, push: anything -> anything}
-//│ let debug: anything -> anything
-//│ fun showDebug: string
-//│ Array
-//│       = <missing implementation>
-//│ _Array
-//│        = [Function: Array]
-//│ logs
-//│      = []
-//│ debug
-//│       = [Function: debug]
-
 fun concat2(a, b) = concat(a)(b)
 fun concat3(a, b, c) = concat2(a, concat2(b, c))
 fun concat4(a, b, c, d) = concat2(a, concat3(b, c, d))