Merge pull request #6791 from dotty-staging/refactor-dotc

Apply refactorings blocked previously

Author: odersky

compiler/src/dotty/tools/dotc/ast/Desugar.scala

@@ -766,7 +766,7 @@ object desugar {
     }
 
     flatTree(cdef1 :: companions ::: implicitWrappers)
-  }.reporting(res => i"desugared: $res", Printers.desugar)
+  }.reporting(i"desugared: $result", Printers.desugar)
 
   /** Expand
    *

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

@@ -1,4 +1,5 @@
-package dotty.tools.dotc
+package dotty.tools
+package dotc
 package core
 
 import annotation.tailrec
@@ -168,11 +169,16 @@ object Decorators {
       }
   }
 
-  implicit class genericDeco[T](val x: T) extends AnyVal {
-    def reporting(op: T => String, printer: config.Printers.Printer = config.Printers.default): T = {
-      printer.println(op(x))
+  implicit object reportDeco {
+    def (x: T) reporting[T](
+        op: given WrappedResult[T] => String,
+        printer: config.Printers.Printer = config.Printers.default): T = {
+      printer.println(op given WrappedResult(x))
       x
     }
+  }
+
+  implicit class genericDeco[T](val x: T) extends AnyVal {
     def assertingErrorsReported(implicit ctx: Context): T = {
       assert(ctx.reporter.errorsReported)
       x

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

@@ -757,8 +757,8 @@ object Denotations {
 
     def atSignature(sig: Signature, site: Type, relaxed: Boolean)(implicit ctx: Context): SingleDenotation = {
       val situated = if (site == NoPrefix) this else asSeenFrom(site)
-      val matches = sig.matchDegree(situated.signature) >=
-        (if (relaxed) Signature.ParamMatch else Signature.FullMatch)
+      val matches = sig.matchDegree(situated.signature).ordinal >=
+        (if (relaxed) Signature.ParamMatch else Signature.FullMatch).ordinal
       if (matches) this else NoDenotation
     }
 
@@ -1096,7 +1096,7 @@ object Denotations {
        d == Signature.FullMatch &&
        !infoOrCompleter.isInstanceOf[PolyType] && !other.infoOrCompleter.isInstanceOf[PolyType]
        ||
-       d >= Signature.ParamMatch && info.matches(other.info))
+       d != Signature.NoMatch && info.matches(other.info))
     }
 
     def mapInherited(ownDenots: PreDenotation, prevDenots: PreDenotation, pre: Type)(implicit ctx: Context): SingleDenotation =

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

@@ -20,11 +20,7 @@ object Flags {
     opaque type Flag <: FlagSet = Long
     private[Flags] def Flag(bits: Long): Flag = bits
   }
-  type FlagSet = opaques.FlagSet
-  def FlagSet(bits: Long): FlagSet = opaques.FlagSet(bits)
-  // DOTTY TODO: replace previous 2 lines with
-  //   export opaques.FlagSet
-  // once 0.17 is released and #6721 is in the bootstrap
+  export opaques.FlagSet
 
   type Flag = opaques.Flag
 

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

@@ -123,9 +123,8 @@ final class ProperGadtConstraint private(
     }
 
     // The replaced symbols are picked up here.
-    addToConstraint(poly1, tvars).reporting({ _ =>
-      i"added to constraint: $params%, %\n$debugBoundsDescription"
-    }, gadts)
+    addToConstraint(poly1, tvars)
+      .reporting(i"added to constraint: $params%, %\n$debugBoundsDescription", gadts)
   }
 
   override def addBound(sym: Symbol, bound: Type, isUpper: Boolean)(implicit ctx: Context): Boolean = {
@@ -159,7 +158,7 @@ final class ProperGadtConstraint private(
           val oldUpperBound = bounds(symTvar.origin)
           // If we have bounds:
           //     F >: [t] => List[t] <: [t] => Any
-          // and we want to record that: 
+          // and we want to record that:
           //     F <: [+A] => List[A]
           // we need to adapt the variance and instead record that:
           //     F <: [A] => List[A]
@@ -177,10 +176,10 @@ final class ProperGadtConstraint private(
           if (isUpper) addUpperBound(symTvar.origin, bound1)
           else addLowerBound(symTvar.origin, bound1)
       }
-    ).reporting({ res =>
+    ).reporting({
       val descr = if (isUpper) "upper" else "lower"
       val op = if (isUpper) "<:" else ">:"
-      i"adding $descr bound $sym $op $bound = $res"
+      i"adding $descr bound $sym $op $bound = $result"
     }, gadts)
   }
 
@@ -206,7 +205,7 @@ final class ProperGadtConstraint private(
             case tb => tb
           }
         retrieveBounds
-          //.reporting({ res => i"gadt bounds $sym: $res" }, gadts)
+          //.reporting(i"gadt bounds $sym: $result", gadts)
           //.ensuring(containsNoInternalTypes(_))
     }
   }

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

@@ -548,7 +548,7 @@ class OrderingConstraint(private val boundsMap: ParamBounds,
         merge(this.boundsMap, that.boundsMap, mergeEntries),
         merge(this.lowerMap, that.lowerMap, mergeParams),
         merge(this.upperMap, that.upperMap, mergeParams))
-  }.reporting(res => i"constraint merge $this with $other = $res", constr)
+  }.reporting(i"constraint merge $this with $other = $result", constr)
 
   def rename(tl: TypeLambda)(implicit ctx: Context): OrderingConstraint = {
     assert(contains(tl))

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

@@ -107,10 +107,10 @@ case class Signature(paramsSig: List[TypeName], resSig: TypeName) {
 
 object Signature {
 
-  type MatchDegree = Int
-  val NoMatch: Int = 0
-  val ParamMatch: Int = 1
-  val FullMatch: Int = 2
+  enum MatchDegree {
+    case NoMatch, ParamMatch, FullMatch
+  }
+  export MatchDegree._
 
   /** The signature of everything that's not a method, i.e. that has
    *  a type different from PolyType, MethodType, or ExprType.

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

@@ -187,46 +187,34 @@ object SymDenotations {
       if (isCurrent(fs)) myFlags else flags
 
     /** Has this denotation one of given flag set? */
