diff options
author | Paul Phillips <paulp@improving.org> | 2013-03-06 09:35:04 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-09 11:59:12 -0800 |
commit | 2352814d4be064d67794899cf5494d3324a131ec (patch) | |
tree | f7638ccbd978d8b4ddc2611cd518304fea33c1dc /test | |
parent | e01c7eff032150f8460a76700542c214847ba115 (diff) | |
download | scala-2352814d4be064d67794899cf5494d3324a131ec.tar.gz scala-2352814d4be064d67794899cf5494d3324a131ec.tar.bz2 scala-2352814d4be064d67794899cf5494d3324a131ec.zip |
Eliminated all forInteractive/forScaladoc uses.
This is the commit which brings it all together. The booleans
forInteractive and forScaladoc are now deprecated and are not
inspected for any purpose. All behavioral changes formerly
accomplished via tests of those flags are embodied in the globals
built specifically for those tasks.
Diffstat (limited to 'test')
-rw-r--r-- | test/files/neg/macro-basic-mamdmi.check | 3 | ||||
-rw-r--r-- | test/files/neg/t5753.check | 3 | ||||
-rw-r--r-- | test/files/presentation/doc.check (renamed from test/pending/presentation/doc.check) | 0 | ||||
-rwxr-xr-x | test/files/presentation/doc/doc.scala (renamed from test/pending/presentation/doc/doc.scala) | 16 | ||||
-rwxr-xr-x | test/files/presentation/doc/src/Class.scala (renamed from test/pending/presentation/doc/src/Class.scala) | 0 | ||||
-rwxr-xr-x | test/files/presentation/doc/src/p/Base.scala (renamed from test/pending/presentation/doc/src/p/Base.scala) | 0 | ||||
-rwxr-xr-x | test/files/presentation/doc/src/p/Derived.scala (renamed from test/pending/presentation/doc/src/p/Derived.scala) | 0 |
7 files changed, 15 insertions, 7 deletions
diff --git a/test/files/neg/macro-basic-mamdmi.check b/test/files/neg/macro-basic-mamdmi.check index c7b58d70d2..621d318ceb 100644 --- a/test/files/neg/macro-basic-mamdmi.check +++ b/test/files/neg/macro-basic-mamdmi.check @@ -1,4 +1,5 @@ -Impls_Macros_Test_1.scala:36: error: macro implementation not found: foo (the most common reason for that is that you cannot use macro implementations in the same compilation run that defines them) +Impls_Macros_Test_1.scala:36: error: macro implementation not found: foo +(the most common reason for that is that you cannot use macro implementations in the same compilation run that defines them) println(foo(2) + Macros.bar(2) * new Macros().quux(4)) ^ one error found diff --git a/test/files/neg/t5753.check b/test/files/neg/t5753.check index 76602de17d..379416c179 100644 --- a/test/files/neg/t5753.check +++ b/test/files/neg/t5753.check @@ -1,4 +1,5 @@ -Test_2.scala:9: error: macro implementation not found: foo (the most common reason for that is that you cannot use macro implementations in the same compilation run that defines them) +Test_2.scala:9: error: macro implementation not found: foo +(the most common reason for that is that you cannot use macro implementations in the same compilation run that defines them) println(foo(42)) ^ one error found diff --git a/test/pending/presentation/doc.check b/test/files/presentation/doc.check index 5a3ff13151..5a3ff13151 100644 --- a/test/pending/presentation/doc.check +++ b/test/files/presentation/doc.check diff --git a/test/pending/presentation/doc/doc.scala b/test/files/presentation/doc/doc.scala index d198f4c324..7a2eb9a588 100755 --- a/test/pending/presentation/doc/doc.scala +++ b/test/files/presentation/doc/doc.scala @@ -37,17 +37,23 @@ object Test extends InteractiveTest { prepre + docComment(nTags) + prepost + post } - - override lazy val compiler = { prepareSettings(settings) - new Global(settings, compilerReporter) with MemberLookupBase with CommentFactoryBase { + new Global(settings, compilerReporter) with MemberLookupBase with CommentFactoryBase with doc.ScaladocGlobalTrait { outer => + val global: this.type = this override lazy val analyzer = new { val global: outer.type = outer - } with doc.ScaladocAnalyzer + } with doc.ScaladocAnalyzer with InteractiveAnalyzer { + override def newTyper(context: Context): InteractiveTyper with ScaladocTyper = + new Typer(context) with InteractiveTyper with ScaladocTyper + } + + override lazy val loaders = new scala.tools.nsc.symtab.SymbolLoaders { + val global: outer.type = outer + } def chooseLink(links: List[LinkTo]): LinkTo = links.head def internalLink(sym: Symbol, site: Symbol) = None @@ -125,7 +131,7 @@ object Test extends InteractiveTest { case s: Seq[_] => s exists (existsText(_, text)) case p: Product => p.productIterator exists (existsText(_, text)) } - val (derived, base) = compiler.ask { () => + val (derived, base) = compiler.ask { () => val derived = definitions.RootPackage.info.decl(newTermName("p")).info.decl(newTypeName("Derived")) (derived, derived.ancestors(0)) } diff --git a/test/pending/presentation/doc/src/Class.scala b/test/files/presentation/doc/src/Class.scala index a974bd6f5c..a974bd6f5c 100755 --- a/test/pending/presentation/doc/src/Class.scala +++ b/test/files/presentation/doc/src/Class.scala diff --git a/test/pending/presentation/doc/src/p/Base.scala b/test/files/presentation/doc/src/p/Base.scala index 9031de3e3e..9031de3e3e 100755 --- a/test/pending/presentation/doc/src/p/Base.scala +++ b/test/files/presentation/doc/src/p/Base.scala diff --git a/test/pending/presentation/doc/src/p/Derived.scala b/test/files/presentation/doc/src/p/Derived.scala index 1a9c9a26d1..1a9c9a26d1 100755 --- a/test/pending/presentation/doc/src/p/Derived.scala +++ b/test/files/presentation/doc/src/p/Derived.scala |