Minor formating changes

Author: OlivierBlanvillain

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

@@ -764,7 +764,7 @@ object desugar {
     val param = makeSyntheticParameter()
     def selector(n: Int) = Select(refOfDef(param), nme.selectorName(n))
     val vdefs =
-      params.zipWithIndex.map{
+      params.zipWithIndex.map {
         case (param, idx) =>
           DefDef(param.name, Nil, Nil, TypeTree(), selector(idx)).withPos(param.pos)
       }

compiler/src/dotty/tools/dotc/config/CompilerCommand.scala

@@ -1,4 +1,3 @@
-
 package dotty.tools.dotc
 package config
 

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

@@ -380,7 +380,6 @@ class Definitions {
   lazy val ArrayModuleType = ctx.requiredModuleRef("scala.Array")
   def ArrayModule(implicit ctx: Context) = ArrayModuleType.symbol.moduleClass.asClass
 
-
   lazy val UnitType: TypeRef = valueTypeRef("scala.Unit", BoxedUnitType, java.lang.Void.TYPE, UnitEnc)
   def UnitClass(implicit ctx: Context) = UnitType.symbol.asClass
   lazy val BooleanType = valueTypeRef("scala.Boolean", BoxedBooleanType, java.lang.Boolean.TYPE, BooleanEnc)
@@ -771,7 +770,7 @@ class Definitions {
    */
   def erasedFunctionClass(cls: Symbol): Symbol = {
     val arity = scalaClassName(cls).functionArity
-    if (arity > 22) defn.FunctionXXLClass
+    if (arity > MaxImplementedFunctionArity) defn.FunctionXXLClass
     else if (arity >= 0) defn.FunctionClass(arity)
     else NoSymbol
   }
@@ -785,7 +784,7 @@ class Definitions {
    */
   def erasedFunctionType(cls: Symbol): Type = {
     val arity = scalaClassName(cls).functionArity
-    if (arity > 22) defn.FunctionXXLType
+    if (arity > MaxImplementedFunctionArity) defn.FunctionXXLType
     else if (arity >= 0) defn.FunctionType(arity)
     else NoType
   }
@@ -803,8 +802,8 @@ class Definitions {
   )
 
   val PredefImportFns = List[() => TermRef](
-      () => ScalaPredefModuleRef,
-      () => DottyPredefModuleRef
+    () => ScalaPredefModuleRef,
+    () => DottyPredefModuleRef
   )
 
   lazy val RootImportFns =

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

@@ -1226,4 +1226,4 @@ object Denotations {
     util.Stats.record("stale symbol")
     override def getMessage() = msg
   }
-}
+}

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

@@ -237,7 +237,7 @@ object Flags {
 
   final val AccessorOrSealed = Accessor.toCommonFlags
 
- /** A mutable var */
+  /** A mutable var */
   final val Mutable = termFlag(12, "mutable")
 
   /** Symbol is local to current class (i.e. private[this] or protected[this]
@@ -252,7 +252,7 @@ object Flags {
   final val TermParamAccessor = ParamAccessor.toTermFlags
   final val TypeParamAccessor = ParamAccessor.toTypeFlags
 
-    /** A value or class implementing a module */
+  /** A value or class implementing a module */
   final val Module = commonFlag(15, "module")
   final val ModuleVal = Module.toTermFlags
   final val ModuleClass = Module.toTypeFlags

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

@@ -347,7 +347,7 @@ class TypeErasure(isJava: Boolean, semiEraseVCs: Boolean, isConstructor: Boolean
    *   - For any other uncurried method type (Fs)T, (|Fs|)|T|.
    *   - For a curried method type (Fs1)(Fs2)T, (|Fs1|,Es2)ET where (Es2)ET = |(Fs2)T|.
    *   - For a polymorphic type [Ts](Ps)T, |(Ps)T|
-   *   _ For a polymorphic type [Ts]T where T is not a method type, ()|T|
+   *   - For a polymorphic type [Ts]T where T is not a method type, ()|T|
    *   - For the class info type of java.lang.Object, the same type without any parents.
    *   - For a class info type of a value class, the same type without any parents.
    *   - For any other class info type with parents Ps, the same type with

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

@@ -135,7 +135,7 @@ class Erasure extends Phase with DenotTransformer { thisTransformer =>
         i"The type $tp - ${tp.toString} of class ${tp.getClass} of tree $tree : ${tree.tpe} / ${tree.getClass} is illegal after erasure, phase = ${ctx.phase.prev}")
 }
 
-object Erasure extends TypeTestsCasts{
+object Erasure extends TypeTestsCasts {
 
   import tpd._
 
@@ -344,7 +344,6 @@ object Erasure extends TypeTestsCasts{
      *      e.m -> e.[]m                if `m` is an array operation other than `clone`.
      */
     override def typedSelect(tree: untpd.Select, pt: Type)(implicit ctx: Context): Tree = {
-
       def mapOwner(sym: Symbol): Symbol = {
         def recur(owner: Symbol): Symbol =
           if ((owner eq defn.AnyClass) || (owner eq defn.AnyValClass)) {
@@ -362,14 +361,9 @@ object Erasure extends TypeTestsCasts{
       val sym = if (owner eq origSym.owner) origSym else owner.info.decl(origSym.name).symbol
       assert(sym.exists, origSym.showLocated)
 
-      def select(qual: Tree, sym: Symbol): Tree = {
-        val name = tree.typeOpt match {
-          case tp: NamedType if tp.name.is(ShadowedName) => sym.name.derived(ShadowedName)
-          case _ => sym.name
-        }
+      def select(qual: Tree, sym: Symbol): Tree =
         untpd.cpy.Select(tree)(qual, sym.name)
           .withType(NamedType.withFixedSym(qual.tpe, sym))
-      }
 
       def selectArrayMember(qual: Tree, erasedPre: Type): Tree =
         if (erasedPre isRef defn.ObjectClass)
@@ -447,9 +441,9 @@ object Erasure extends TypeTestsCasts{
       }
     }
 
-	/** Besides normal typing, this method collects all arguments
-	 *  to a compacted function into a single argument of array type.
-	 */
+    /** Besides normal typing, this method collects all arguments
+     *  to a compacted function into a single argument of array type.
+     */
     override def typedApply(tree: untpd.Apply, pt: Type)(implicit ctx: Context): Tree = {
       val Apply(fun, args) = tree
       if (fun.symbol == defn.dummyApply)

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

@@ -31,11 +31,7 @@ import dotty.tools.dotc.util.Positions.Position
 import dotty.tools.dotc.core.Decorators._
 import dotty.tools.dotc.core.Flags
 
-/** This transform eliminates patterns. Right now it's a dummy.
- *  Awaiting the real pattern matcher.
- *  elimRepeated is required
- * TODO: outer tests are not generated yet.
- */
+/** Translates pattern matching. */
 class PatternMatcher extends MiniPhaseTransform with DenotTransformer {
   import dotty.tools.dotc.ast.tpd._
 
@@ -141,7 +137,7 @@ class PatternMatcher extends MiniPhaseTransform with DenotTransformer {
 
       // the force is needed mainly to deal with the GADT typing hack (we can't detect it otherwise as tp nor pt need contain an abstract type, we're just casting wildly)
       def _asInstanceOf(b: Symbol, tp: Type): Tree = ref(b).ensureConforms(tp) // andType here breaks t1048
-      def _isInstanceOf(b: Symbol, tp: Type): Tree = ref(b).select(defn.Any_isInstanceOf).appliedToType(tp)
+      def _isInstanceOf(b: Symbol, tp: Type): Tree = ref(b).isInstance(tp)
     }
   }
 

library/src/dotty/runtime/Arrays.scala

@@ -19,7 +19,7 @@ object Arrays {
 
   /** Convert a sequence to a Java array with element type given by `clazz`. */
   def seqToArray[T](xs: Seq[T], clazz: Class[_]): Array[T] = {
-    val arr = java.lang.reflect.Array.newInstance(clazz, xs.length).asInstanceOf[Array[T]]
+    val arr = jlr.Array.newInstance(clazz, xs.length).asInstanceOf[Array[T]]
     xs.copyToArray(arr)
     arr
   }