-    final def is(flag: Flag)(implicit ctx: Context): Boolean = {
-      val toTest = if (isCurrent(flag)) myFlags else flags // TODO: combine these two lines once 0.17 is released and #6706 is in
-      toTest.is(flag)
-    }
+    final def is(flag: Flag)(implicit ctx: Context): Boolean =
+      (if (isCurrent(flag)) myFlags else flags).is(flag)
 
     /** Has this denotation one of the flags in `fs` set? */
-    final def isOneOf(fs: FlagSet)(implicit ctx: Context): Boolean = {
-      val toTest = if (isCurrent(fs)) myFlags else flags // TODO: combine these two lines once 0.17 is released and #6706 is in
-      toTest.isOneOf(fs)
-    }
+    final def isOneOf(fs: FlagSet)(implicit ctx: Context): Boolean =
+      (if (isCurrent(fs)) myFlags else flags).isOneOf(fs)
 
     /** Has this denotation the given flag set, whereas none of the flags
      *  in `butNot` are set?
      */
-    final def is(flag: Flag, butNot: FlagSet)(implicit ctx: Context): Boolean = {
-      val toTest = if (isCurrent(flag) && isCurrent(butNot)) myFlags else flags // TODO: combine these two lines once 0.17 is released and #6706 is in
-      toTest.is(flag, butNot)
-    }
+    final def is(flag: Flag, butNot: FlagSet)(implicit ctx: Context): Boolean =
+      (if (isCurrent(flag) && isCurrent(butNot)) myFlags else flags).is(flag, butNot)
 
     /** Has this denotation one of the flags in `fs` set, whereas none of the flags
      *  in `butNot` are set?
      */
-    final def isOneOf(fs: FlagSet, butNot: FlagSet)(implicit ctx: Context): Boolean = {
-      val toTest = if (isCurrent(fs) && isCurrent(butNot)) myFlags else flags // TODO: combine these two lines once 0.17 is released and #6706 is in
-      toTest.isOneOf(fs, butNot)
-    }
+    final def isOneOf(fs: FlagSet, butNot: FlagSet)(implicit ctx: Context): Boolean =
+      (if (isCurrent(fs) && isCurrent(butNot)) myFlags else flags).isOneOf(fs, butNot)
 
     /** Has this denotation all of the flags in `fs` set? */
-    final def isAllOf(fs: FlagSet)(implicit ctx: Context): Boolean = {
-      val toTest = if (isCurrent(fs)) myFlags else flags // TODO: combine these two lines once 0.17 is released and #6706 is in
-      toTest.isAllOf(fs)
-    }
+    final def isAllOf(fs: FlagSet)(implicit ctx: Context): Boolean =
+      (if (isCurrent(fs)) myFlags else flags).isAllOf(fs)
 
     /** Has this denotation all of the flags in `fs` set, whereas none of the flags
      *  in `butNot` are set?
      */
-    final def isAllOf(fs: FlagSet, butNot: FlagSet)(implicit ctx: Context): Boolean = {
-      val toTest = if (isCurrent(fs) && isCurrent(butNot)) myFlags else flags // TODO: combine these two lines once 0.17 is released and #6706 is in
-      toTest.isAllOf(fs, butNot)
-    }
+    final def isAllOf(fs: FlagSet, butNot: FlagSet)(implicit ctx: Context): Boolean =
+      (if (isCurrent(fs) && isCurrent(butNot)) myFlags else flags).isAllOf(fs, butNot)
 
     /** The type info, or, if symbol is not yet completed, the completer */
     final def infoOrCompleter: Type = myInfo

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

@@ -794,7 +794,7 @@ object Symbols {
               }
             sourceFromTopLevel(ctx.withPhaseNoLater(ctx.flattenPhase))
           }
-        }//.reporting(res => i"source of $this # $id in ${denot.owner} = $res")
+        }//.reporting(i"source of $this # $id in ${denot.owner} = $result")
       mySource
     }
 

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

@@ -119,7 +119,7 @@ trait MessageRendering {
         else s"${pos.source.file.toString}: offset ${pos.start} (missing source file)"
       val errId =
         if (message.errorId ne ErrorMessageID.NoExplanationID) {
-          val errorNumber = message.errorId.errorNumber()
+          val errorNumber = message.errorId.errorNumber
           s"[E${"0" * (3 - errorNumber.toString.length) + errorNumber}] "
         } else ""
       val kind =