aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/typer/Typer.scala
diff options
context:
space:
mode:
authorNicolas Stucki <nicolas.stucki@gmail.com>2016-09-04 13:03:08 +0200
committerNicolas Stucki <nicolas.stucki@gmail.com>2016-09-05 13:47:52 +0200
commit0ee74cc0f8252caa189f0a7aaf8a274df486f971 (patch)
tree6a8e2aca7680841b6d7a496a95b7492b141f23cf /src/dotty/tools/dotc/typer/Typer.scala
parentf001eef2213bc5b1affde992aae7780c15d5fd44 (diff)
downloaddotty-0ee74cc0f8252caa189f0a7aaf8a274df486f971.tar.gz
dotty-0ee74cc0f8252caa189f0a7aaf8a274df486f971.tar.bz2
dotty-0ee74cc0f8252caa189f0a7aaf8a274df486f971.zip
Reformat code after fixes on scala.Dynamic.
Diffstat (limited to 'src/dotty/tools/dotc/typer/Typer.scala')
-rw-r--r--src/dotty/tools/dotc/typer/Typer.scala17
1 files changed, 4 insertions, 13 deletions
diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala
index cce692b42..2cfc5f411 100644
--- a/src/dotty/tools/dotc/typer/Typer.scala
+++ b/src/dotty/tools/dotc/typer/Typer.scala
@@ -317,12 +317,9 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
val qual1 = typedExpr(tree.qualifier, selectionProto(tree.name, pt, this))
if (tree.name.isTypeName) checkStable(qual1.tpe, qual1.pos)
val select = typedSelect(tree, pt, qual1)
- pt match {
- case _ if select.tpe ne TryDynamicCallType => select
- case _: FunProto | AssignProto => select
- case PolyProto(_,_) => select
- case _ => typedDynamicSelect(tree.qualifier, tree.name, None, pt)
- }
+ if (select.tpe ne TryDynamicCallType) select
+ else if (pt.isInstanceOf[PolyProto] || pt.isInstanceOf[FunProto] || pt == AssignProto) select
+ else typedDynamicSelect(tree, Nil, pt)
}
def asJavaSelectFromTypeTree(implicit ctx: Context): Tree = {
@@ -518,13 +515,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
reassignmentToVal
}
case TryDynamicCallType =>
- tree match {
- case Assign(Select(qual, name), rhs) if !isDynamicMethod(name) =>
- typedDynamicAssign(qual, name, None, rhs, pt)
- case Assign(TypeApply(Select(qual, name), targs), rhs) if !isDynamicMethod(name) =>
- typedDynamicAssign(qual, name, Some(targs), rhs, pt)
- case _ => reassignmentToVal
- }
+ typedDynamicAssign(tree, pt)
case tpe =>
reassignmentToVal
}