summaryrefslogtreecommitdiff
path: root/test/files/pos
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-02-16 16:19:58 +0100
committerJason Zaugg <jzaugg@gmail.com>2014-02-16 16:19:58 +0100
commit442b1e77468904e6d9620055a9bed923648c98be (patch)
tree55eafad49e3511e0a75b8ef37aa4d2fccdf21f1a /test/files/pos
parentd7332c0c6594fe2f7c2042410c1c8792c2a7658a (diff)
parentc85435d91e26b97e22470af74138b4e8d4c3ae41 (diff)
downloadscala-442b1e77468904e6d9620055a9bed923648c98be.tar.gz
scala-442b1e77468904e6d9620055a9bed923648c98be.tar.bz2
scala-442b1e77468904e6d9620055a9bed923648c98be.zip
Merge pull request #3521 from xeno-by/ticket/8270
SI-8270 unconfuses bundles and vanilla macros
Diffstat (limited to 'test/files/pos')
-rw-r--r--test/files/pos/macro-bundle-disambiguate-bundle.check0
-rw-r--r--test/files/pos/macro-bundle-disambiguate-bundle.scala14
-rw-r--r--test/files/pos/macro-bundle-disambiguate-nonbundle.check0
-rw-r--r--test/files/pos/macro-bundle-disambiguate-nonbundle.scala14
4 files changed, 28 insertions, 0 deletions
diff --git a/test/files/pos/macro-bundle-disambiguate-bundle.check b/test/files/pos/macro-bundle-disambiguate-bundle.check
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/files/pos/macro-bundle-disambiguate-bundle.check
diff --git a/test/files/pos/macro-bundle-disambiguate-bundle.scala b/test/files/pos/macro-bundle-disambiguate-bundle.scala
new file mode 100644
index 0000000000..04809317e1
--- /dev/null
+++ b/test/files/pos/macro-bundle-disambiguate-bundle.scala
@@ -0,0 +1,14 @@
+import scala.reflect.macros.whitebox._
+import scala.language.experimental.macros
+
+class Macros(val c: Context) {
+ def impl = ???
+}
+
+object Macros {
+ def impl(c: Context)(x: c.Tree) = ???
+}
+
+object Test extends App {
+ def foo: Unit = macro Macros.impl
+} \ No newline at end of file
diff --git a/test/files/pos/macro-bundle-disambiguate-nonbundle.check b/test/files/pos/macro-bundle-disambiguate-nonbundle.check
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/files/pos/macro-bundle-disambiguate-nonbundle.check
diff --git a/test/files/pos/macro-bundle-disambiguate-nonbundle.scala b/test/files/pos/macro-bundle-disambiguate-nonbundle.scala
new file mode 100644
index 0000000000..cb66f28a0b
--- /dev/null
+++ b/test/files/pos/macro-bundle-disambiguate-nonbundle.scala
@@ -0,0 +1,14 @@
+import scala.reflect.macros.whitebox._
+import scala.language.experimental.macros
+
+class Macros(val c: Context) {
+ def impl(x: c.Tree) = ???
+}
+
+object Macros {
+ def impl(c: Context) = ???
+}
+
+object Test extends App {
+ def foo: Unit = macro Macros.impl
+} \ No newline at end of file