summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Burmako <xeno.by@gmail.com>2012-12-02 14:04:34 -0800
committerEugene Burmako <xeno.by@gmail.com>2012-12-02 14:04:34 -0800
commit70a24f907b07ea030419ef686a56272233ddd3ee (patch)
tree2ee01ac992a2973de508afe7171bcbba6a3301e3
parent57b91c5ee794cb8b66e298594a95a3fc829171f6 (diff)
parente6441f16e8c85b43537f227e8e1a5d27a867a0ea (diff)
downloadscala-70a24f907b07ea030419ef686a56272233ddd3ee.tar.gz
scala-70a24f907b07ea030419ef686a56272233ddd3ee.tar.bz2
scala-70a24f907b07ea030419ef686a56272233ddd3ee.zip
Merge pull request #1686 from scalamacros/ticket/6685
Ticket/6685
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index d51ebc7d08..934ba91ac8 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -4516,12 +4516,11 @@ trait Typers extends Modes with Adaptations with Tags {
// [Eugene] no more MaxArrayDims. ClassTags are flexible enough to allow creation of arrays of arbitrary dimensionality (w.r.t JVM restrictions)
val Some((level, componentType)) = erasure.GenericArray.unapply(tpt.tpe)
val tagType = List.iterate(componentType, level)(tpe => appliedType(ArrayClass.toTypeConstructor, List(tpe))).last
- val newArrayApp = atPos(tree.pos) {
+ atPos(tree.pos) {
val tag = resolveClassTag(tree.pos, tagType)
if (tag.isEmpty) MissingClassTagError(tree, tagType)
- else new ApplyToImplicitArgs(Select(tag, nme.newArray), args)
+ else typed(new ApplyToImplicitArgs(Select(tag, nme.newArray), args))
}
- typed(newArrayApp, mode, pt)
case Apply(Select(fun, nme.apply), _) if treeInfo.isSuperConstrCall(fun) => //SI-5696
TooManyArgumentListsForConstructor(tree)
case tree1 =>