luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2414 from smarter/fix/duplicate-defs 

[0.13.10] ExtractAPI: avoid unnecessary duplication of defs with primitive types
This commit is contained in:
Martin Duhem 2016-01-25 09:26:29 +01:00
parent 03524e3329 726b5c8a30
commit e966329776
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compile/interface/src/main/scala/xsbt/Compat.scala
View File

@ -107,8 +107,8 @@ abstract class Compat {
} }
lazy val AnyValClass = global.rootMirror.getClassIfDefined("scala.AnyVal") lazy val AnyValClass = global.rootMirror.getClassIfDefined("scala.AnyVal")
def isAnyValSubtype(sym: Symbol): Boolean = sym.isNonBottomSubClass(AnyValClass) def isDerivedValueClass(sym: Symbol): Boolean =
sym.isNonBottomSubClass(AnyValClass) && !definitions.ScalaValueClasses.contains(sym)
} }
object MacroExpansionOf { object MacroExpansionOf {

4
compile/interface/src/main/scala/xsbt/ExtractAPI.scala
View File

@ -205,14 +205,14 @@ class ExtractAPI[GlobalType <: CallbackGlobal](val global: GlobalType,
val hasValueClassAsParameter: Boolean = { val hasValueClassAsParameter: Boolean = {
import MirrorHelper._ import MirrorHelper._
s.asMethod.paramss.flatten map (_.info) exists (t => isAnyValSubtype(t.typeSymbol)) s.asMethod.paramss.flatten map (_.info) exists (t => isDerivedValueClass(t.typeSymbol))
} }
def hasValueClassAsReturnType(tpe: Type): Boolean = tpe match { def hasValueClassAsReturnType(tpe: Type): Boolean = tpe match {
case PolyType(_, base) => hasValueClassAsReturnType(base) case PolyType(_, base) => hasValueClassAsReturnType(base)
case MethodType(_, resultType) => hasValueClassAsReturnType(resultType) case MethodType(_, resultType) => hasValueClassAsReturnType(resultType)
case Nullary(resultType) => hasValueClassAsReturnType(resultType) case Nullary(resultType) => hasValueClassAsReturnType(resultType)
case resultType => isAnyValSubtype(resultType.typeSymbol) case resultType => isDerivedValueClass(resultType.typeSymbol)
} }
val inspectPostErasure = hasValueClassAsParameter || hasValueClassAsReturnType(viewer(in).memberInfo(s)) val inspectPostErasure = hasValueClassAsParameter || hasValueClassAsReturnType(viewer(in).memberInfo(s))