aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/core/Contexts.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2013-08-23 16:21:27 +0200
committerMartin Odersky <odersky@gmail.com>2013-08-23 16:21:27 +0200
commit873a3bc1a273974d7d47de054e68a92c29a359e8 (patch)
tree7e6b0fd2c308a855a05350bb4d12d9d2119f382a /src/dotty/tools/dotc/core/Contexts.scala
parenta8467b0a7cddeef7110155f9853ff84feb2281fa (diff)
downloaddotty-873a3bc1a273974d7d47de054e68a92c29a359e8.tar.gz
dotty-873a3bc1a273974d7d47de054e68a92c29a359e8.tar.bz2
dotty-873a3bc1a273974d7d47de054e68a92c29a359e8.zip
Fixes in implicit handling
Plus a new test file: implicits1
Diffstat (limited to 'src/dotty/tools/dotc/core/Contexts.scala')
-rw-r--r--src/dotty/tools/dotc/core/Contexts.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/core/Contexts.scala b/src/dotty/tools/dotc/core/Contexts.scala
index 6bc932429..531df739e 100644
--- a/src/dotty/tools/dotc/core/Contexts.scala
+++ b/src/dotty/tools/dotc/core/Contexts.scala
@@ -163,7 +163,7 @@ object Contexts {
else if (isNonEmptyScopeContext) scope.implicitDecls
else Set()
if (implicitRefs.isEmpty) outer.implicits
- else new ContextualImplicits(implicitRefs, outer.implicits.ctx)
+ else new ContextualImplicits(implicitRefs, outer.implicits.ctx)(this)
}
implicitsCache
}
@@ -330,7 +330,7 @@ object Contexts {
object NoContext extends Context {
lazy val base = unsupported("base")
- override def implicits: ContextualImplicits = new ContextualImplicits(Set(), this)
+ override def implicits: ContextualImplicits = new ContextualImplicits(Set(), this)(this)
}
/** A context base defines state and associated methods that exist once per