Remove nonlocal returns from dotty's codebase

Author: OlivierBlanvillain

compiler/src/dotty/tools/dotc/classpath/VirtualDirectoryClassPath.scala

@@ -13,12 +13,13 @@ case class VirtualDirectoryClassPath(dir: VirtualDirectory) extends ClassPath wi
   // From AbstractFileClassLoader
   private final def lookupPath(base: AbstractFile)(pathParts: Seq[String], directory: Boolean): AbstractFile = {
     var file: AbstractFile = base
-    for (dirPart <- pathParts.init) {
+    val dirParts = pathParts.init.toIterator
+    while (dirParts.hasNext) {
+      val dirPart = dirParts.next
       file = file.lookupName(dirPart, directory = true)
       if (file == null)
         return null
     }
-
     file.lookupName(pathParts.last, directory = directory)
   }
 

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

@@ -471,13 +471,10 @@ class OrderingConstraint(private val boundsMap: ParamBounds,
       if entries(n).exists
     } yield poly.paramRefs(n)
 
-  def forallParams(p: TypeParamRef => Boolean): Boolean = {
-    boundsMap.foreachBinding { (poly, entries) =>
-      for (i <- 0 until paramCount(entries))
-        if (isBounds(entries(i)) && !p(poly.paramRefs(i))) return false
+  def forallParams(p: TypeParamRef => Boolean): Boolean =
+    boundsMap.forallBinding { (poly, entries) =>
+      !0.until(paramCount(entries)).exists(i => isBounds(entries(i)) && !p(poly.paramRefs(i)))
     }
-    true
-  }
 
   def foreachParam(p: (TypeLambda, Int) => Unit): Unit =
     boundsMap.foreachBinding { (poly, entries) =>

compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala

@@ -92,11 +92,12 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
   override def toTextRef(tp: SingletonType): Text = controlled {
     tp match {
       case tp: ThisType if !printDebug =>
-        if (tp.cls.isAnonymousClass) return keywordStr("this")
-        if (tp.cls.is(ModuleClass)) return fullNameString(tp.cls.sourceModule)
+        if (tp.cls.isAnonymousClass) keywordStr("this")
+        if (tp.cls.is(ModuleClass)) fullNameString(tp.cls.sourceModule)
+        else super.toTextRef(tp)
       case _ =>
+        super.toTextRef(tp)
     }
-    super.toTextRef(tp)
   }
 
   override def toTextPrefix(tp: Type): Text = controlled {
@@ -105,15 +106,15 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
       else if (homogenizedView) isEmptyPrefix(sym) // drop <root> and anonymous classes, but not scala, Predef.
       else isOmittablePrefix(sym)
     tp match {
-      case tp: ThisType =>
-        if (isOmittable(tp.cls)) return ""
+      case tp: ThisType if isOmittable(tp.cls) =>
+        ""
       case tp @ TermRef(pre, _) =>
         val sym = tp.symbol
-        if (sym.isPackageObject && !homogenizedView) return toTextPrefix(pre)
-        if (isOmittable(sym)) return ""
-      case _ =>
+        if (sym.isPackageObject && !homogenizedView) toTextPrefix(pre)
+        else if (isOmittable(sym)) ""
+        else super.toTextPrefix(tp)
+      case _ => super.toTextPrefix(tp)
     }
-    super.toTextPrefix(tp)
   }
 
   override protected def toTextParents(parents: List[Type]): Text =
@@ -180,69 +181,69 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
     homogenize(tp) match {
       case tp @ AppliedType(tycon, args) =>
         val cls = tycon.typeSymbol
-        if (tycon.isRepeatedParam) return toTextLocal(args.head) ~ "*"
-        if (defn.isFunctionClass(cls)) return toTextFunction(args, cls.name.isImplicitFunction, cls.name.isErasedFunction)
-        if (tp.tupleArity >= 2 && !printDebug) return toTextTuple(tp.tupleElementTypes)
-        if (isInfixType(tp)) {
+        if (tycon.isRepeatedParam)  toTextLocal(args.head) ~ "*"
+        else if (defn.isFunctionClass(cls))  toTextFunction(args, cls.name.isImplicitFunction, cls.name.isErasedFunction)
+        else if (tp.tupleArity >= 2 && !printDebug)  toTextTuple(tp.tupleElementTypes)
+        else if (isInfixType(tp)) {
           val l :: r :: Nil = args
           val opName = tyconName(tycon)
-
-          return toTextInfixType(tyconName(tycon), l, r) { simpleNameString(tycon.typeSymbol) }
+          toTextInfixType(tyconName(tycon), l, r) { simpleNameString(tycon.typeSymbol) }
         }
+        else super.toText(tp)
 
       // Since RefinedPrinter, unlike PlainPrinter, can output right-associative type-operators, we must override handling
       // of AndType and OrType to account for associativity
       case AndType(tp1, tp2) =>
-        return toTextInfixType(tpnme.raw.AMP, tp1, tp2) { toText(tpnme.raw.AMP) }
+        toTextInfixType(tpnme.raw.AMP, tp1, tp2) { toText(tpnme.raw.AMP) }
       case OrType(tp1, tp2) =>
-        return toTextInfixType(tpnme.raw.BAR, tp1, tp2) { toText(tpnme.raw.BAR) }
-
+        toTextInfixType(tpnme.raw.BAR, tp1, tp2) { toText(tpnme.raw.BAR) }
       case EtaExpansion(tycon) if !printDebug =>
-        return toText(tycon)
+        toText(tycon)
       case tp: RefinedType if defn.isFunctionType(tp) =>
-        return toTextDependentFunction(tp.refinedInfo.asInstanceOf[MethodType])
+        toTextDependentFunction(tp.refinedInfo.asInstanceOf[MethodType])
       case tp: TypeRef =>
         if (tp.symbol.isAnonymousClass && !ctx.settings.uniqid.value)
-          return toText(tp.info)
-        if (tp.symbol.is(Param))
+          toText(tp.info)
+        else if (tp.symbol.is(Param))
           tp.prefix match {
             case pre: ThisType if pre.cls == tp.symbol.owner =>
-              return nameString(tp.symbol)
-            case _ =>
+              nameString(tp.symbol)
+            case _ => super.toText(tp)
           }
+        else super.toText(tp)
       case tp: ExprType =>
-        return exprToText(tp)
+        exprToText(tp)
       case ErasedValueType(tycon, underlying) =>
-        return "ErasedValueType(" ~ toText(tycon) ~ ", " ~ toText(underlying) ~ ")"
+        "ErasedValueType(" ~ toText(tycon) ~ ", " ~ toText(underlying) ~ ")"
       case tp: ClassInfo =>
-        return toTextParents(tp.parents) ~~ "{...}"
+        toTextParents(tp.parents) ~~ "{...}"
       case JavaArrayType(elemtp) =>
-        return toText(elemtp) ~ "[]"
+        toText(elemtp) ~ "[]"
       case tp: AnnotatedType if homogenizedView =>
         // Positions of annotations in types are not serialized
         // (they don't need to because we keep the original type tree with
         //  the original annotation anyway. Therefore, there will always be
         //  one version of the annotation tree that has the correct positions).
-        return withoutPos(super.toText(tp))
+        withoutPos(super.toText(tp))
       case tp: SelectionProto =>
-        return "?{ " ~ toText(tp.name) ~
+        "?{ " ~ toText(tp.name) ~
            (Str(" ") provided !tp.name.toSimpleName.last.isLetterOrDigit) ~
            ": " ~ toText(tp.memberProto) ~ " }"
       case tp: ViewProto =>
-        return toText(tp.argType) ~ " ?=>? " ~ toText(tp.resultType)
+        toText(tp.argType) ~ " ?=>? " ~ toText(tp.resultType)
       case tp @ FunProto(args, resultType) =>
         val argsText = args match {
           case dummyTreeOfType(tp) :: Nil if !(tp isRef defn.NullClass) => "null: " ~ toText(tp)
           case _ => toTextGlobal(args, ", ")
         }
-        return "[applied to " ~ (Str("given ") provided tp.isContextualMethod) ~ (Str("erased ") provided tp.isErasedMethod) ~ "(" ~ argsText ~ ") returning " ~ toText(resultType) ~ "]"
+        "[applied to " ~ (Str("given ") provided tp.isContextualMethod) ~ (Str("erased ") provided tp.isErasedMethod) ~ "(" ~ argsText ~ ") returning " ~ toText(resultType) ~ "]"
       case IgnoredProto(ignored) =>
-        return "?" ~ (("(ignored: " ~ toText(ignored) ~ ")") provided printDebug)
+        "?" ~ (("(ignored: " ~ toText(ignored) ~ ")") provided printDebug)
       case tp @ PolyProto(targs, resType) =>
-        return "[applied to [" ~ toTextGlobal(targs, ", ") ~ "] returning " ~ toText(resType)
+        "[applied to [" ~ toTextGlobal(targs, ", ") ~ "] returning " ~ toText(resType)
       case _ =>
+        super.toText(tp)
     }
-    super.toText(tp)
   }
 
   protected def exprToText(tp: ExprType): Text =

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

@@ -355,12 +355,16 @@ object Splicer {
       // Interpret `foo(j = x, i = y)` which it is expanded to
       // `val j$1 = x; val i$1 = y; foo(i = y, j = x)`
       case Block(stats, expr) =>
+        var unexpected: Option[Result] = None
         val newEnv = stats.foldLeft(env)((accEnv, stat) => stat match {
           case stat: ValDef if stat.symbol.is(Synthetic) =>
             accEnv.updated(stat.name, interpretTree(stat.rhs)(accEnv))
-          case stat => return unexpectedTree(stat)
+          case stat =>
+            if (unexpected.isEmpty)
+              unexpected = Some(unexpectedTree(stat))
+            accEnv
         })
-        interpretTree(expr)(newEnv)
+        unexpected.getOrElse(interpretTree(expr)(newEnv))
       case NamedArg(_, arg) => interpretTree(arg)
 
       case Inlined(_, Nil, expansion) => interpretTree(expansion)

compiler/src/dotty/tools/dotc/util/SimpleIdentityMap.scala

@@ -13,6 +13,7 @@ abstract class SimpleIdentityMap[K <: AnyRef, +V >: Null <: AnyRef] extends (K =
   def contains(k: K): Boolean = apply(k) != null
   def mapValuesNow[V1 >: V <: AnyRef](f: (K, V1) => V1): SimpleIdentityMap[K, V1]
   def foreachBinding(f: (K, V) => Unit): Unit
+  def forallBinding(f: (K, V) => Boolean): Boolean
   def map2[T](f: (K, V) => T): List[T] = {
     val buf = new ListBuffer[T]
     foreachBinding((k, v) => buf += f(k, v))
@@ -37,6 +38,7 @@ object SimpleIdentityMap {
     def updated[V1 >: Null <: AnyRef](k: AnyRef, v: V1) = new Map1(k, v)
     def mapValuesNow[V1 >: Null <: AnyRef](f: (AnyRef, V1) => V1) = this
     def foreachBinding(f: (AnyRef, Null) => Unit) = ()
+    def forallBinding(f: (AnyRef, Null) => Boolean) = true
   }
 
   def Empty[K <: AnyRef]: SimpleIdentityMap[K, Null] = myEmpty.asInstanceOf[SimpleIdentityMap[K, Null]]
@@ -57,6 +59,7 @@ object SimpleIdentityMap {
       if (v1 eq w1) this else new Map1(k1, w1)
     }
     def foreachBinding(f: (K, V) => Unit): Unit = f(k1, v1)
+    def forallBinding(f: (K, V) => Boolean): Boolean = f(k1, v1)
   }
 
   class Map2[K <: AnyRef, +V >: Null <: AnyRef] (k1: K, v1: V, k2: K, v2: V) extends SimpleIdentityMap[K, V] {
@@ -79,6 +82,7 @@ object SimpleIdentityMap {
       else new Map2(k1, w1, k2, w2)
     }
     def foreachBinding(f: (K, V) => Unit): Unit = { f(k1, v1); f(k2, v2) }
+    def forallBinding(f: (K, V) => Boolean): Boolean = f(k1, v1) && f(k2, v2)
   }
 
   class Map3[K <: AnyRef, +V >: Null <: AnyRef] (k1: K, v1: V, k2: K, v2: V, k3: K, v3: V) extends SimpleIdentityMap[K, V] {
@@ -104,6 +108,7 @@ object SimpleIdentityMap {
       else new Map3(k1, w1, k2, w2, k3, w3)
     }
     def foreachBinding(f: (K, V) => Unit): Unit = { f(k1, v1); f(k2, v2); f(k3, v3) }
+    def forallBinding(f: (K, V) => Boolean): Boolean = f(k1, v1) && f(k2, v2) && f(k3, v3)
   }
 
   class Map4[K <: AnyRef, +V >: Null <: AnyRef] (k1: K, v1: V, k2: K, v2: V, k3: K, v3: V, k4: K, v4: V) extends SimpleIdentityMap[K, V] {
@@ -132,6 +137,7 @@ object SimpleIdentityMap {
       else new Map4(k1, w1, k2, w2, k3, w3, k4, w4)
     }
     def foreachBinding(f: (K, V) => Unit): Unit = { f(k1, v1); f(k2, v2); f(k3, v3); f(k4, v4) }
+    def forallBinding(f: (K, V) => Boolean): Boolean = f(k1, v1) && f(k2, v2) && f(k3, v3) && f(k4, v4)
   }
 
   class MapMore[K <: AnyRef, +V >: Null <: AnyRef](bindings: Array[AnyRef]) extends SimpleIdentityMap[K, V] {
@@ -223,5 +229,15 @@ object SimpleIdentityMap {
         i += 2
       }
     }
+
+    def forallBinding(f: (K, V) => Boolean): Boolean = {
+      var i = 0
+      while (i < bindings.length) {
+        if (!f(key(i), value(i)))
+          return false
+        i += 2
+      }
+      return true
+    }
   }
 }