Skip to content

Commit 9459028

Browse files
committed
Make mkArityArray work for classes outside "scala" package
1 parent ee214a5 commit 9459028

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class Definitions {
7878

7979
private def mkArityArray(name: String, arity: Int, countFrom: Int): Array[ClassSymbol] = {
8080
val arr = new Array[ClassSymbol](arity)
81-
for (i <- countFrom until arity) arr(i) = ctx.requiredClass("scala." + name + i)
81+
for (i <- countFrom until arity) arr(i) = ctx.requiredClass(name + i)
8282
arr
8383
}
8484

@@ -339,9 +339,10 @@ class Definitions {
339339

340340
// ----- Symbol sets ---------------------------------------------------
341341

342-
lazy val FunctionClass = mkArityArray("Function", MaxFunctionArity, 0)
343-
lazy val TupleClass = mkArityArray("Tuple", MaxTupleArity, 2)
344-
lazy val ProductNClass = mkArityArray("Product", MaxTupleArity, 2)
342+
lazy val AbstractFunctionClass = mkArityArray("runtime.AbstractFunction", MaxFunctionArity, 0)
343+
lazy val FunctionClass = mkArityArray("scala.Function", MaxFunctionArity, 0)
344+
lazy val TupleClass = mkArityArray("scala.Tuple", MaxTupleArity, 2)
345+
lazy val ProductNClass = mkArityArray("scala.Product", MaxTupleArity, 2)
345346

346347
lazy val FunctionClasses: Set[Symbol] = FunctionClass.toSet
347348
lazy val TupleClasses: Set[Symbol] = TupleClass.toSet

0 commit comments

Comments
 (0)