diff options
author | Martin Odersky <odersky@gmail.com> | 2014-12-03 18:20:19 +0100 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2014-12-03 18:20:19 +0100 |
commit | a9a8124199eabe8539152f05718a5d44e4b04855 (patch) | |
tree | 206064e04ed07203d405b23acc665217bdeb03fe /src | |
parent | 95ffe46b6c79ddef3536619cff23134ac8bab010 (diff) | |
download | dotty-a9a8124199eabe8539152f05718a5d44e4b04855.tar.gz dotty-a9a8124199eabe8539152f05718a5d44e4b04855.tar.bz2 dotty-a9a8124199eabe8539152f05718a5d44e4b04855.zip |
Simplification in type assigning SeqLiterals
Diffstat (limited to 'src')
-rw-r--r-- | src/dotty/tools/dotc/ast/tpd.scala | 1 | ||||
-rw-r--r-- | src/dotty/tools/dotc/typer/TypeAssigner.scala | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/ast/tpd.scala b/src/dotty/tools/dotc/ast/tpd.scala index 98cc10a22..462c223fb 100644 --- a/src/dotty/tools/dotc/ast/tpd.scala +++ b/src/dotty/tools/dotc/ast/tpd.scala @@ -129,7 +129,6 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo { def JavaSeqLiteral(elems: List[Tree])(implicit ctx: Context): SeqLiteral = ta.assignType(new untpd.JavaSeqLiteral(elems), elems) - def TypeTree(original: Tree)(implicit ctx: Context): TypeTree = TypeTree(original.tpe, original) diff --git a/src/dotty/tools/dotc/typer/TypeAssigner.scala b/src/dotty/tools/dotc/typer/TypeAssigner.scala index 41dc3c3f7..0f1b81be8 100644 --- a/src/dotty/tools/dotc/typer/TypeAssigner.scala +++ b/src/dotty/tools/dotc/typer/TypeAssigner.scala @@ -324,7 +324,7 @@ trait TypeAssigner { def assignType(tree: untpd.SeqLiteral, elems: List[Tree])(implicit ctx: Context) = tree match { case tree: JavaSeqLiteral => - tree.withType(defn.ArrayClass.typeRef.appliedTo(ctx.typeComparer.lub(elems.tpes))) + tree.withType(defn.ArrayType(ctx.typeComparer.lub(elems.tpes).widen)) case _ => val ownType = if (ctx.erasedTypes) defn.SeqType |