diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2013-12-11 19:42:33 +0100 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2013-12-11 19:42:33 +0100 |
commit | e1c6dd965aa4249f715bbb2832df182cc5505853 (patch) | |
tree | 840a092abc16563b9f83b6b3a24556ad91ba67e7 /test/files/run | |
parent | 18fd31d2b58e6e14cbd49d8e20ba05d05165eb4b (diff) | |
parent | 0c927046dc5df974e6c39187107cf3548825282b (diff) | |
download | scala-e1c6dd965aa4249f715bbb2832df182cc5505853.tar.gz scala-e1c6dd965aa4249f715bbb2832df182cc5505853.tar.bz2 scala-e1c6dd965aa4249f715bbb2832df182cc5505853.zip |
Merge commit '0c92704' into merge/2.10.x-to-master
Conflicts:
bincompat-forward.whitelist.conf
src/interactive/scala/tools/nsc/interactive/Global.scala
test/files/presentation/scope-completion-2.check
test/files/presentation/scope-completion-3.check
test/files/presentation/scope-completion-import.check
Conflicts in the scope completion tests handled with the help
of @skyluc in https://github.com/scala/scala/pull/3264
Diffstat (limited to 'test/files/run')
-rw-r--r-- | test/files/run/t8029.scala | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/test/files/run/t8029.scala b/test/files/run/t8029.scala new file mode 100644 index 0000000000..dbd5c41387 --- /dev/null +++ b/test/files/run/t8029.scala @@ -0,0 +1,57 @@ +import scala.tools.partest._ +import scala.tools.nsc._ + +object Test extends DirectTest { + + override def extraSettings: String = "-usejavacp -nowarn -Ystop-after:typer" + + override def code = "" // not used + + def code1 = """ +package object p1 { + trait A + object A +} + """ + + def code2 = """ +package object p2 { + class A + object A +} + """ + + def code3 = """ +package object p3 { + object A + trait A +} + """ + + def code4 = """ +package object p4 { + object A + trait A +} + """ + + def show() { + val global = newCompiler() + import global._ + def typecheck(code: String): Unit = { + val r = new Run + val sourceFile = newSources(code).head + global.reporter.reset() + r.compileSources(sourceFile :: Nil) + assert(!global.reporter.hasErrors) + } + + def typecheckTwice(code: String): Unit = { + typecheck(code) + typecheck(code) + } + + // was: illegal cyclic reference involving package ... + Seq(code1, code2, code3, code4) foreach typecheckTwice + } +} |