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

allow task axis to be specified when the setting has no instances with it specified. fixes #121

This commit is contained in:
Mark Harrah 2011-07-24 22:35:27 -04:00
parent d4c76b0d0e
commit a1dc17b2c6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/Act.scala
View File

@ -72,7 +72,7 @@ object Act
def taskExtrasParser(tasks: Set[AttributeKey[_]], knownKeys: Map[String, AttributeKey[_]], knownValues: IMap[AttributeKey, Set]): Parser[(ScopeAxis[AttributeKey[_]], ScopeAxis[AttributeMap])] = def taskExtrasParser(tasks: Set[AttributeKey[_]], knownKeys: Map[String, AttributeKey[_]], knownValues: IMap[AttributeKey, Set]): Parser[(ScopeAxis[AttributeKey[_]], ScopeAxis[AttributeMap])] =
{ {
val extras = extrasParser(knownKeys, knownValues) val extras = extrasParser(knownKeys, knownValues)
val taskParser = if(tasks.isEmpty) success(Global) else optionalAxis(taskAxisParser(tasks, knownKeys), Global) val taskParser = optionalAxis(taskAxisParser(tasks, knownKeys), Global)
val taskAndExtra = val taskAndExtra =
taskParser flatMap { taskAxis => taskParser flatMap { taskAxis =>
if(taskAxis.isSelect) if(taskAxis.isSelect)
@ -80,7 +80,7 @@ object Act
else else
extras map { x => (taskAxis, Select(x)) } extras map { x => (taskAxis, Select(x)) }
} }
val base = token('(') ~> taskAndExtra <~ token(')') val base = token('(', hide = tasks.isEmpty) ~> taskAndExtra <~ token(')')
base ?? ( (Global, Global) ) base ?? ( (Global, Global) )
} }