diff options
| author | Paul Phillips <paulp@improving.org> | 2012-02-17 16:28:22 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-02-17 16:28:22 -0800 |
| commit | 2fe570291a41e2701f3118bc0f643a9fa60c476b (patch) | |
| tree | 510b348b9c85a69314e0092a3160d948090a53bc /test/pending | |
| parent | 8d5ce774a869814d802c54b180f13aeffdeceba0 (diff) | |
| parent | e9926a5207aadcfe3831b51b1cd6164757278013 (diff) | |
| download | scala-2fe570291a41e2701f3118bc0f643a9fa60c476b.tar.gz scala-2fe570291a41e2701f3118bc0f643a9fa60c476b.tar.bz2 scala-2fe570291a41e2701f3118bc0f643a9fa60c476b.zip | |
Merge remote-tracking branch 'scalamacros/pullrequest/macros' into develop
Diffstat (limited to 'test/pending')
| -rw-r--r-- | test/pending/run/macro-overload.check | 4 | ||||
| -rw-r--r-- | test/pending/run/macro-overload.flags | 1 | ||||
| -rw-r--r-- | test/pending/run/macro-overload/Macros_1.scala | 9 | ||||
| -rw-r--r-- | test/pending/run/macro-overload/Test_2.scala | 6 |
4 files changed, 20 insertions, 0 deletions
diff --git a/test/pending/run/macro-overload.check b/test/pending/run/macro-overload.check new file mode 100644 index 0000000000..764f914e48 --- /dev/null +++ b/test/pending/run/macro-overload.check @@ -0,0 +1,4 @@ +object-Int +object-String +class-Int +class-String
\ No newline at end of file diff --git a/test/pending/run/macro-overload.flags b/test/pending/run/macro-overload.flags new file mode 100644 index 0000000000..7fea2ff901 --- /dev/null +++ b/test/pending/run/macro-overload.flags @@ -0,0 +1 @@ +-Xmacros
\ No newline at end of file diff --git a/test/pending/run/macro-overload/Macros_1.scala b/test/pending/run/macro-overload/Macros_1.scala new file mode 100644 index 0000000000..f24c69ea7b --- /dev/null +++ b/test/pending/run/macro-overload/Macros_1.scala @@ -0,0 +1,9 @@ +object Macros { + def macro bar(x: Int): Int = Apply(Select(Select(Ident("scala"), newTermName("Predef")), newTermName("println")), List(Literal(Constant("object-Int")))) + def macro bar(x: String): String = Apply(Select(Select(Ident("scala"), newTermName("Predef")), newTermName("println")), List(Literal(Constant("object-String")))) +} + +class Macros { + def macro bar(x: Int): Int = Apply(Select(Select(Ident("scala"), newTermName("Predef")), newTermName("println")), List(Literal(Constant("class-Int")))) + def macro bar(x: String): String = Apply(Select(Select(Ident("scala"), newTermName("Predef")), newTermName("println")), List(Literal(Constant("class-String")))) +}
\ No newline at end of file diff --git a/test/pending/run/macro-overload/Test_2.scala b/test/pending/run/macro-overload/Test_2.scala new file mode 100644 index 0000000000..75f6572e03 --- /dev/null +++ b/test/pending/run/macro-overload/Test_2.scala @@ -0,0 +1,6 @@ +object Test extends App { + Macros.bar(2) + Macros.bar("2") + new Macros.bar(2) + new Macros.bar("2") +}
\ No newline at end of file |