revert part of "misc: sync with upstream"

Author: waterlens

hkmc2/shared/src/test/mlscript/basics/BadModuleUses.mls

@@ -16,7 +16,7 @@ module Example with
 :e
 let m = Example.foo()
 //│ ╔══[ERROR] Unexpected moduleful application.
-//│ ║  l.16: 	let m = Example.foo()
+//│ ║  l.17: 	let m = Example.foo()
 //│ ╙──      	        ^^^^^^^^^^^^^
 //│ m = M
 
@@ -32,7 +32,7 @@ Example.foo()
 :e
 id(Example.foo())
 //│ ╔══[ERROR] Unexpected moduleful application.
-//│ ║  l.30: 	id(Example.foo())
+//│ ║  l.33: 	id(Example.foo())
 //│ ║        	   ^^^^^^^^^^^^^
 //│ ╙── Module argument passed to a non-module parameter.
 //│ = M
@@ -43,29 +43,29 @@ Example.foo().mtd()
 :e
 Example.foo() + 1
 //│ ╔══[ERROR] Unexpected moduleful application.
-//│ ║  l.40: 	Example.foo() + 1
+//│ ║  l.44: 	Example.foo() + 1
 //│ ╙──      	^^^^^^^^^^^^^
 //│ = "M1"
 
 :e
 M + 1
 //│ ╔══[ERROR] Unexpected moduleful reference.
-//│ ║  l.45: 	M + 1
+//│ ║  l.51: 	M + 1
 //│ ╙──      	^
 //│ = "M1"
 
 :e
 M |> id
 //│ ╔══[ERROR] Unexpected moduleful reference.
-//│ ║  l.50: 	M |> id
+//│ ║  l.58: 	M |> id
 //│ ║        	^
 //│ ╙── Module argument passed to a non-module parameter.
 //│ = M
 
 :e
 id <| M
 //│ ╔══[ERROR] Unexpected moduleful reference.
-//│ ║  l.57: 	id <| M
+//│ ║  l.66: 	id <| M
 //│ ║        	      ^
 //│ ╙── Module argument passed to a non-module parameter.
 //│ = M
@@ -75,15 +75,15 @@ fun (+) lol(a, b) = [a, b]
 :e
 M + 1
 //│ ╔══[ERROR] Unexpected moduleful reference.
-//│ ║  l.66: 	M + 1
+//│ ║  l.76: 	M + 1
 //│ ║        	^
 //│ ╙── Module argument passed to a non-module parameter.
 //│ = [M, 1]
 
 :e
 let m = M
 //│ ╔══[ERROR] Unexpected moduleful reference.
-//│ ║  l.73: 	let m = M
+//│ ║  l.84: 	let m = M
 //│ ╙──      	        ^
 //│ m = M
 
@@ -95,7 +95,7 @@ module B with
   val a: module A = A
 print(B.a)
 //│ ╔══[ERROR] Unexpected moduleful selection.
-//│ ║  l.83: 	print(B.a)
+//│ ║  l.96: 	print(B.a)
 //│ ╙──      	      ^^^
 //│ > A
 

hkmc2/shared/src/test/mlscript/basics/MiscArrayTests.mls

@@ -65,15 +65,15 @@ xs
 //│         rhs = Tup of Ls of 
 //│           Ident of "f"
 //│ ╔══[ERROR] Expected 2 arguments, got 1
-//│ ║  l.53: 	  . map(f)
+//│ ║  l.56: 	  . map(f)
 //│ ╙──      	    ^^^
 //│ ═══[RUNTIME ERROR] Error: Function 'map' expected 2 arguments but got 1
 
 :fixme
 xs
   . map(x => x * 2)
 //│ ╔══[ERROR] Expected 2 arguments, got 1
-//│ ║  l.68: 	  . map(x => x * 2)
+//│ ║  l.74: 	  . map(x => x * 2)
 //│ ╙──      	    ^^^
 //│ ═══[RUNTIME ERROR] Error: Function 'map' expected 2 arguments but got 1
 
@@ -82,7 +82,7 @@ xs
   . map(x => x * 2)
   . print()
 //│ ╔══[ERROR] Expected 2 arguments, got 1
