diff options
| author | amin <nada.amin@epfl.ch> | 2012-08-21 15:20:40 +0200 |
|---|---|---|
| committer | amin <nada.amin@epfl.ch> | 2012-08-21 15:20:40 +0200 |
| commit | 6ea65ac798637950472d6c04b9168053d2af158d (patch) | |
| tree | 3b87673de0cf9c28df39d6187334f3e5fbedd2ca /test/pending | |
| parent | 2b93ace3518ce48f145d3afb8d4e1abe9fcb26aa (diff) | |
| parent | 1ab4994990a21c1ea4dadcf15368013d89456ca6 (diff) | |
| download | scala-6ea65ac798637950472d6c04b9168053d2af158d.tar.gz scala-6ea65ac798637950472d6c04b9168053d2af158d.tar.bz2 scala-6ea65ac798637950472d6c04b9168053d2af158d.zip | |
Merge branch '2.10.x'
Review by @paulp or @gkossakowski.
Conflicts:
src/compiler/scala/tools/nsc/ast/parser/Scanners.scala
src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
src/compiler/scala/tools/nsc/transform/UnCurry.scala
src/compiler/scala/tools/nsc/typechecker/Typers.scala
src/reflect/scala/reflect/internal/Types.scala
Diffstat (limited to 'test/pending')
4 files changed, 18 insertions, 0 deletions
diff --git a/test/pending/neg/macro-invalidusage-badbounds-b.check b/test/pending/neg/macro-invalidusage-badbounds-b.check new file mode 100644 index 0000000000..fd0b64533e --- /dev/null +++ b/test/pending/neg/macro-invalidusage-badbounds-b.check @@ -0,0 +1,4 @@ +Macros_Test_2.scala:7: error: type arguments [Int] do not conform to macro method foo's type parameter bounds [U <: String]
+ foo[Int]
+ ^
+one error found
diff --git a/test/pending/neg/macro-invalidusage-badbounds-b.flags b/test/pending/neg/macro-invalidusage-badbounds-b.flags new file mode 100644 index 0000000000..cd66464f2f --- /dev/null +++ b/test/pending/neg/macro-invalidusage-badbounds-b.flags @@ -0,0 +1 @@ +-language:experimental.macros
\ No newline at end of file diff --git a/test/pending/neg/macro-invalidusage-badbounds-b/Impls_1.scala b/test/pending/neg/macro-invalidusage-badbounds-b/Impls_1.scala new file mode 100644 index 0000000000..89020de7dd --- /dev/null +++ b/test/pending/neg/macro-invalidusage-badbounds-b/Impls_1.scala @@ -0,0 +1,5 @@ +import scala.reflect.macros.{Context => Ctx} + +object Impls { + def foo[U <: String](c: Ctx) = ??? +} diff --git a/test/pending/neg/macro-invalidusage-badbounds-b/Macros_Test_2.scala b/test/pending/neg/macro-invalidusage-badbounds-b/Macros_Test_2.scala new file mode 100644 index 0000000000..3139599108 --- /dev/null +++ b/test/pending/neg/macro-invalidusage-badbounds-b/Macros_Test_2.scala @@ -0,0 +1,8 @@ +object Macros { + def foo[U <: String] = macro Impls.foo[U] +} + +object Test extends App { + import Macros._ + foo[Int] +}
\ No newline at end of file |