diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2009-09-02 14:35:28 +0000 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2009-09-02 14:35:28 +0000 |
| commit | b5618b224a02c6cdc7c76fb459a76ae2b3d6af19 (patch) | |
| tree | 826965d7f7dd6295d1958335761968d1aa535440 /src | |
| parent | 729ae785e9a06da1c0c9bfb6d4b5a00865059dab (diff) | |
| download | scala-b5618b224a02c6cdc7c76fb459a76ae2b3d6af19.tar.gz scala-b5618b224a02c6cdc7c76fb459a76ae2b3d6af19.tar.bz2 scala-b5618b224a02c6cdc7c76fb459a76ae2b3d6af19.zip | |
fixed #2266 (partially) and #2305
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/Types.scala | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/Types.scala b/src/compiler/scala/tools/nsc/symtab/Types.scala index a12ae3a03d..707137dd78 100644 --- a/src/compiler/scala/tools/nsc/symtab/Types.scala +++ b/src/compiler/scala/tools/nsc/symtab/Types.scala @@ -1414,7 +1414,10 @@ trait Types { val args = typeArgsOrDummies if (args.length == sym.typeParams.length) tp.asSeenFrom(pre, sym.owner).instantiateTypeParams(sym.typeParams, args) - else { assert(sym.typeParams.isEmpty || (args exists (_.isError)), tp); tp } + else { + assert(sym.typeParams.isEmpty || (args exists (_.isError)) || isRaw(sym, args)/*#2266/2305*/, tp) + tp + } // @M TODO maybe we shouldn't instantiate type params if isHigherKinded -- probably needed for partial type application though } |