Merge pull request #1816 from dotty-staging/fix-#1799

odersky · web-flow · commit d69e8490dc66 · 2016-12-17T15:10:35.000+01:00
Fix #1799: Make compilation of FunctionN traits possible.
diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala
@@ -834,7 +834,7 @@ class Definitions {
     val newDecls = new MutableScope(oldDecls) {
       override def lookupEntry(name: Name)(implicit ctx: Context): ScopeEntry = {
         val res = super.lookupEntry(name)
-        if (res == null && name.functionArity > 0)
+        if (res == null && name.functionArity > MaxImplementedFunctionArity)
           newScopeEntry(newFunctionNTrait(name.functionArity))
         else res
       }

Original file line number	Diff line number	Diff line change
`@@ -834,7 +834,7 @@ class Definitions {`
`834`	`834`	`val newDecls = new MutableScope(oldDecls) {`
`835`	`835`	`override def lookupEntry(name: Name)(implicit ctx: Context): ScopeEntry = {`
`836`	`836`	`val res = super.lookupEntry(name)`
`837`		`- if (res == null && name.functionArity > 0)`
	`837`	`+ if (res == null && name.functionArity > MaxImplementedFunctionArity)`
`838`	`838`	`newScopeEntry(newFunctionNTrait(name.functionArity))`
`839`	`839`	`else res`
`840`	`840`	`}`