Merge remote-tracking branch 'luyu-fork/pattern-improvements' into pattern-improvements

Author: Florent Ferrari

hkmc2/shared/src/main/scala/hkmc2/semantics/ucs/Desugarer.scala

@@ -90,16 +90,10 @@ class Desugarer(val elaborator: Elaborator)
     def ++(fallback: Split): Split =
       if fallback == Split.End then
         split
-      else if split.isFull then
-        raise:
-          ErrorReport:
-            msg"The following branches are unreachable." -> fallback.toLoc ::
-            msg"Because the previous split is full." -> split.toLoc :: Nil
-        split
       else (split match
         case Split.Cons(head, tail) => Split.Cons(head, tail ++ fallback)
         case Split.Let(name, term, tail) => Split.Let(name, term, tail ++ fallback)
-        case Split.Else(_) /* impossible */ | Split.End => fallback)
+        case Split.Else(_) | Split.End => fallback)
 
   private val subScrutineeMap = HashMap.empty[BlockLocalSymbol, ScrutineeData]
   private val fieldScrutineeMap = HashMap.empty[BlockLocalSymbol, ScrutineeData]
@@ -466,9 +460,7 @@ class Desugarer(val elaborator: Elaborator)
         if pat.patternParams.size > 0 then
           error(
             msg"Pattern `${pat.nme}` expects ${"pattern argument".pluralize(pat.patternParams.size, true)}" ->
-              pat.patternParams.foldLeft[Opt[Loc]](N):
-              case (N, param) => param.sym.toLoc
-              case (S(loc), param) => S(loc ++ param.sym.toLoc),
+              Loc(pat.patternParams.iterator.map(_.sym)),
             msg"But no arguments were given" -> ctor.toLoc)
           fallback
         else
@@ -515,12 +507,8 @@ class Desugarer(val elaborator: Elaborator)
         if pat.patternParams.size != patArgs.size then
           error(
             msg"Pattern `${pat.nme}` expects ${"pattern argument".pluralize(pat.patternParams.size, true)}" ->
-              pat.patternParams.foldLeft[Opt[Loc]](N):
-              case (N, param) => param.sym.toLoc
-              case (S(loc), param) => S(loc ++ param.sym.toLoc),
-            msg"But ${"pattern argument".pluralize(patArgs.size, true)} were given" -> args.foldLeft[Opt[Loc]](N):
-              case (N, arg) => arg.toLoc
-              case (S(loc), arg) => S(loc ++ arg.toLoc))
+              Loc(pat.patternParams.iterator.map(_.sym)),
+            msg"But ${"pattern argument".pluralize(patArgs.size, true)} were given" -> Loc(args))
           fallback
         else
           Branch(ref, Pattern.Synonym(pat, patArgs.zip(args)), sequel(ctx)) ~: fallback

hkmc2/shared/src/test/mlscript/ucs/patterns/ConjunctionPattern.mls

@@ -15,27 +15,22 @@ if A is
     else 3
 //│ = 2
 
+:e
 if A is
     A & A & B then 0
     B & A & B then 1
     A & A & A then 2
     else 3
 //│ = 2
+//│ FAILURE: Unexpected lack of type error
 
 :sjs
-:todo
-if A is
-    A & y then y
+fun foo(v) =
+  if v is
+    A & B then 1
     else 0
-//│ ╔══[ERROR] The following branches are unreachable.
-//│ ║  l.29: 	    else 0
-//│ ║        	         ^
-//│ ╟── Because the previous split is full.
-//│ ║  l.28: 	    A & y then y
-//│ ╙──      	               ^
 //│ JS (unsanitized):
-//│ let scrut2, y; scrut2 = A1; if (scrut2 instanceof A1.class) { y = scrut2; y } else { 0 }
-//│ = A
+//│ let foo; foo = function foo(v) { if (v instanceof A1.class) { return 0 } else { return 0 } };
 
 fun range(i, j) =
     if i > j then Nil
@@ -65,18 +60,18 @@ fun foo(x) = if x is
         else 30
     else 40
 //│ ╔══[ERROR] The following branches are unreachable.
-//│ ║  l.66: 	    else 40
+//│ ║  l.61: 	    else 40
 //│ ║        	         ^^
 //│ ╟── Because the previous split is full.
-//│ ║  l.62: 	    {a:_ & a} & C and
+//│ ║  l.57: 	    {a:_ & a} & C and
 //│ ║        	                ^^^^^
-//│ ║  l.63: 	        a is 1 then 10
+//│ ║  l.58: 	        a is 1 then 10
 //│ ║        	^^^^^^^^^^^^^^^^^^^^^^
-//│ ║  l.64: 	        a is 2 then 20
+//│ ║  l.59: 	        a is 2 then 20
 //│ ║        	^^^^^^^^^^^^^^^^^^^^^^
-//│ ║  l.65: 	        else 30
+//│ ║  l.60: 	        else 30
 //│ ║        	^^^^^^^^^^^^^^^
-//│ ║  l.66: 	    else 40
+//│ ║  l.61: 	    else 40
 //│ ╙──      	^^^^^^^^^^^
 
 foo(C(1))