diff options
| author | Martin Odersky <odersky@gmail.com> | 2007-05-01 14:51:14 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2007-05-01 14:51:14 +0000 |
| commit | 2043c0ab2196216fc1021d6d92e270184a2c8f45 (patch) | |
| tree | 8ab5885a761192b25b8f459507e517993ad1d7f6 /src/compiler | |
| parent | 1cc06bb6976e2d211b6219cfa7cdfbaab193791e (diff) | |
| download | scala-2043c0ab2196216fc1021d6d92e270184a2c8f45.tar.gz scala-2043c0ab2196216fc1021d6d92e270184a2c8f45.tar.bz2 scala-2043c0ab2196216fc1021d6d92e270184a2c8f45.zip | |
fixed bug 1074
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/Definitions.scala | 1 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/Types.scala | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/Definitions.scala b/src/compiler/scala/tools/nsc/symtab/Definitions.scala index 67404caf12..8f51b294dc 100644 --- a/src/compiler/scala/tools/nsc/symtab/Definitions.scala +++ b/src/compiler/scala/tools/nsc/symtab/Definitions.scala @@ -91,6 +91,7 @@ trait Definitions { var ListModule: Symbol = _ def List_apply = getMember(ListModule, nme.apply) var ArrayClass: Symbol = _ + def Array_apply = getMember(ArrayClass, nme.apply) var ArrayModule: Symbol = _ var SerializableClass: Symbol = _ var PredefModule: Symbol = _ diff --git a/src/compiler/scala/tools/nsc/symtab/Types.scala b/src/compiler/scala/tools/nsc/symtab/Types.scala index a1015eed4a..1ed48c2eb9 100644 --- a/src/compiler/scala/tools/nsc/symtab/Types.scala +++ b/src/compiler/scala/tools/nsc/symtab/Types.scala @@ -1203,10 +1203,9 @@ A type's symbol should never be inspected directly. if (sym.isAliasType) { if (sym.info.typeParams.length == args.length) // beta-reduce transform(sym.info.resultType).normalize // cycles have been checked in typeRef - else { // eta-expand - assert(isHigherKinded) + else if (isHigherKinded) PolyType(typeParams, transform(sym.info.resultType).normalize) - } + else this } else if (isHigherKinded) { PolyType(typeParams, typeRef(pre, sym, higherKindedArgs)) // @M TODO: transform? } else super.normalize // @M TODO: transform? |