Merge pull request #1350 from dotty-jvican/issue-1308

DarkDimius · web-flow · commit 07fd8a357ed6 · 2016-07-01T11:49:38.000+02:00
Add straightforward fix to #1308
diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala
@@ -566,7 +566,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
   def typedIf(tree: untpd.If, pt: Type)(implicit ctx: Context) = track("typedIf") {
     val cond1 = typed(tree.cond, defn.BooleanType)
     val thenp1 = typed(tree.thenp, pt)
-    val elsep1 = typed(tree.elsep orElse untpd.unitLiteral withPos tree.pos, pt)
+    val elsep1 = typed(tree.elsep orElse (untpd.unitLiteral withPos tree.pos), pt)
     val thenp2 :: elsep2 :: Nil = harmonize(thenp1 :: elsep1 :: Nil)
     assignType(cpy.If(tree)(cond1, thenp2, elsep2), thenp2, elsep2)
   }

Original file line number	Diff line number	Diff line change
`@@ -566,7 +566,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit`
`566`	`566`	`def typedIf(tree: untpd.If, pt: Type)(implicit ctx: Context) = track("typedIf") {`
`567`	`567`	`val cond1 = typed(tree.cond, defn.BooleanType)`
`568`	`568`	`val thenp1 = typed(tree.thenp, pt)`
`569`		`- val elsep1 = typed(tree.elsep orElse untpd.unitLiteral withPos tree.pos, pt)`
	`569`	`+ val elsep1 = typed(tree.elsep orElse (untpd.unitLiteral withPos tree.pos), pt)`
`570`	`570`	`val thenp2 :: elsep2 :: Nil = harmonize(thenp1 :: elsep1 :: Nil)`
`571`	`571`	`assignType(cpy.If(tree)(cond1, thenp2, elsep2), thenp2, elsep2)`
`572`	`572`	`}`