API extraction: handle any type that is annotated, not just the spec'd simple type. Fixes #559.

compile/api/SameAPI.scala

@@ -325,7 +325,7 @@ class SameAPI(includePrivate: Boolean, includeParamNames: Boolean)
 		sameTypeParameters(a.parameters, b.parameters) &&
 		sameType(a.baseType, b.baseType)
 	def sameAnnotatedType(a: Annotated, b: Annotated): Boolean =
-		sameSimpleType(a.baseType, b.baseType) &&
+		sameType(a.baseType, b.baseType) &&
 		sameAnnotations(a.annotations, b.annotations)
 	def sameStructure(a: Structure, b: Structure): Boolean =
 		samePending(a,b)(sameStructureDirect)

compile/interface/API.scala

@@ -134,7 +134,7 @@ final class API(val global: CallbackGlobal) extends Compat
 			if(a.assocs.isEmpty) Array(new xsbti.api.AnnotationArgument("", a.args.mkString("(", ",", ")"))) // what else to do with a Tree?
 			else a.assocs.map { case (name, value) => new xsbti.api.AnnotationArgument(name.toString, value.toString) }.toArray[xsbti.api.AnnotationArgument]
 		)
-	private def annotated(in: Symbol, as: List[AnnotationInfo], tpe: Type) = new xsbti.api.Annotated(simpleType(in, tpe), annotations(in, as))
+	private def annotated(in: Symbol, as: List[AnnotationInfo], tpe: Type) = new xsbti.api.Annotated(processType(in, tpe), annotations(in, as))
 
 	private def viewer(s: Symbol) = (if(s.isModule) s.moduleClass else s).thisType
 	private def printMember(label: String, in: Symbol, t: Type) = println(label + " in " + in + " : " + t + " (debug: " + debugString(t) + " )")

compile/persist/APIFormats.scala

@@ -50,7 +50,7 @@ trait APIFormats extends FormatExtra
 	implicit def formatSource(implicit pa: Format[Array[Package]], da: Format[Array[Definition]]): Format[SourceAPI] =
 		p2( (s: SourceAPI) => (s.packages, s.definitions))( (p, d) => new SourceAPI(p, d) )(pa, da)
 
-	implicit def formatAnnotated(implicit t: Format[SimpleType], as: Format[Array[Annotation]]): Format[Annotated] =
+	implicit def formatAnnotated(implicit t: Format[Type], as: Format[Array[Annotation]]): Format[Annotated] =
 		p2( (a: Annotated) => (a.baseType,a.annotations))(new Annotated(_,_))(t,as)
 
 	implicit def formatPolymorphic(implicit t: Format[Type], tps: Format[Array[TypeParameter]]): Format[Polymorphic] =

interface/type

@@ -16,7 +16,7 @@ Type
 		baseType: Type
 		value: String
 	Annotated
-		baseType : SimpleType
+		baseType : Type
 		annotations : Annotation*
 	Structure
 		parents : ~Type*

sbt/src/sbt-test/source-dependencies/continuations/Foo.scala

@@ -0,0 +1,3 @@
+trait Foo
+trait BarA
+trait BarB

sbt/src/sbt-test/source-dependencies/continuations/Use.scala

@@ -0,0 +1,6 @@
+import scala.util.continuations._
+
+class Use {
+  val a = new Baz
+  def bar: (Foo with BarA) @cpsParam[Unit, Unit] = a.foo
+}

sbt/src/sbt-test/source-dependencies/continuations/build.sbt

@@ -0,0 +1,7 @@
+autoCompilerPlugins := true
+
+addCompilerPlugin("org.scala-lang.plugins" % "continuations" % "2.9.2")
+
+scalaVersion := "2.9.2"
+
+scalacOptions += "-P:continuations:enable"

sbt/src/sbt-test/source-dependencies/continuations/changes/Def1.scala

@@ -0,0 +1,5 @@
+import scala.util.continuations._
+
+class Baz {
+  def foo = shiftUnit[Foo with BarA, Unit, Unit](null)
+}

sbt/src/sbt-test/source-dependencies/continuations/changes/Def2.scala

@@ -0,0 +1,5 @@
+import scala.util.continuations._
+
+class Baz {
+  def foo = shiftUnit[Foo with BarB, Unit, Unit](null)
+}

sbt/src/sbt-test/source-dependencies/continuations/test

@@ -0,0 +1,10 @@
+# Compile code with a type (Foo with BarA) @cpsParam...
+# The spec says only simple types can be annotated, but scalac allows any type.
+$ copy-file changes/Def1.scala Def.scala
+> compile
+
+# To ensure it was properly processed, change it to (Foo with BarB) @cpsParam...
+# This should invalidate Use.scala, which expects it to be BarA and so compilation should fail.
+$ delete Def.scala
+$ copy-file changes/Def2.scala Def.scala
+-> compile