-//│ ║  l.73: 	  . map(x => x * 2)
+//│ ║  l.82: 	  . map(x => x * 2)
 //│ ╙──      	    ^^^
 //│ ═══[RUNTIME ERROR] Error: Function 'map' expected 2 arguments but got 1
 

hkmc2/shared/src/test/mlscript/basics/ModuleMethods.mls

@@ -17,7 +17,7 @@ fun f(m)
 :e
 f(M)
 //│ ╔══[ERROR] Unexpected moduleful reference.
-//│ ║  l.15: 	f(M)
+//│ ║  l.18: 	f(M)
 //│ ║        	  ^
 //│ ╙── Module argument passed to a non-module parameter.
 
@@ -26,7 +26,7 @@ f(42)
 :e
 fun f(module m)
 //│ ╔══[ERROR] Module parameter must have explicit type.
-//│ ║  l.23: 	fun f(module m)
+//│ ║  l.27: 	fun f(module m)
 //│ ╙──      	             ^
 
 fun f(module m: M)
@@ -38,7 +38,7 @@ f(M)
 :e
 fun f[T](module m: T)
 //│ ╔══[ERROR] Expected a module, found non-moduleful reference.
-//│ ║  l.35: 	fun f[T](module m: T)
+//│ ║  l.39: 	fun f[T](module m: T)
 //│ ║        	                   ^
 //│ ╙── Module parameter must have a module type.
 
@@ -61,18 +61,18 @@ fun assertNonMM[T](m)
 :e
 fun f() = M
 //│ ╔══[ERROR] Unexpected moduleful reference.
-//│ ║  l.57: 	fun f() = M
+//│ ║  l.62: 	fun f() = M
 //│ ║        	          ^
 //│ ╙── Function must be marked as returning a 'module' in order to return a module.
 
 :e
 fun f(): M = M
 //│ ╔══[ERROR] Unexpected moduleful reference.
-//│ ║  l.63: 	fun f(): M = M
+//│ ║  l.69: 	fun f(): M = M
 //│ ║        	         ^
 //│ ╙── Function must be marked as returning a 'module' in order to have a module return type.
 //│ ╔══[ERROR] Unexpected moduleful reference.
-//│ ║  l.63: 	fun f(): M = M
+//│ ║  l.69: 	fun f(): M = M
 //│ ║        	             ^
 //│ ╙── Function must be marked as returning a 'module' in order to return a module.
 
@@ -81,7 +81,7 @@ fun f(): module M = M
 :e
 assertNonM(f())
 //│ ╔══[ERROR] Unexpected moduleful application.
-//│ ║  l.76: 	assertNonM(f())
+//│ ║  l.82: 	assertNonM(f())
 //│ ║        	           ^^^
 //│ ╙── Module argument passed to a non-module parameter.
 
@@ -90,7 +90,7 @@ assertM(f())
 :e
 fun f4[T](): module T = M
 //│ ╔══[ERROR] Expected a module, found non-moduleful reference.
-//│ ║  l.84: 	fun f4[T](): module T = M
+//│ ║  l.91: 	fun f4[T](): module T = M
 //│ ║        	                    ^
 //│ ╙── Function marked as returning a 'module' must have a module return type.
 
@@ -99,8 +99,8 @@ fun f[T](): module MM[T] = MM[T]
 :e
 assertNonM(f[Int]())
 //│ ╔══[ERROR] Unexpected moduleful application.
-//│ ║  l.97: 	assertNonM(f[Int]())
-//│ ║        	           ^^^^^^^^
+//│ ║  l.100: 	assertNonM(f[Int]())
+//│ ║         	           ^^^^^^^^
 //│ ╙── Module argument passed to a non-module parameter.
 
 assertM(f[Int]())
@@ -110,14 +110,14 @@ assertM(f[Int]())
 :e
 fun f3() = return M
 //│ ╔══[ERROR] Unexpected moduleful reference.
-//│ ║  l.105: 	fun f3() = return M
+//│ ║  l.111: 	fun f3() = return M
 //│ ╙──       	                  ^
 
 :todo
 :e
 fun f3() = (() => M)()
 //│ ╔══[ERROR] Unexpected moduleful reference.
-//│ ║  l.109: 	fun f3() = (() => M)()
+//│ ║  l.118: 	fun f3() = (() => M)()
 //│ ╙──       	                  ^
 
 // * [test:T4]
