diff options
| author | Martin Odersky <odersky@gmail.com> | 2013-10-24 17:39:10 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2013-10-24 17:44:52 +0200 |
| commit | afa83000f39f0b10824cb11b84ab0e8b66a91241 (patch) | |
| tree | 22e459af8f2cbbe095e021ba38fbb37b22b2f361 /src/dotty/tools/dotc/typer/Typer.scala | |
| parent | dbd9569755f40263a783d0301b3fb07849605d17 (diff) | |
| download | dotty-afa83000f39f0b10824cb11b84ab0e8b66a91241.tar.gz dotty-afa83000f39f0b10824cb11b84ab0e8b66a91241.tar.bz2 dotty-afa83000f39f0b10824cb11b84ab0e8b66a91241.zip | |
Parsing and desugaring fixes for blocks.
Previously, { () }
was expanded to { (); EmptyTree }, because the empty tuple is not a term tree. Now EmptyTree is inserted only after a definition.
Furthermore, blocks ending in EmptyTree are now replaced by blocks that end in a unit literal.
Diffstat (limited to 'src/dotty/tools/dotc/typer/Typer.scala')
| -rw-r--r-- | src/dotty/tools/dotc/typer/Typer.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala index 5b79c62f3..bb3e1052a 100644 --- a/src/dotty/tools/dotc/typer/Typer.scala +++ b/src/dotty/tools/dotc/typer/Typer.scala @@ -461,8 +461,9 @@ class Typer extends Namer with Applications with Implicits { else if (forceFullyDefined(pt)) { val expr2 = typed(untpd.Typed(untpd.TypedSplice(expr1), untpd.TypeTree(pt))) untpd.Block(stats1, expr2) withType expr2.tpe - } else errorTree(result, - i"local definition of ${leaks.head.name} escapes as part of block's type ${result.tpe}") + } else + errorTree(result, + i"local definition of ${leaks.head.name} escapes as part of block's type ${result.tpe}") } def typedIf(tree: untpd.If, pt: Type)(implicit ctx: Context) = track("typedIf") { @@ -825,7 +826,7 @@ class Typer extends Namer with Applications with Implicits { case tree: untpd.Typed => typedTyped(tree, pt) case tree: untpd.NamedArg => typedNamedArg(tree, pt) case tree: untpd.Assign => typedAssign(tree, pt) - case tree: untpd.Block => typedBlock(tree, pt) + case tree: untpd.Block => typedBlock(desugar.block(tree), pt) case tree: untpd.If => typedIf(tree, pt) case tree: untpd.Function => typedFunction(tree, pt) case tree: untpd.Closure => typedClosure(tree, pt) |