Permalink
Browse files

minor tag-related fixes

  • Loading branch information...
xeno-by committed May 6, 2012
1 parent 7cac633 commit 717766af27f295d9c91cf86e17c2a9573d2cc3ad
@@ -99,7 +99,7 @@ trait Types {
// if this fails, it might produce the dreaded "erroneous or inaccessible type" error
// to find out the whereabouts of the error run scalac with -Ydebug
if (reifyDebug) println("launching implicit search for %s.%s[%s]".format(prefix, tagClass.name, tpe))
typer.resolveTypeTag(defaultErrorPosition, prefix.tpe, tpe, concrete) match {
typer.resolveTypeTag(prefix.tpe, tpe, defaultErrorPosition, concrete) match {
case failure if failure.isEmpty =>
if (reifyDebug) println("implicit search was fruitless")
EmptyTree
@@ -33,8 +33,8 @@ package object reify {
import definitions._
import analyzer.enclosingMacroPosition
def erasureTagInScope = typer0.context.withMacrosDisabled(typer0.resolveErasureTag(enclosingMacroPosition, tpe, concrete = concrete))
def arrayTagInScope = typer0.context.withMacrosDisabled(typer0.resolveArrayTag(enclosingMacroPosition, tpe))
def erasureTagInScope = typer0.context.withMacrosDisabled(typer0.resolveErasureTag(tpe, enclosingMacroPosition, concrete = concrete))
def arrayTagInScope = typer0.context.withMacrosDisabled(typer0.resolveArrayTag(tpe, enclosingMacroPosition))
val inScope = (erasureTagInScope, arrayTagInScope)
inScope match {
@@ -997,7 +997,7 @@ abstract class Erasure extends AddInterfaces
}
// Rewrite 5.getClass to ScalaRunTime.anyValClass(5)
else if (isPrimitiveValueClass(qual.tpe.typeSymbol))
global.typer.typed(gen.mkRuntimeCall(nme.anyValClass, List(qual, typer.resolveErasureTag(tree.pos, qual.tpe.widen, true))))
global.typer.typed(gen.mkRuntimeCall(nme.anyValClass, List(qual, typer.resolveErasureTag(qual.tpe.widen, tree.pos, true))))
else
tree
@@ -410,23 +410,23 @@ abstract class UnCurry extends InfoTransform
def sequenceToArray(tree: Tree) = {
val toArraySym = tree.tpe member nme.toArray
assert(toArraySym != NoSymbol)
def getClassTag(tp: Type): Tree = {
val tag = localTyper.resolveArrayTag(tree.pos, tp)
def getArrayTag(tp: Type): Tree = {
val tag = localTyper.resolveArrayTag(tp, tree.pos)
// Don't want bottom types getting any further than this (SI-4024)
if (tp.typeSymbol.isBottomClass) getClassTag(AnyClass.tpe)
if (tp.typeSymbol.isBottomClass) getArrayTag(AnyClass.tpe)
else if (!tag.isEmpty) tag
else if (tp.bounds.hi ne tp) getClassTag(tp.bounds.hi)
else localTyper.TyperErrorGen.MissingClassTagError(tree, tp)
else if (tp.bounds.hi ne tp) getArrayTag(tp.bounds.hi)
else localTyper.TyperErrorGen.MissingArrayTagError(tree, tp)
}
def traversableClassTag(tpe: Type): Tree = {
def traversableArrayTag(tpe: Type): Tree = {
(tpe baseType TraversableClass).typeArgs match {
case targ :: _ => getClassTag(targ)
case targ :: _ => getArrayTag(targ)
case _ => EmptyTree
}
}
afterUncurry {
localTyper.typedPos(pos) {
gen.mkMethodCall(tree, toArraySym, Nil, List(traversableClassTag(tree.tpe)))
gen.mkMethodCall(tree, toArraySym, Nil, List(traversableArrayTag(tree.tpe)))
}
}
}
@@ -343,7 +343,7 @@ trait ContextErrors {
issueNormalTypeError(tree, "macros cannot be eta-expanded")
setError(tree)
}
def MacroPartialApplicationError(tree: Tree) = {
issueNormalTypeError(tree, "macros cannot be partially applied")
setError(tree)
@@ -592,9 +592,9 @@ trait ContextErrors {
def AbstractExistentiallyOverParamerizedTpeError(tree: Tree, tp: Type) =
issueNormalTypeError(tree, "can't existentially abstract over parameterized type " + tp)
// classTagTree
def MissingClassTagError(tree: Tree, tp: Type) = {
issueNormalTypeError(tree, "cannot find class tag for element type "+tp)
// resolveArrayTag
def MissingArrayTagError(tree: Tree, tp: Type) = {
issueNormalTypeError(tree, "cannot find array tag for element type "+tp)
setError(tree)
}
@@ -1266,8 +1266,8 @@ trait Implicits {
}
val tagInScope =
if (full) context.withMacrosDisabled(resolveTypeTag(pos, ReflectMirrorPrefix.tpe, tp, true))
else context.withMacrosDisabled(resolveArrayTag(pos, tp))
if (full) context.withMacrosDisabled(resolveTypeTag(ReflectMirrorPrefix.tpe, tp, pos, true))
else context.withMacrosDisabled(resolveArrayTag(tp, pos))
if (tagInScope.isEmpty) mot(tp, Nil, Nil)
else {
val interop =
@@ -10,7 +10,7 @@ trait Taggings {
trait Tagging {
self: Typer =>
private def resolveTag(pos: Position, taggedTp: Type) = beforeTyper {
private def resolveTag(taggedTp: Type, pos: Position) = beforeTyper {
inferImplicit(
EmptyTree,
taggedTp,
@@ -25,47 +25,47 @@ trait Taggings {
/** Finds in scope or materializes an ArrayTag.
* Should be used instead of ClassTag or ClassManifest every time compiler needs to create an array.
*
* @param tp Type we're looking an ArrayTag for, e.g. resolveArrayTag(IntClass.tpe, pos) will look for ArrayTag[Int].
* @param pos Position for error reporting. Please, provide meaningful value.
* @param tp Type we're looking an ArrayTag for, e.g. resolveArrayTag(pos, IntClass.tpe) will look for ArrayTag[Int].
*
* @returns Tree that represents an `scala.reflect.ArrayTag` for `tp` if everything is okay.
* EmptyTree if the result contains unresolved (i.e. not spliced) type parameters and abstract type members.
*/
def resolveArrayTag(pos: Position, tp: Type): Tree = {
def resolveArrayTag(tp: Type, pos: Position): Tree = {
val taggedTp = appliedType(ArrayTagClass.typeConstructor, List(tp))
resolveTag(pos, taggedTp)
resolveTag(taggedTp, pos)
}
/** Finds in scope or materializes an ErasureTag (if `concrete` is false) or a ClassTag (if `concrete` is true).
* Should be used instead of ClassTag or ClassManifest every time compiler needs to persist an erasure.
*
* @param tp Type we're looking an ErasureTag for, e.g. resolveErasureTag(IntClass.tpe, pos, true) will look for ClassTag[Int].
* @param pos Position for error reporting. Please, provide meaningful value.
* @param tp Type we're looking an ErasureTag for, e.g. resolveErasureTag(pos, IntClass.tpe, true) will look for ClassTag[Int].
* @param concrete If true then the result must not contain unresolved (i.e. not spliced) type parameters and abstract type members.
* If false then the function will always succeed (abstract types will be erased to their upper bounds).
*
* @returns Tree that represents an `scala.reflect.ErasureTag` for `tp` if everything is okay.
* EmptyTree if `concrete` is true and the result contains unresolved (i.e. not spliced) type parameters and abstract type members.
*/
def resolveErasureTag(pos: Position, tp: Type, concrete: Boolean): Tree = {
def resolveErasureTag(tp: Type, pos: Position, concrete: Boolean): Tree = {
val taggedTp = appliedType(if (concrete) ClassTagClass.typeConstructor else ErasureTagClass.typeConstructor, List(tp))
resolveTag(pos, taggedTp)
resolveTag(taggedTp, pos)
}
/** Finds in scope or materializes a TypeTag (if `concrete` is false) or a ConcreteTypeTag (if `concrete` is true).
*
* @param pos Position for error reporting. Please, provide meaningful value.
* @param pre Prefix that represents a universe this type tag will be bound to.
* @param tp Type we're looking a TypeTag for, e.g. resolveTypeTag(pos, reflectMirrorPrefix, IntClass.tpe, false) will look for scala.reflect.mirror.TypeTag[Int].
* @param tp Type we're looking a TypeTag for, e.g. resolveTypeTag(reflectMirrorPrefix, IntClass.tpe, pos, false) will look for scala.reflect.mirror.TypeTag[Int].
* @param pos Position for error reporting. Please, provide meaningful value.
* @param concrete If true then the result must not contain unresolved (i.e. not spliced) type parameters and abstract type members.
* If false then the function will always succeed (abstract types will be reified as free types).
*
* @returns Tree that represents a `scala.reflect.TypeTag` for `tp` if everything is okay.
* EmptyTree if `concrete` is true and the result contains unresolved (i.e. not spliced) type parameters and abstract type members.
*/
def resolveTypeTag(pos: Position, pre: Type, tp: Type, concrete: Boolean): Tree = {
def resolveTypeTag(pre: Type, tp: Type, pos: Position, concrete: Boolean): Tree = {
val taggedTp = appliedType(singleType(pre, pre member (if (concrete) ConcreteTypeTagClass else TypeTagClass).name), List(tp))
resolveTag(pos, taggedTp)
resolveTag(taggedTp, pos)
}
}
}
@@ -4841,8 +4841,8 @@ trait Typers extends Modes with Adaptations with Taggings {
val Some((level, componentType)) = erasure.GenericArray.unapply(tpt.tpe)
val tagType = List.iterate(componentType, level)(tpe => appliedType(ArrayClass.asType, List(tpe))).last
val newArrayApp = atPos(tree.pos) {
val tag = resolveArrayTag(tree.pos, tagType)
if (tag.isEmpty) MissingClassTagError(tree, tagType)
val tag = resolveArrayTag(tagType, tree.pos)
if (tag.isEmpty) MissingArrayTagError(tree, tagType)
else new ApplyToImplicitArgs(Select(tag, nme.newArray), args)
}
typed(newArrayApp, mode, pt)
@@ -1,4 +1,4 @@
t2775.scala:1: error: cannot find class tag for element type B.this.T
trait B[S] { type T = S; val c = new Array[T](1) }
^
one error found
t2775.scala:1: error: cannot find array tag for element type B.this.T
trait B[S] { type T = S; val c = new Array[T](1) }
^
one error found

0 comments on commit 717766a

Please sign in to comment.