aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/config/PathResolver.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2014-02-09 18:44:41 +0100
committerMartin Odersky <odersky@gmail.com>2014-02-09 18:48:36 +0100
commit866ee8665147f91bee617465d04a08ff7b874baf (patch)
treea49a526bea5671a5190217c9e3dfeb8c0c7829f0 /src/dotty/tools/dotc/config/PathResolver.scala
parent98ccfd77c4748487190387c4e8b3646d77116e22 (diff)
downloaddotty-866ee8665147f91bee617465d04a08ff7b874baf.tar.gz
dotty-866ee8665147f91bee617465d04a08ff7b874baf.tar.bz2
dotty-866ee8665147f91bee617465d04a08ff7b874baf.zip
Symbol loaders no longer complete with creation context
Instead current ctx is passed through everywhere. Question: can we factor out ctx better?
Diffstat (limited to 'src/dotty/tools/dotc/config/PathResolver.scala')
-rw-r--r--src/dotty/tools/dotc/config/PathResolver.scala17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/dotty/tools/dotc/config/PathResolver.scala b/src/dotty/tools/dotc/config/PathResolver.scala
index 3aa42defb..73c045c77 100644
--- a/src/dotty/tools/dotc/config/PathResolver.scala
+++ b/src/dotty/tools/dotc/config/PathResolver.scala
@@ -133,9 +133,9 @@ object PathResolver {
)
}
- def fromPathString(path: String)(implicit cctx: CondensedContext): JavaClassPath = {
- val settings = cctx.settings.classpath.update(path)
- new PathResolver(cctx.fresh.withSettings(settings)).result
+ def fromPathString(path: String)(implicit ctx: Context): JavaClassPath = {
+ val settings = ctx.settings.classpath.update(path)
+ new PathResolver()(ctx.fresh.withSettings(settings)).result
}
/** With no arguments, show the interesting values in Environment and Defaults.
@@ -148,11 +148,11 @@ object PathResolver {
println(Defaults)
}
else {
- implicit val cctx = (new ContextBase).initialCtx.condensed
+ implicit val ctx = (new ContextBase).initialCtx
val ArgsSummary(sstate, rest, errors) =
- cctx.settings.processArguments(args.toList, true)
+ ctx.settings.processArguments(args.toList, true)
errors.foreach(println)
- val pr = new PathResolver(cctx.fresh.withSettings(sstate))
+ val pr = new PathResolver()(ctx.fresh.withSettings(sstate))
println(" COMMAND: 'scala %s'".format(args.mkString(" ")))
println("RESIDUAL: 'scala %s'\n".format(rest.mkString(" ")))
pr.result.show
@@ -161,9 +161,8 @@ object PathResolver {
}
import PathResolver.{ Defaults, Environment, firstNonEmpty, ppcp }
-class PathResolver(cctx: CondensedContext) {
- implicit def ctx: Context = cctx
- import cctx.base.settings
+class PathResolver(implicit ctx: Context) {
+ import ctx.base.settings
val context = ClassPath.DefaultJavaContext