Handle parameters from base classes of package objects

odersky · odersky · commit 4d32e4de8765 · 2017-08-31T21:13:48.000+02:00
Needed to compile i0239.scala correctly.
diff --git a/compiler/src/dotty/tools/dotc/core/TypeOps.scala b/compiler/src/dotty/tools/dotc/core/TypeOps.scala
@@ -73,7 +73,9 @@ trait TypeOps { this: Context => // TODO: Make standalone object.
             throw new AssertionError(ex"$pre contains no matching argument for ${tparam.showLocated} ")
           case OrType(tp1, tp2) => argForParam(tp1, cls) | argForParam(tp2, cls)
           case AndType(tp1, tp2) => argForParam(tp1, cls) & argForParam(tp2, cls)
-          case _ => tp
+          case _ =>
+            if (pre.termSymbol is Package) argForParam(pre.select(nme.PACKAGE), tparam)
+            else throw new AssertionError(ex"$pre contains no matching argument for ${tparam.showLocated} ")
         }
       }
 

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,9 @@ trait TypeOps { this: Context => // TODO: Make standalone object.`
`73`	`73`	`throw new AssertionError(ex"$pre contains no matching argument for ${tparam.showLocated} ")`
`74`	`74`	`case OrType(tp1, tp2) => argForParam(tp1, cls) \| argForParam(tp2, cls)`
`75`	`75`	`case AndType(tp1, tp2) => argForParam(tp1, cls) & argForParam(tp2, cls)`
`76`		`- case _ => tp`
	`76`	`+ case _ =>`
	`77`	`+ if (pre.termSymbol is Package) argForParam(pre.select(nme.PACKAGE), tparam)`
	`78`	`+ else throw new AssertionError(ex"$pre contains no matching argument for ${tparam.showLocated} ")`
`77`	`79`	`}`
`78`	`80`	`}`
`79`	`81`