Make typecheckExpr a shorthand for typecheckExpect(AnyType)

gzm0 · sjrd · commit eb1f9ae1533e · 2021-06-04T22:38:48.000+02:00
This will move errors to the containing trees, rather than the checked
trees itself. This makes sense: Whether or not a tree is in expression
position is a property of the usage, not the tree itself.
diff --git a/linker/shared/src/main/scala/org/scalajs/linker/checker/IRChecker.scala b/linker/shared/src/main/scala/org/scalajs/linker/checker/IRChecker.scala
@@ -615,14 +615,13 @@ private final class IRChecker(unit: LinkingUnit, logger: Logger) {
     }
   }
 
-  private def typecheckExpr(tree: Tree, env: Env): Unit = {
-    implicit val ctx = ErrorContext(tree)
-    if (tree.tpe == NoType)
-      reportError(i"Expression tree has type NoType")
-    typecheck(tree, env)
+  private def typecheckExpr(tree: Tree, env: Env)(
+      implicit ctx: ErrorContext): Unit = {
+    typecheckExpect(tree, env, AnyType)
   }
 
-  private def typecheckExprOrSpread(tree: TreeOrJSSpread, env: Env): Unit = {
+  private def typecheckExprOrSpread(tree: TreeOrJSSpread, env: Env)(
+      implicit ctx: ErrorContext): Unit = {
     tree match {
       case JSSpread(items) =>
         typecheckExpr(items, env)
diff --git a/linker/shared/src/test/scala/org/scalajs/linker/IRCheckerTest.scala b/linker/shared/src/test/scala/org/scalajs/linker/IRCheckerTest.scala
@@ -211,7 +211,7 @@ class IRCheckerTest {
 
     for (log <- testLinkIRErrors(classDefs, MainTestModuleInitializers)) yield {
       log.assertContainsError(
-          "Expression tree has type NoType")
+          "any expected but <notype> found for tree of type org.scalajs.ir.Trees$Skip")
     }
   }
 
@@ -239,7 +239,7 @@ class IRCheckerTest {
 
     for (log <- testLinkIRErrors(classDefs, MainTestModuleInitializers)) yield {
       log.assertContainsError(
-          "Expression tree has type NoType")
+          "any expected but <notype> found for tree of type org.scalajs.ir.Trees$VarDef")
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -615,14 +615,13 @@ private final class IRChecker(unit: LinkingUnit, logger: Logger) {`
`615`	`615`	`}`
`616`	`616`	`}`
`617`	`617`
`618`		`- private def typecheckExpr(tree: Tree, env: Env): Unit = {`
`619`		`- implicit val ctx = ErrorContext(tree)`
`620`		`- if (tree.tpe == NoType)`
`621`		`- reportError(i"Expression tree has type NoType")`
`622`		`- typecheck(tree, env)`
	`618`	`+ private def typecheckExpr(tree: Tree, env: Env)(`
	`619`	`+ implicit ctx: ErrorContext): Unit = {`
	`620`	`+ typecheckExpect(tree, env, AnyType)`
`623`	`621`	`}`
`624`	`622`
`625`		`- private def typecheckExprOrSpread(tree: TreeOrJSSpread, env: Env): Unit = {`
	`623`	`+ private def typecheckExprOrSpread(tree: TreeOrJSSpread, env: Env)(`
	`624`	`+ implicit ctx: ErrorContext): Unit = {`
`626`	`625`	`tree match {`
`627`	`626`	`case JSSpread(items) =>`
`628`	`627`	`typecheckExpr(items, env)`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ class IRCheckerTest {`
`211`	`211`
`212`	`212`	`for (log <- testLinkIRErrors(classDefs, MainTestModuleInitializers)) yield {`
`213`	`213`	`log.assertContainsError(`
`214`		`- "Expression tree has type NoType")`
	`214`	`+ "any expected but <notype> found for tree of type org.scalajs.ir.Trees$Skip")`
`215`	`215`	`}`
`216`	`216`	`}`
`217`	`217`
`@@ -239,7 +239,7 @@ class IRCheckerTest {`
`239`	`239`
`240`	`240`	`for (log <- testLinkIRErrors(classDefs, MainTestModuleInitializers)) yield {`
`241`	`241`	`log.assertContainsError(`
`242`		`- "Expression tree has type NoType")`
	`242`	`+ "any expected but <notype> found for tree of type org.scalajs.ir.Trees$VarDef")`
`243`	`243`	`}`
`244`	`244`	`}`
`245`	`245`