From ba4c6de918e2bf9108fcb9ac8a7ca986d9ddd551 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sat, 1 Oct 2011 14:39:40 -0400 Subject: [PATCH] generalize addArtifact arguments to Initialize[...]. fixes #207 --- util/collection/Settings.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/util/collection/Settings.scala b/util/collection/Settings.scala index ef30f854f..c4743eb83 100644 --- a/util/collection/Settings.scala +++ b/util/collection/Settings.scala @@ -198,19 +198,19 @@ trait Init[Scope] def flattenLocals(compiled: CompiledMap): Map[ScopedKey[_],Flattened] = { import collection.breakOut - val locals = compiled.flatMap { case (key, comp) => if(key.key.isLocal) Seq[Compiled[_]](comp) else Nil }(breakOut) + val locals = compiled flatMap { case (key, comp) => if(key.key.isLocal) Seq[Compiled[_]](comp) else Nil } val ordered = Dag.topologicalSort(locals)(_.dependencies.flatMap(dep => if(dep.key.isLocal) Seq[Compiled[_]](compiled(dep)) else Nil)) def flatten(cmap: Map[ScopedKey[_],Flattened], key: ScopedKey[_], deps: Iterable[ScopedKey[_]]): Flattened = new Flattened(key, deps.flatMap(dep => if(dep.key.isLocal) cmap(dep).dependencies else dep :: Nil)) val empty = Map.empty[ScopedKey[_],Flattened] val flattenedLocals = (empty /: ordered) { (cmap, c) => cmap.updated(c.key, flatten(cmap, c.key, c.dependencies)) } - compiled.flatMap{ case (key, comp) => + compiled flatMap{ case (key, comp) => if(key.key.isLocal) Nil else Seq[ (ScopedKey[_], Flattened)]( (key, flatten(flattenedLocals, key, comp.dependencies)) ) - }(breakOut) + } } sealed trait Initialize[T]