diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-05-02 17:49:41 +0200 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-05-02 17:49:41 +0200 |
commit | 251616a107f4255203e318c9f6342f774d25e66d (patch) | |
tree | 5fcb17b2e832a545272ba622c4dad443c0b0c782 | |
parent | fc4602a1415066f897530b6995299de1f3d9830f (diff) | |
parent | 0b725908853f721068bef4ad6a494fc4815ad5d1 (diff) | |
download | scala-251616a107f4255203e318c9f6342f774d25e66d.tar.gz scala-251616a107f4255203e318c9f6342f774d25e66d.tar.bz2 scala-251616a107f4255203e318c9f6342f774d25e66d.zip |
Merge pull request #3686 from densh/topic/re-enabled-typechecked-types
Re-enable typechecked types part of quasiquote test suite
-rw-r--r-- | test/files/scalacheck/quasiquotes/TypecheckedProps.scala | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/test/files/scalacheck/quasiquotes/TypecheckedProps.scala b/test/files/scalacheck/quasiquotes/TypecheckedProps.scala index a5d526191f..f84df269ca 100644 --- a/test/files/scalacheck/quasiquotes/TypecheckedProps.scala +++ b/test/files/scalacheck/quasiquotes/TypecheckedProps.scala @@ -1,9 +1,8 @@ import org.scalacheck._, Prop._, Gen._, Arbitrary._ import scala.reflect.runtime.universe._, Flag._, internal.reificationSupport._ -object TypecheckedProps extends QuasiquoteProperties("typechecked") { - - +object TypecheckedProps extends QuasiquoteProperties("typechecked") + with TypecheckedTypes { property("tuple term") = test { val q"(..$elements)" = typecheck(q"(1, 2)") assert(elements ≈ List(q"1", q"2")) @@ -166,7 +165,7 @@ trait TypecheckedTypes { self: QuasiquoteProperties => } property("applied type") = test { - val tt = typecheckTyp(q"Map[Int, Int]") + val tt = typecheckTyp(tq"Map[Int, Int]") val tq"$tpt[..$tpts]" = tt val tq"scala.this.Predef.Map" = tpt val List(tq"scala.Int", tq"scala.Int") = tpts @@ -205,7 +204,7 @@ trait TypecheckedTypes { self: QuasiquoteProperties => property("annotated type") = test { val tq"$tpt @$annot" = typecheckTyp(tq"Int @unchecked") val tq"scala.Int" = tpt - val q"new unchecked" = annot + val tq"unchecked" = annot } property("existential type") = test { |