Convert more context functions to CFTs

Author: odersky

compiler/src/dotty/tools/dotc/core/Definitions.scala

@@ -204,7 +204,7 @@ class Definitions {
   @tu lazy val ScalaPackageClass: ClassSymbol = {
     val cls = ScalaPackageVal.moduleClass.asClass
     cls.info.decls.openForMutations.useSynthesizer(
-      name => ctx =>
+      name =>
         if (name.isTypeName && name.isSyntheticFunction) newFunctionNTrait(name.asTypeName)
         else NoSymbol)
     cls

compiler/src/dotty/tools/dotc/core/Scopes.scala

@@ -42,7 +42,7 @@ object Scopes {
    *  the given name in the given context. Returns `NoSymbol` if the
    *  no symbol should be synthesized for the given name.
    */
-  type SymbolSynthesizer = Name => Context => Symbol
+  type SymbolSynthesizer = Name => Context ?=> Symbol
 
   class ScopeEntry private[Scopes] (val name: Name, _sym: Symbol, val owner: Scope) {
 
@@ -370,7 +370,7 @@ object Scopes {
           e = e.prev
       }
       if ((e eq null) && (synthesize != null)) {
-        val sym = synthesize(name)(ctx)
+        val sym = synthesize(name)
         if (sym.exists) newScopeEntry(sym) else e
       }
       else e

compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala

@@ -206,7 +206,7 @@ object SymbolLoaders {
     override def sourceModule(using Context): TermSymbol = _sourceModule
     def description(using Context): String = "package loader " + sourceModule.fullName
 
-    private var enterFlatClasses: Option[Context => Unit] = None
+    private var enterFlatClasses: Option[() => Context ?=> Unit] = None
 
     Stats.record("package scopes")
 
@@ -226,14 +226,14 @@ object SymbolLoaders {
         if (e != null) e
         else if (isFlatName(mangled.toSimpleName) && enterFlatClasses.isDefined) {
           Stats.record("package scopes with flatnames entered")
-          enterFlatClasses.get(ctx)
+          enterFlatClasses.get()
           lookupEntry(name)
         }
         else e
       }
 
       override def ensureComplete()(using Context): Unit =
-        for (enter <- enterFlatClasses) enter(ctx)
+        for (enter <- enterFlatClasses) enter()
 
       override def newScopeLikeThis(): PackageScope = new PackageScope
     }
@@ -283,7 +283,7 @@ object SymbolLoaders {
 
       val packageName = if (root.isEffectiveRoot) "" else root.symbol.javaClassName
 
-      enterFlatClasses = Some { ctx =>
+      enterFlatClasses = Some { () =>
         enterFlatClasses = None
         inContext(ctx){enterClasses(root, packageName, flat = true)}
       }