Convert even mode contect functions to CFTs

Author: odersky

compiler/src/dotty/tools/dotc/reporting/Reporter.scala

@@ -126,9 +126,9 @@ abstract class Reporter extends interfaces.ReporterResult {
 
   /** Run `op` and return `true` if errors were reported by this reporter.
    */
-  def reportsErrorsFor(op: Context => Unit)(using Context): Boolean = {
+  def reportsErrorsFor(op: Context ?=> Unit)(using Context): Boolean = {
     val initial = errorCount
-    op(ctx)
+    op
     errorCount > initial
   }
 

compiler/src/dotty/tools/dotc/transform/SyntheticMembers.scala

@@ -80,8 +80,8 @@ class SyntheticMembers(thisPhase: DenotTransformer) {
     else NoSymbol
   }
 
-  private def synthesizeDef(sym: TermSymbol, rhsFn: List[List[Tree]] => Context => Tree)(using Context): Tree =
-    DefDef(sym, rhsFn(_)(ctx.withOwner(sym))).withSpan(ctx.owner.span.focus)
+  private def synthesizeDef(sym: TermSymbol, rhsFn: List[List[Tree]] => Context ?=> Tree)(using Context): Tree =
+    DefDef(sym, rhsFn(_)(using ctx.withOwner(sym))).withSpan(ctx.owner.span.focus)
 
   /** If this is a case or value class, return the appropriate additional methods,
    *  otherwise return nothing.
@@ -131,7 +131,7 @@ class SyntheticMembers(thisPhase: DenotTransformer) {
         case nme.ordinal => Select(This(clazz), nme.ordinalDollar)
       }
       report.log(s"adding $synthetic to $clazz at ${currentPhase}")
-      synthesizeDef(synthetic, treess => ctx => syntheticRHS(treess)(using ctx))
+      synthesizeDef(synthetic, syntheticRHS)
     }
 
     /** The class
@@ -476,12 +476,12 @@ class SyntheticMembers(thisPhase: DenotTransformer) {
         classParents = oldClassInfo.classParents :+ parent)
       clazz.copySymDenotation(info = newClassInfo).installAfter(thisPhase)
     }
-    def addMethod(name: TermName, info: Type, cls: Symbol, body: (Symbol, Tree, Context) => Tree): Unit = {
+    def addMethod(name: TermName, info: Type, cls: Symbol, body: (Symbol, Tree) => Context ?=> Tree): Unit = {
       val meth = newSymbol(clazz, name, Synthetic | Method, info, coord = clazz.coord)
       if (!existingDef(meth, clazz).exists) {
         meth.entered
         newBody = newBody :+
-          synthesizeDef(meth, vrefss => ctx => body(cls, vrefss.head.head, ctx))
+          synthesizeDef(meth, vrefss => body(cls, vrefss.head.head))
       }
     }
     val linked = clazz.linkedClass
@@ -500,12 +500,12 @@ class SyntheticMembers(thisPhase: DenotTransformer) {
     def makeProductMirror(cls: Symbol) = {
       addParent(defn.Mirror_ProductClass.typeRef)
       addMethod(nme.fromProduct, MethodType(defn.ProductClass.typeRef :: Nil, monoType.typeRef), cls,
-        fromProductBody(_, _)(using _).ensureConforms(monoType.typeRef))  // t4758.scala or i3381.scala are examples where a cast is needed
+        fromProductBody(_, _).ensureConforms(monoType.typeRef))  // t4758.scala or i3381.scala are examples where a cast is needed
     }
     def makeSumMirror(cls: Symbol) = {
       addParent(defn.Mirror_SumClass.typeRef)
       addMethod(nme.ordinal, MethodType(monoType.typeRef :: Nil, defn.IntType), cls,
-        ordinalBody(_, _)(using _))
+        ordinalBody(_, _))
     }
 
     if (clazz.is(Module)) {

compiler/src/dotty/tools/dotc/typer/Checking.scala

@@ -1174,7 +1174,7 @@ trait Checking {
 
   /** check that annotation `annot` is applicable to symbol `sym` */
   def checkAnnotApplicable(annot: Tree, sym: Symbol)(using Context): Boolean =
-    !ctx.reporter.reportsErrorsFor { implicit ctx =>
+    !ctx.reporter.reportsErrorsFor {
       val annotCls = Annotations.annotClass(annot)
       val pos = annot.sourcePos
       if (annotCls == defn.MainAnnot) {