diff options
| author | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2015-04-09 16:11:59 +0200 |
|---|---|---|
| committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2015-04-09 16:11:59 +0200 |
| commit | 9602523e0b6b89b73f77ac45f9a5b58060fcd6cf (patch) | |
| tree | 1931f9408365849418261673826be15666b150ff /src/dotty/tools/dotc/typer | |
| parent | 34e77a9fe24106728a21d6d88a7ee8e42cca4dae (diff) | |
| download | dotty-9602523e0b6b89b73f77ac45f9a5b58060fcd6cf.tar.gz dotty-9602523e0b6b89b73f77ac45f9a5b58060fcd6cf.tar.bz2 dotty-9602523e0b6b89b73f77ac45f9a5b58060fcd6cf.zip | |
Replace tabs with 4 spaces in Dotty source.
Diffstat (limited to 'src/dotty/tools/dotc/typer')
| -rw-r--r-- | src/dotty/tools/dotc/typer/ProtoTypes.scala | 2 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/typer/Typer.scala | 4 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/typer/Variances.scala | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/dotty/tools/dotc/typer/ProtoTypes.scala b/src/dotty/tools/dotc/typer/ProtoTypes.scala index e2d4f6978..ac58615aa 100644 --- a/src/dotty/tools/dotc/typer/ProtoTypes.scala +++ b/src/dotty/tools/dotc/typer/ProtoTypes.scala @@ -249,7 +249,7 @@ object ProtoTypes { override def resultType(implicit ctx: Context) = resType def isMatchedBy(tp: Type)(implicit ctx: Context): Boolean = - ctx.typer.isApplicable(tp, argType :: Nil, resultType) + ctx.typer.isApplicable(tp, argType :: Nil, resultType) def derivedViewProto(argType: Type, resultType: Type)(implicit ctx: Context) = if ((argType eq this.argType) && (resultType eq this.resultType)) this diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala index 4bb9b90d4..b066f1fc1 100644 --- a/src/dotty/tools/dotc/typer/Typer.scala +++ b/src/dotty/tools/dotc/typer/Typer.scala @@ -347,8 +347,8 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit val clsDef = TypeDef(x, templ).withFlags(Final) typed(cpy.Block(tree)(clsDef :: Nil, New(Ident(x), Nil)), pt) case _ => - val tpt1 = typedType(tree.tpt) - checkClassTypeWithStablePrefix(tpt1.tpe, tpt1.pos, traitReq = false) + val tpt1 = typedType(tree.tpt) + checkClassTypeWithStablePrefix(tpt1.tpe, tpt1.pos, traitReq = false) assignType(cpy.New(tree)(tpt1), tpt1) // todo in a later phase: checkInstantiatable(cls, tpt1.pos) } diff --git a/src/dotty/tools/dotc/typer/Variances.scala b/src/dotty/tools/dotc/typer/Variances.scala index 0fec1e5a7..0cc9e74cc 100644 --- a/src/dotty/tools/dotc/typer/Variances.scala +++ b/src/dotty/tools/dotc/typer/Variances.scala @@ -50,8 +50,8 @@ object Variances { for ((tp, tparam1) <- tps zip tparams1) { val v1 = varianceInType(tp)(tparam) v = v & (if (tparam1.is(Covariant)) v1 - else if (tparam1.is(Contravariant)) flip(v1) - else cut(v1)) + else if (tparam1.is(Contravariant)) flip(v1) + else cut(v1)) } v } |