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

Merge pull request #1113 from retronym/ticket/si-8263 

Scala 2.11 compatibility
This commit is contained in:
Grzegorz Kossakowski 2014-02-12 14:05:47 +01:00
parent 4d7dccb02e 10ed229004
commit 62072ebcca
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/appmacro/src/main/scala/sbt/appmacro/KListBuilder.scala
View File

@ -24,7 +24,7 @@ object KListBuilder extends TupleBuilder
val kconsTC: Type = kconsTpe.typeConstructor val kconsTC: Type = kconsTpe.typeConstructor
/** This is the L in the type function [L[x]] ... */ /** This is the L in the type function [L[x]] ... */
val tcVariable: TypeSymbol = newTCVariable(NoSymbol) val tcVariable: TypeSymbol = newTCVariable(util.initialOwner)
/** Instantiates KCons[h, t <: KList[L], L], where L is the type constructor variable */ /** Instantiates KCons[h, t <: KList[L], L], where L is the type constructor variable */
def kconsType(h: Type, t: Type): Type = def kconsType(h: Type, t: Type): Type =
@ -65,4 +65,4 @@ object KListBuilder extends TupleBuilder
val alistInstance: ctx.universe.Tree = TypeApply(select(Ident(alist), "klist"), TypeTree(representationC) :: Nil) val alistInstance: ctx.universe.Tree = TypeApply(select(Ident(alist), "klist"), TypeTree(representationC) :: Nil)
def extract(param: ValDef) = bindKList(param, Nil, inputs.map(_.local)) def extract(param: ValDef) = bindKList(param, Nil, inputs.map(_.local))
} }
} }

2
util/appmacro/src/main/scala/sbt/appmacro/TupleNBuilder.scala
View File

@ -25,7 +25,7 @@ object TupleNBuilder extends TupleBuilder
val ctx: c.type = c val ctx: c.type = c
val representationC: PolyType = { val representationC: PolyType = {
val tcVariable: Symbol = newTCVariable(NoSymbol) val tcVariable: Symbol = newTCVariable(util.initialOwner)
val tupleTypeArgs = inputs.map(in => typeRef(NoPrefix, tcVariable, in.tpe :: Nil).asInstanceOf[global.Type]) val tupleTypeArgs = inputs.map(in => typeRef(NoPrefix, tcVariable, in.tpe :: Nil).asInstanceOf[global.Type])
val tuple = global.definitions.tupleType(tupleTypeArgs) val tuple = global.definitions.tupleType(tupleTypeArgs)
PolyType(tcVariable :: Nil, tuple.asInstanceOf[Type] ) PolyType(tcVariable :: Nil, tuple.asInstanceOf[Type] )