diff options
author | Martin Odersky <odersky@gmail.com> | 2013-12-25 22:34:06 +0100 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2013-12-25 22:34:40 +0100 |
commit | 657033fd8df0333c4df7c5881512e034571c2de1 (patch) | |
tree | 375524da111ad2820d439180c3725ce19f2b4cd4 /src/dotty/tools/dotc | |
parent | b5741c2eec037ba42824308705bac4dcb6a8d0cd (diff) | |
download | dotty-657033fd8df0333c4df7c5881512e034571c2de1.tar.gz dotty-657033fd8df0333c4df7c5881512e034571c2de1.tar.bz2 dotty-657033fd8df0333c4df7c5881512e034571c2de1.zip |
Avoiding auto-unit insertion.
(vecause dotty can't do it).
Diffstat (limited to 'src/dotty/tools/dotc')
-rw-r--r-- | src/dotty/tools/dotc/ast/untpd.scala | 2 | ||||
-rw-r--r-- | src/dotty/tools/dotc/parsing/Parsers.scala | 4 | ||||
-rw-r--r-- | src/dotty/tools/dotc/typer/Typer.scala | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/dotty/tools/dotc/ast/untpd.scala b/src/dotty/tools/dotc/ast/untpd.scala index 3fb21feb7..879393a0a 100644 --- a/src/dotty/tools/dotc/ast/untpd.scala +++ b/src/dotty/tools/dotc/ast/untpd.scala @@ -130,7 +130,7 @@ object untpd extends Trees.Instance[Untyped] with TreeInfo[Untyped] { def TypeDef(mods: Modifiers, name: TypeName, tparams: List[TypeDef], rhs: Tree): TypeDef = if (tparams.isEmpty) TypeDef(mods, name, rhs) else new PolyTypeDef(mods, name, tparams, rhs) - def unitLiteral = Literal(Constant()) + def unitLiteral = Literal(Constant(())) def ref(tp: NamedType)(implicit ctx: Context): Tree = TypedSplice(tpd.ref(tp)) diff --git a/src/dotty/tools/dotc/parsing/Parsers.scala b/src/dotty/tools/dotc/parsing/Parsers.scala index f3f87daff..ceeb966bd 100644 --- a/src/dotty/tools/dotc/parsing/Parsers.scala +++ b/src/dotty/tools/dotc/parsing/Parsers.scala @@ -1723,7 +1723,7 @@ object Parsers { */ def constrExpr(): Tree = if (in.token == LBRACE) constrBlock() - else Block(selfInvocation() :: Nil, Literal(Constant())) + else Block(selfInvocation() :: Nil, Literal(Constant(()))) /** SelfInvocation ::= this ArgumentExprs {ArgumentExprs} */ @@ -1742,7 +1742,7 @@ object Parsers { else Nil } accept(RBRACE) - Block(stats, Literal(Constant())) + Block(stats, Literal(Constant(()))) } /** TypeDef ::= type Id [TypeParamClause] `=' Type diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala index a6fca2a58..0b3b764b5 100644 --- a/src/dotty/tools/dotc/typer/Typer.scala +++ b/src/dotty/tools/dotc/typer/Typer.scala @@ -1109,7 +1109,7 @@ class Typer extends Namer with Applications with Implicits { if (folded ne EmptyTree) return folded // drop type if prototype is Unit if (pt isRef defn.UnitClass) - return tpd.Block(tree :: Nil, Literal(Constant())) + return tpd.Block(tree :: Nil, Literal(Constant(()))) // convert function literal to SAM closure tree match { case Closure(Nil, id @ Ident(nme.ANON_FUN), _) |