diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-01-09 13:43:32 -0800 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-01-09 13:43:32 -0800 |
commit | e089cafb5fd02e2457bafde3252da3a771d3180e (patch) | |
tree | e4f54289554e90fcc24218a58e9c2fbd3d93a713 /test/scaladoc | |
parent | 572b092495ebf1075064d90d7b9bbc90dec2ac76 (diff) | |
parent | 94eb751d0063b80e7bca542b9c243900527f9028 (diff) | |
download | scala-e089cafb5fd02e2457bafde3252da3a771d3180e.tar.gz scala-e089cafb5fd02e2457bafde3252da3a771d3180e.tar.bz2 scala-e089cafb5fd02e2457bafde3252da3a771d3180e.zip |
Merge pull request #3342 from xeno-by/topic/pres-compiler-macros
Presentation compiler friendliness for macros
Diffstat (limited to 'test/scaladoc')
-rw-r--r-- | test/scaladoc/run/SI-6812.check | 1 | ||||
-rw-r--r-- | test/scaladoc/run/SI-6812.scala | 2 | ||||
-rw-r--r-- | test/scaladoc/run/SI-6812b.check | 1 | ||||
-rw-r--r-- | test/scaladoc/run/SI-6812b.scala | 24 |
4 files changed, 27 insertions, 1 deletions
diff --git a/test/scaladoc/run/SI-6812.check b/test/scaladoc/run/SI-6812.check index 619c56180b..3be8a300e7 100644 --- a/test/scaladoc/run/SI-6812.check +++ b/test/scaladoc/run/SI-6812.check @@ -1 +1,2 @@ +warning: -Ymacro-no-expand is deprecated: Use -Ymacro-expand:none Done. diff --git a/test/scaladoc/run/SI-6812.scala b/test/scaladoc/run/SI-6812.scala index 059c327e7e..6893e816d0 100644 --- a/test/scaladoc/run/SI-6812.scala +++ b/test/scaladoc/run/SI-6812.scala @@ -19,6 +19,6 @@ object Test extends ScaladocModelTest { """ def scaladocSettings = "" - override def extraSettings = super.extraSettings + " -Ymacro-no-expand" + override def extraSettings = super.extraSettings + " -Ymacro-no-expand -deprecation" def testModel(root: Package) = () } diff --git a/test/scaladoc/run/SI-6812b.check b/test/scaladoc/run/SI-6812b.check new file mode 100644 index 0000000000..619c56180b --- /dev/null +++ b/test/scaladoc/run/SI-6812b.check @@ -0,0 +1 @@ +Done. diff --git a/test/scaladoc/run/SI-6812b.scala b/test/scaladoc/run/SI-6812b.scala new file mode 100644 index 0000000000..b8a8140357 --- /dev/null +++ b/test/scaladoc/run/SI-6812b.scala @@ -0,0 +1,24 @@ +import scala.tools.nsc.doc.model._ +import scala.tools.partest.ScaladocModelTest +import language._ + +object Test extends ScaladocModelTest { + + override def code = """ + import scala.reflect.macros.BlackboxContext + import language.experimental.macros + + object Macros { + def impl(c: BlackboxContext) = c.literalUnit + def foo: Unit = macro impl + } + + class C { + def bar = Macros.foo + } + """ + + def scaladocSettings = "" + override def extraSettings = super.extraSettings + " -Ymacro-expand:none" + def testModel(root: Package) = () +} |