diff options
| author | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2016-03-31 15:30:16 +0200 |
|---|---|---|
| committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2016-04-18 14:46:57 +0200 |
| commit | 0b1ca2d823ba0eac5558c3bcd1750c84a250cd18 (patch) | |
| tree | ecaf984d08988eba8e2944689db7bff7a5fe9c7b /src/dotty/tools/dotc/ast/tpd.scala | |
| parent | 55e2ae676e32eb21c9e0c2eabc2867704c93d34c (diff) | |
| download | dotty-0b1ca2d823ba0eac5558c3bcd1750c84a250cd18.tar.gz dotty-0b1ca2d823ba0eac5558c3bcd1750c84a250cd18.tar.bz2 dotty-0b1ca2d823ba0eac5558c3bcd1750c84a250cd18.zip | |
Address review comments.
https://github.com/lampepfl/dotty/pull/1188
Diffstat (limited to 'src/dotty/tools/dotc/ast/tpd.scala')
| -rw-r--r-- | src/dotty/tools/dotc/ast/tpd.scala | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/dotty/tools/dotc/ast/tpd.scala b/src/dotty/tools/dotc/ast/tpd.scala index 84747aecd..5e5c842a8 100644 --- a/src/dotty/tools/dotc/ast/tpd.scala +++ b/src/dotty/tools/dotc/ast/tpd.scala @@ -364,14 +364,14 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo { */ def newArray(elemTpe: Type, returnTpe: Type, pos: Position, dims: JavaSeqLiteral)(implicit ctx: Context): Tree = { val elemClass = elemTpe.classSymbol - def newArr(symbol: TermSymbol) = - ref(defn.DottyArraysModule).select(symbol).withPos(pos) + def newArr = + ref(defn.DottyArraysModule).select(defn.newArrayMethod).withPos(pos) if (!ctx.erasedTypes) { assert(!TypeErasure.isUnboundedGeneric(elemTpe)) //needs to be done during typer. See Applications.convertNewGenericArray - newArr(defn.newArrayMethod).appliedToTypeTrees(TypeTree(returnTpe) :: Nil).appliedToArgs(clsOf(elemTpe) :: clsOf(returnTpe) :: dims :: Nil).withPos(pos) + newArr.appliedToTypeTrees(TypeTree(returnTpe) :: Nil).appliedToArgs(clsOf(elemTpe) :: clsOf(returnTpe) :: dims :: Nil).withPos(pos) } else // after erasure - newArr(defn.newArrayMethod).appliedToArgs(clsOf(elemTpe) :: clsOf(returnTpe) :: dims :: Nil).withPos(pos) + newArr.appliedToArgs(clsOf(elemTpe) :: clsOf(returnTpe) :: dims :: Nil).withPos(pos) } // ------ Creating typed equivalents of trees that exist only in untyped form ------- @@ -748,7 +748,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo { /** If inititializer tree is `_', the default value of its type, * otherwise the tree itself. - * */ + */ def wildcardToDefault(implicit ctx: Context) = if (isWildcardArg(tree)) defaultValue(tree.tpe) else tree |