diff options
| author | Paul Phillips <paulp@improving.org> | 2013-01-11 22:28:30 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-01-11 22:28:30 -0800 |
| commit | a2a37ed41fdfddeb44804f2dcc65b496c7fe0a3f (patch) | |
| tree | d206ed454c298b53a746b8950698484cbae73e45 /test/files/pos | |
| parent | ec5bcecdc579a45fe972bcefef2e1794c05babaa (diff) | |
| parent | 82dc21078e7aa6215ed32b79dece3b4c626ebea6 (diff) | |
| download | scala-a2a37ed41fdfddeb44804f2dcc65b496c7fe0a3f.tar.gz scala-a2a37ed41fdfddeb44804f2dcc65b496c7fe0a3f.tar.bz2 scala-a2a37ed41fdfddeb44804f2dcc65b496c7fe0a3f.zip | |
Merge pull request #1885 from paulp/merge/pr-1844
Resolving new merge conflicts between #1844 and master.
Diffstat (limited to 'test/files/pos')
| -rw-r--r-- | test/files/pos/t5692a.check | 4 | ||||
| -rw-r--r-- | test/files/pos/t5692a.flags | 1 | ||||
| -rw-r--r-- | test/files/pos/t5692a/Macros_1.scala | 6 | ||||
| -rw-r--r-- | test/files/pos/t5692a/Test_2.scala | 3 | ||||
| -rw-r--r-- | test/files/pos/t5692b.check | 4 | ||||
| -rw-r--r-- | test/files/pos/t5692b.flags | 1 | ||||
| -rw-r--r-- | test/files/pos/t5692b/Macros_1.scala | 6 | ||||
| -rw-r--r-- | test/files/pos/t5692b/Test_2.scala | 3 |
8 files changed, 28 insertions, 0 deletions
diff --git a/test/files/pos/t5692a.check b/test/files/pos/t5692a.check new file mode 100644 index 0000000000..7fbfb5dba7 --- /dev/null +++ b/test/files/pos/t5692a.check @@ -0,0 +1,4 @@ +Test_2.scala:2: error: this type parameter must be specified + def x = Macros.foo + ^ +one error found diff --git a/test/files/pos/t5692a.flags b/test/files/pos/t5692a.flags new file mode 100644 index 0000000000..cd66464f2f --- /dev/null +++ b/test/files/pos/t5692a.flags @@ -0,0 +1 @@ +-language:experimental.macros
\ No newline at end of file diff --git a/test/files/pos/t5692a/Macros_1.scala b/test/files/pos/t5692a/Macros_1.scala new file mode 100644 index 0000000000..06b5a3de36 --- /dev/null +++ b/test/files/pos/t5692a/Macros_1.scala @@ -0,0 +1,6 @@ +import scala.reflect.macros.Context + +object Macros { + def impl[T](c: Context) = c.literalUnit + def foo[T] = macro impl[T] +}
\ No newline at end of file diff --git a/test/files/pos/t5692a/Test_2.scala b/test/files/pos/t5692a/Test_2.scala new file mode 100644 index 0000000000..08d510cc6f --- /dev/null +++ b/test/files/pos/t5692a/Test_2.scala @@ -0,0 +1,3 @@ +class Test { + def x = Macros.foo +}
\ No newline at end of file diff --git a/test/files/pos/t5692b.check b/test/files/pos/t5692b.check new file mode 100644 index 0000000000..16796826b4 --- /dev/null +++ b/test/files/pos/t5692b.check @@ -0,0 +1,4 @@ +Test_2.scala:2: error: these type parameters must be specified + def x = Macros.foo + ^ +one error found diff --git a/test/files/pos/t5692b.flags b/test/files/pos/t5692b.flags new file mode 100644 index 0000000000..cd66464f2f --- /dev/null +++ b/test/files/pos/t5692b.flags @@ -0,0 +1 @@ +-language:experimental.macros
\ No newline at end of file diff --git a/test/files/pos/t5692b/Macros_1.scala b/test/files/pos/t5692b/Macros_1.scala new file mode 100644 index 0000000000..b28d19f903 --- /dev/null +++ b/test/files/pos/t5692b/Macros_1.scala @@ -0,0 +1,6 @@ +import scala.reflect.macros.Context + +object Macros { + def impl[T, U](c: Context) = c.literalUnit + def foo[T, U] = macro impl[T, U] +}
\ No newline at end of file diff --git a/test/files/pos/t5692b/Test_2.scala b/test/files/pos/t5692b/Test_2.scala new file mode 100644 index 0000000000..08d510cc6f --- /dev/null +++ b/test/files/pos/t5692b/Test_2.scala @@ -0,0 +1,3 @@ +class Test { + def x = Macros.foo +}
\ No newline at end of file |