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

tailrec annotation and shorten constant name in Watched

This commit is contained in:
Mark Harrah 2010-09-21 22:02:26 -04:00
parent 805e6c1338
commit e0ac454f65
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/Watched.scala
View File

@ -4,6 +4,7 @@
package sbt package sbt
import CommandSupport.FailureWall import CommandSupport.FailureWall
import annotation.tailrec
trait Watched trait Watched
{ {
@ -15,21 +16,21 @@ trait Watched
object Watched object Watched
{ {
val ContinuousCompilePollDelaySeconds = 1 val PollDelaySeconds = 1
def isEnter(key: Int): Boolean = key == 10 || key == 13 def isEnter(key: Int): Boolean = key == 10 || key == 13
def watched(p: Project): Seq[Watched] = MultiProject.topologicalSort(p).collect { case w: Watched => w } def watched(p: Project): Seq[Watched] = MultiProject.topologicalSort(p).collect { case w: Watched => w }
def sourcePaths(p: Project): PathFinder = (Path.emptyPathFinder /: watched(p))(_ +++ _.watchPaths) def sourcePaths(p: Project): PathFinder = (Path.emptyPathFinder /: watched(p))(_ +++ _.watchPaths)
def executeContinuously(project: Project with Watched, s: State, in: Input): State = def executeContinuously(project: Project with Watched, s: State, in: Input): State =
{ {
def shouldTerminate: Boolean = (System.in.available > 0) && (project.terminateWatch(System.in.read()) || shouldTerminate) @tailrec def shouldTerminate: Boolean = (System.in.available > 0) && (project.terminateWatch(System.in.read()) || shouldTerminate)
val sourcesFinder = sourcePaths(project) val sourcesFinder = sourcePaths(project)
val watchState = s get ContinuousState getOrElse WatchState.empty val watchState = s get ContinuousState getOrElse WatchState.empty
if(watchState.count > 0) if(watchState.count > 0)
System.out.println(watchState.count + ". Waiting for source changes... (press enter to interrupt)") System.out.println(watchState.count + ". Waiting for source changes... (press enter to interrupt)")
val (triggered, newWatchState) = SourceModificationWatch.watch(sourcesFinder, ContinuousCompilePollDelaySeconds, watchState)(shouldTerminate) val (triggered, newWatchState) = SourceModificationWatch.watch(sourcesFinder, PollDelaySeconds, watchState)(shouldTerminate)
if(triggered) if(triggered)
(in.arguments :: FailureWall :: in.line :: s).put(ContinuousState, newWatchState) (in.arguments :: FailureWall :: in.line :: s).put(ContinuousState, newWatchState)