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

fixes for API extraction phase 

correct order of value parameters of a method
preserve source order of members
more information for unknown type error message
This commit is contained in:
Mark Harrah 2010-09-17 21:30:47 -04:00
parent 4db2c1df6a
commit ccf9714b4d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compile/interface/API.scala
View File

@ -65,7 +65,7 @@ final class API(val global: Global, val callback: xsbti.AnalysisCallback) extend
{ {
if(sym.isLocalClass) Constants.emptyType if(sym.isLocalClass) Constants.emptyType
else if(sym.isTypeParameterOrSkolem || isExistential(sym)) new xsbti.api.ParameterRef(sym.id) else if(sym.isTypeParameterOrSkolem || isExistential(sym)) new xsbti.api.ParameterRef(sym.id)
else error("Unknown prefixless type: " + sym) else error("Unknown prefixless type: " + sym + " in " + sym.owner + " in class " + sym.enclClass)
} }
else if(sym.isRoot || sym.isRootPackage) Constants.emptyType else if(sym.isRoot || sym.isRootPackage) Constants.emptyType
else new xsbti.api.Projection(simpleType(pre), sym.nameString) else new xsbti.api.Projection(simpleType(pre), sym.nameString)
@ -104,7 +104,7 @@ final class API(val global: Global, val callback: xsbti.AnalysisCallback) extend
case MethodType(params, resultType) => // in 2.7, params is of type List[Type], in 2.8 it is List[Symbol] case MethodType(params, resultType) => // in 2.7, params is of type List[Type], in 2.8 it is List[Symbol]
build(resultType, typeParams, (params: xsbti.api.ParameterList) :: valueParameters) build(resultType, typeParams, (params: xsbti.api.ParameterList) :: valueParameters)
case returnType => case returnType =>
new xsbti.api.Def(valueParameters.toArray, processType(returnType), typeParams, simpleName(s), getAccess(s), getModifiers(s), annotations(s)) new xsbti.api.Def(valueParameters.reverse.toArray, processType(returnType), typeParams, simpleName(s), getAccess(s), getModifiers(s), annotations(s))
} }
} }
def parameterS(s: Symbol): xsbti.api.MethodParameter = makeParameter(s.nameString, s.info, s.info.typeSymbol) def parameterS(s: Symbol): xsbti.api.MethodParameter = makeParameter(s.nameString, s.info, s.info.typeSymbol)
@ -162,7 +162,7 @@ final class API(val global: Global, val callback: xsbti.AnalysisCallback) extend
private def structure(info: Type): xsbti.api.Structure = private def structure(info: Type): xsbti.api.Structure =
{ {
val s = info.typeSymbol val s = info.typeSymbol
val (declared, inherited) = info.members.partition(_.owner == s) val (declared, inherited) = info.members.reverse.partition(_.owner == s)
// would be nice to know how to do this properly: // would be nice to know how to do this properly:
// baseClasses contains symbols in proper linearization order, but tpe doesn't have type parameters applied // baseClasses contains symbols in proper linearization order, but tpe doesn't have type parameters applied
// baseTypeSeq contains the types with parameters properly applied // baseTypeSeq contains the types with parameters properly applied