@@ -126,7 +126,7 @@ fun f3() = (() => M)()
 :effectHandlers
 fun f3() = (() => return M)()
 //│ ╔══[ERROR] Unexpected moduleful reference.
-//│ ║  l.115: 	fun f3() = (() => return M)()
+//│ ║  l.127: 	fun f3() = (() => return M)()
 //│ ╙──       	                         ^
 
 
@@ -136,7 +136,7 @@ fun f3() = (() => return M)()
 :e
 fun f(module m: M) = m
 //│ ╔══[ERROR] Unexpected moduleful reference.
-//│ ║  l.122: 	fun f(module m: M) = m
+//│ ║  l.137: 	fun f(module m: M) = m
 //│ ║         	                     ^
 //│ ╙── Function must be marked as returning a 'module' in order to return a module.
 
@@ -149,7 +149,7 @@ fun f(module m: M): module M = m
 :e
 val v = M
 //│ ╔══[ERROR] Unexpected moduleful reference.
-//│ ║  l.139: 	val v = M
+//│ ║  l.150: 	val v = M
 //│ ║         	        ^
 //│ ╙── Value must be marked as returning a 'module' in order to return a module.
 
@@ -172,8 +172,8 @@ class C with
   fun foo: module M = M
   val bar: module M = M
 //│ ╔══[ERROR] Function returning modules should not be a class member.
-//│ ║  l.165: 	  fun foo: module M = M
+//│ ║  l.172: 	  fun foo: module M = M
 //│ ╙──       	                  ^^^^^
 //│ ╔══[ERROR] Value returning modules should not be a class member.
-//│ ║  l.166: 	  val bar: module M = M
+//│ ║  l.173: 	  val bar: module M = M
 //│ ╙──       	                  ^^^^^

hkmc2/shared/src/test/mlscript/bbml/bbGetters.mls

@@ -82,7 +82,7 @@ fun test2() =
     case n then funny(n - 1) + 1
   funny
 //│ ╔══[WARNING] Pure expression in statement position
-//│ ║  l.79: 	    case 0 then 0
+//│ ║  l.81: 	    case 0 then 0
 //│ ╙──      	                ^
 //│ JS (unsanitized):
 //│ let test22;
@@ -104,15 +104,15 @@ fun test2() =
 //│   return tmp1
 //│ };
 //│ ╔══[WARNING] Pure expression in statement position
-//│ ║  l.79: 	    case 0 then 0
+//│ ║  l.81: 	    case 0 then 0
 //│ ╙──      	                ^
 //│ ╔══[ERROR] Function definition shape not yet supported for funny
-//│ ║  l.79: 	    case 0 then 0
+//│ ║  l.81: 	    case 0 then 0
 //│ ║        	                ^
-//│ ║  l.80: 	    case n then funny(n - 1) + 1
+//│ ║  l.82: 	    case n then funny(n - 1) + 1
 //│ ╙──      	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 //│ ╔══[ERROR] Variable not found: funny
-//│ ║  l.81: 	  funny
+//│ ║  l.83: 	  funny
 //│ ╙──      	  ^^^^^
 //│ Type: ⊤
 
@@ -121,7 +121,7 @@ fun test2() =
 fun test3 =
   print("Hi")
 //│ ╔══[ERROR] Function definition shape not yet supported for test3
-//│ ║  l.114: 	  print("Hi")
+//│ ║  l.122: 	  print("Hi")
 //│ ╙──       	  ^^^^^^^^^^^
 //│ Type: ⊤
 

hkmc2/shared/src/test/mlscript/codegen/BadSpreads.mls

@@ -42,6 +42,6 @@ fun foo(1) = 2
 
 :todo // proper error
 fun foo(...1) = 2
-//│ /!!!\ Uncaught error: scala.MatchError: Spread(keyword '...',Some(Loc(8,11,BadSpreads.mls:+42)),Some(IntLit(1))) (of class hkmc2.syntax.Tree$Spread)
+//│ /!!!\ Uncaught error: scala.MatchError: Spread(keyword '...',Some(Loc(8,11,BadSpreads.mls:+44)),Some(IntLit(1))) (of class hkmc2.syntax.Tree$Spread)