diff options
| author | Martin Odersky <odersky@gmail.com> | 2015-06-18 13:27:43 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2015-06-22 11:40:20 +0200 |
| commit | 131ab5c1261608715cf2fde3aa44a04777cbda64 (patch) | |
| tree | 3f878ca320f25d064e39d8c1846e0885303da589 /src/dotty/tools/dotc/typer/Namer.scala | |
| parent | 6f4b38cf9d1711ec525219d9b0b8049c95047f38 (diff) | |
| download | dotty-131ab5c1261608715cf2fde3aa44a04777cbda64.tar.gz dotty-131ab5c1261608715cf2fde3aa44a04777cbda64.tar.bz2 dotty-131ab5c1261608715cf2fde3aa44a04777cbda64.zip | |
Avoid double context creation when modes change on a fresh context.
Move addMode and friends to two decorators, one for Context, the other
for FreshContext. Implement behavior accordingly.
This avoids creating two contexts in situations like:
c.fresh.setxploreTyperState.addMode(...)
Mow we can write
c.fresh.addMode(...).setExploreTyperState
Because addMode returns a fresh context when applied to a fresh context.
Note that we specifically do not want virtual dispatch of addMode, that's
why it was moved to a decorator.
Also: removed mention of ".fresh: when just forllowed by an addMode, because
that one is redundant.
Diffstat (limited to 'src/dotty/tools/dotc/typer/Namer.scala')
| -rw-r--r-- | src/dotty/tools/dotc/typer/Namer.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/typer/Namer.scala b/src/dotty/tools/dotc/typer/Namer.scala index 11a0bd76e..d5a6ec8f4 100644 --- a/src/dotty/tools/dotc/typer/Namer.scala +++ b/src/dotty/tools/dotc/typer/Namer.scala @@ -701,7 +701,7 @@ class Namer { typer: Typer => // println(s"final inherited for $sym: ${inherited.toString}") !!! // println(s"owner = ${sym.owner}, decls = ${sym.owner.info.decls.show}") - val rhsCtx = ctx.fresh addMode Mode.InferringReturnType + val rhsCtx = ctx.addMode(Mode.InferringReturnType) def rhsType = ctx.deskolemize( typedAheadExpr(mdef.rhs, rhsProto)(rhsCtx).tpe.widen.approximateUnion) def lhsType = fullyDefinedType(rhsType, "right-hand side", mdef.pos) |