From a3a81dc26eefff7e2794d050645bc278dd23c925 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Mon, 14 Feb 2011 18:58:20 -0500 Subject: [PATCH] fix issue in API comparison where ordering was required but not done --- compile/inc/Incremental.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compile/inc/Incremental.scala b/compile/inc/Incremental.scala index 33fb0ebe9..f94f647ed 100644 --- a/compile/inc/Incremental.scala +++ b/compile/inc/Incremental.scala @@ -15,6 +15,7 @@ object Incremental def compile(sources: Set[File], entry: String => Option[File], previous: Analysis, current: ReadStamps, forEntry: File => Option[Analysis], doCompile: Set[File] => Analysis)(implicit equivS: Equiv[Stamp]): (Boolean, Analysis) = { val initialChanges = changedInitial(entry, sources, previous, current, forEntry) + println("Initial changes: " + initialChanges) val initialInv = invalidateInitial(previous.relations, initialChanges) println("Initially invalidated: " + initialInv) val analysis = cycle(initialInv, previous, doCompile) @@ -49,8 +50,8 @@ object Incremental */ def changedIncremental[T](lastSources: collection.Set[T], oldAPI: T => Source, newAPI: T => Source): APIChanges[T] = { - val oldApis = lastSources map oldAPI - val newApis = lastSources map newAPI + val oldApis = lastSources.toSeq map oldAPI + val newApis = lastSources.toSeq map newAPI for(api <- newApis; definition <- api.definitions) { println(xsbt.api.DefaultShowAPI(definition)) } val changes = (lastSources, oldApis, newApis).zipped.filter { (src, oldApi, newApi) => !SameAPI(oldApi, newApi) }