Skip to content

Commit 055f12f

Browse files
committed
Adress reviewers comments
1 parent 636608a commit 055f12f

File tree

3 files changed

+14
-19
lines changed

3 files changed

+14
-19
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ class Definitions {
685685

686686
def isFunctionClass(cls: Symbol) = isVarArityClass(cls, tpnme.Function)
687687
def isUnimplementedFunctionClass(cls: Symbol) =
688-
isFunctionClass(cls) && cls.name.functionArity >= MaxImplementedFunctionArity
688+
isFunctionClass(cls) && cls.name.functionArity > MaxImplementedFunctionArity
689689
def isAbstractFunctionClass(cls: Symbol) = isVarArityClass(cls, tpnme.AbstractFunction)
690690
def isTupleClass(cls: Symbol) = isVarArityClass(cls, tpnme.Tuple)
691691
def isProductClass(cls: Symbol) = isVarArityClass(cls, tpnme.Product)

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -343,19 +343,22 @@ object Erasure extends TypeTestsCasts{
343343
* e.m -> e.[]m if `m` is an array operation other than `clone`.
344344
*/
345345
override def typedSelect(tree: untpd.Select, pt: Type)(implicit ctx: Context): Tree = {
346-
val oldSym = tree.symbol
347-
assert(oldSym.exists)
348-
val oldOwner = oldSym.owner
349-
val owner =
350-
if ((oldOwner eq defn.AnyClass) || (oldOwner eq defn.AnyValClass)) {
351-
assert(oldSym.isConstructor, s"${oldSym.showLocated}")
346+
347+
def mapOwner(sym: Symbol): Symbol = {
348+
val owner = sym.owner
349+
if ((owner eq defn.AnyClass) || (owner eq defn.AnyValClass)) {
350+
assert(sym.isConstructor, s"${sym.showLocated}")
352351
defn.ObjectClass
353352
}
354-
else if (defn.isUnimplementedFunctionClass(oldOwner))
353+
else if (defn.isUnimplementedFunctionClass(owner))
355354
defn.FunctionXXLClass
356355
else
357-
oldOwner
358-
val sym = if (owner eq oldOwner) oldSym else owner.info.decl(oldSym.name).symbol
356+
owner
357+
}
358+
359+
var sym = tree.symbol
360+
val owner = mapOwner(sym)
361+
if (owner ne sym.owner) sym = owner.info.decl(sym.name).symbol
359362
assert(sym.exists, owner)
360363

361364
def select(qual: Tree, sym: Symbol): Tree = {
@@ -443,7 +446,7 @@ object Erasure extends TypeTestsCasts{
443446
}
444447
}
445448

446-
/** Besides notmal typing, this method collects all arguments
449+
/** Besides normal typing, this method collects all arguments
447450
* to a compacted function into a single argument of array type.
448451
*/
449452
override def typedApply(tree: untpd.Apply, pt: Type)(implicit ctx: Context): Tree = {

library/src/scala/FunctionXXL.scala

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
/* __ *\
2-
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2002-2013, LAMP/EPFL **
4-
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
5-
** /____/\___/_/ |_/____/_/ | | **
6-
** |/ **
7-
\* */
8-
// GENERATED CODE: DO NOT EDIT. See scala.Function0 for timestamp.
91
package scala
102

113
/** A function with all parameters grouped in an array. */

0 commit comments

Comments
 (0)