diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2014-02-16 16:58:28 +0100 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2014-02-16 19:25:38 +0100 |
| commit | 862f7709cdabd82327ca0f37a480884c88f96be7 (patch) | |
| tree | 688717816eeee19ddb391f1009c82d9b6f09f224 /test/files/neg/macro-qmarkqmarkqmark.check | |
| parent | 2fc0164a5e777a0495c1801d8d38d60158ec2a77 (diff) | |
| parent | 6ef6c96eff2f0d2f505d45a1436d73a960193076 (diff) | |
| download | scala-862f7709cdabd82327ca0f37a480884c88f96be7.tar.gz scala-862f7709cdabd82327ca0f37a480884c88f96be7.tar.bz2 scala-862f7709cdabd82327ca0f37a480884c88f96be7.zip | |
Merge remote-tracking branch 'origin/master' into topic/palladium0
Conflicts:
src/compiler/scala/reflect/macros/compiler/Resolvers.scala
src/compiler/scala/reflect/macros/contexts/Typers.scala
src/compiler/scala/tools/reflect/ToolBoxFactory.scala
src/reflect/scala/reflect/api/BuildUtils.scala
Diffstat (limited to 'test/files/neg/macro-qmarkqmarkqmark.check')
| -rw-r--r-- | test/files/neg/macro-qmarkqmarkqmark.check | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/neg/macro-qmarkqmarkqmark.check b/test/files/neg/macro-qmarkqmarkqmark.check index bc3e25edaf..b4f8ea905f 100644 --- a/test/files/neg/macro-qmarkqmarkqmark.check +++ b/test/files/neg/macro-qmarkqmarkqmark.check @@ -1,7 +1,7 @@ macro-qmarkqmarkqmark.scala:5: error: macro implementation is missing foo1 ^ -macro-qmarkqmarkqmark.scala:8: error: too few argument lists for macro invocation +macro-qmarkqmarkqmark.scala:8: error: missing arguments for macro method foo2 in object Macros foo2 ^ macro-qmarkqmarkqmark.scala:9: error: macro implementation is missing |