diff options
author | Paul Phillips <paulp@improving.org> | 2013-02-01 17:53:06 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-02-01 17:53:06 -0800 |
commit | 29128012800ac99e05552b0d52246c2691f18b83 (patch) | |
tree | e2c126dd7ffbe5fede4f0d46d57b3bfb597b8fdc /test/scaladoc/run | |
parent | a75cb0adbd919d762381de983d795e1f9723e37c (diff) | |
parent | 01eb6f4958b64667dfae6240effa55d44fa0d392 (diff) | |
download | scala-29128012800ac99e05552b0d52246c2691f18b83.tar.gz scala-29128012800ac99e05552b0d52246c2691f18b83.tar.bz2 scala-29128012800ac99e05552b0d52246c2691f18b83.zip |
Merge commit '01eb6f4958' into wip/fresh-merge2
Conflicts:
src/compiler/scala/tools/nsc/typechecker/Macros.scala
Diffstat (limited to 'test/scaladoc/run')
-rw-r--r-- | test/scaladoc/run/SI-6812.check | 1 | ||||
-rw-r--r-- | test/scaladoc/run/SI-6812.scala | 24 |
2 files changed, 25 insertions, 0 deletions
diff --git a/test/scaladoc/run/SI-6812.check b/test/scaladoc/run/SI-6812.check new file mode 100644 index 0000000000..619c56180b --- /dev/null +++ b/test/scaladoc/run/SI-6812.check @@ -0,0 +1 @@ +Done. diff --git a/test/scaladoc/run/SI-6812.scala b/test/scaladoc/run/SI-6812.scala new file mode 100644 index 0000000000..fbd9588ede --- /dev/null +++ b/test/scaladoc/run/SI-6812.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.Context + import language.experimental.macros + + object Macros { + def impl(c: Context) = c.literalUnit + def foo = macro impl + } + + class C { + def bar = Macros.foo + } + """ + + def scaladocSettings = "" + override def extraSettings = super.extraSettings + " -Ymacro-no-expand" + def testModel(root: Package) = () +} |