diff options
| author | David MacIver <david.maciver@gmail.com> | 2008-10-26 12:52:21 +0000 |
|---|---|---|
| committer | David MacIver <david.maciver@gmail.com> | 2008-10-26 12:52:21 +0000 |
| commit | ced4ddfef6b26f5aa84960289bb08c4cb883d071 (patch) | |
| tree | cafb660fe0acce6d8b141d618b03ae3cc863cb23 | |
| parent | bd61de26a34e6ca8f09b1467ec595d829bb6ded3 (diff) | |
| download | scala-ced4ddfef6b26f5aa84960289bb08c4cb883d071.tar.gz scala-ced4ddfef6b26f5aa84960289bb08c4cb883d071.tar.bz2 scala-ced4ddfef6b26f5aa84960289bb08c4cb883d071.zip | |
Fix to #1450. Moved test from pending.
| -rw-r--r-- | src/compiler/scala/tools/nsc/matching/CodeFactory.scala | 4 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/StdNames.scala | 1 | ||||
| -rw-r--r-- | test/files/run/matchonstream.check (renamed from test/pending/run/matchonstream.check) | 0 | ||||
| -rw-r--r-- | test/files/run/matchonstream.scala (renamed from test/pending/run/matchonstream.scala) | 0 |
4 files changed, 2 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/matching/CodeFactory.scala b/src/compiler/scala/tools/nsc/matching/CodeFactory.scala index ff8582edea..3d565b7eaa 100644 --- a/src/compiler/scala/tools/nsc/matching/CodeFactory.scala +++ b/src/compiler/scala/tools/nsc/matching/CodeFactory.scala @@ -48,7 +48,6 @@ trait CodeFactory { /** returns A for T <: Sequence[ A ] */ final def getElemType_Sequence(tpe: Type): Type = { - //System.err.println("getElemType_Sequence("+tpe.widen()+")") val tpe1 = tpe.widen.baseType(definitions.SeqClass) if (tpe1 == NoType) @@ -66,8 +65,7 @@ trait CodeFactory { /** for tree of sequence type, returns tree that drops first i elements */ final def seqDrop(sel:Tree, ix: Int) = if (ix == 0) sel else - typed { Apply(Select(Select(sel, nme.toList), nme.drop), - List(Literal(Constant(ix)))) } + typed { Select(Apply(Select(sel, nme.drop), List(Literal(Constant(ix)))), nme.toSeq) } /** for tree of sequence type, returns tree that drops first i elements */ final def seqElement(sel:Tree, ix: Int) = diff --git a/src/compiler/scala/tools/nsc/symtab/StdNames.scala b/src/compiler/scala/tools/nsc/symtab/StdNames.scala index c230cb5ab0..f45f581d6c 100644 --- a/src/compiler/scala/tools/nsc/symtab/StdNames.scala +++ b/src/compiler/scala/tools/nsc/symtab/StdNames.scala @@ -354,6 +354,7 @@ trait StdNames { val tag = newTermName("$tag") val tail = newTermName("tail") val toList = newTermName("toList") + val toSeq = newTermName("toSeq") val toString_ = newTermName("toString") val clone_ = newTermName("clone") val that = newTermName("that") diff --git a/test/pending/run/matchonstream.check b/test/files/run/matchonstream.check index 3dc3aa5164..3dc3aa5164 100644 --- a/test/pending/run/matchonstream.check +++ b/test/files/run/matchonstream.check diff --git a/test/pending/run/matchonstream.scala b/test/files/run/matchonstream.scala index d38d81d9fc..d38d81d9fc 100644 --- a/test/pending/run/matchonstream.scala +++ b/test/files/run/matchonstream.scala |