diff options
author | Paul Phillips <paulp@improving.org> | 2012-01-17 10:05:15 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-01-17 10:05:15 -0800 |
commit | cc9871f8dd4f685660976f1a6e5e07c28a4c53a7 (patch) | |
tree | 56d4ed9067cb502083fa4017952b323cfd3bb897 | |
parent | 9d55bf45cd13107ad8f3e5e75737f37e75b22f90 (diff) | |
parent | 1591c14e504246d2cb49b1f7f3e00f6d986f6a06 (diff) | |
download | scala-cc9871f8dd4f685660976f1a6e5e07c28a4c53a7.tar.gz scala-cc9871f8dd4f685660976f1a6e5e07c28a4c53a7.tar.bz2 scala-cc9871f8dd4f685660976f1a6e5e07c28a4c53a7.zip |
Merge branch 'specialized/hlist' of https://github.com/dragos/scala into develop
-rw-r--r-- | src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala | 5 | ||||
-rw-r--r-- | test/files/specialized/spec-hlists.check | 2 | ||||
-rw-r--r-- | test/files/specialized/spec-hlists.scala | 29 |
3 files changed, 35 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala index 85c3a77dcb..fd826fb6d8 100644 --- a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala +++ b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala @@ -1258,7 +1258,10 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers { .format(tree, symbol.tpe, tree.tpe, env, specializedName(symbol, env))) if (!env.isEmpty) { // a method? val specCandidates = qual.tpe.member(specializedName(symbol, env)) - val specMember = specCandidates suchThat (s => doesConform(symbol, tree.tpe, s.tpe, env)) + val specMember = specCandidates suchThat { s => + doesConform(symbol, tree.tpe, qual.tpe.memberType(s), env) + } + log("[specSym] found: " + specCandidates.tpe + ", instantiated as: " + tree.tpe) log("[specSym] found specMember: " + specMember) if (specMember ne NoSymbol) diff --git a/test/files/specialized/spec-hlists.check b/test/files/specialized/spec-hlists.check new file mode 100644 index 0000000000..0ab3339bbc --- /dev/null +++ b/test/files/specialized/spec-hlists.check @@ -0,0 +1,2 @@ +class HCons$mcI$sp +class HCons$mcI$sp diff --git a/test/files/specialized/spec-hlists.scala b/test/files/specialized/spec-hlists.scala new file mode 100644 index 0000000000..8c4ac8f610 --- /dev/null +++ b/test/files/specialized/spec-hlists.scala @@ -0,0 +1,29 @@ +/** Test contributed by Stefan Zeiger showing that HLists can be + * specialized. + */ + +sealed trait HList { + type Self <: HList + + type |: [E] = HCons[E, Self] + + final def |: [@specialized E](elem: E): |: [E] = new HCons[E, Self](elem, this.asInstanceOf[Self]) + + def m[@specialized E, T <: AnyRef](x: E): T = null.asInstanceOf[T] +} + +final class HCons[@specialized H, T <: HList](val head: H, val tail: T) extends HList { + type Self = HCons[H, T] +} + +final object HNil extends HList { + type Self = HNil.type +} + +object Test extends App { + val l1 = new HCons(42, "foo" |: HNil) + println(l1.getClass) + + val l2 = 42 |: "abc" |: HNil + println(l2.getClass) +} |