From a1dc17b2c60441392f868e4d68f5878ca3dcd51a Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sun, 24 Jul 2011 22:35:27 -0400 Subject: [PATCH] allow task axis to be specified when the setting has no instances with it specified. fixes #121 --- main/Act.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/Act.scala b/main/Act.scala index 08c33dd0a..fb4d43173 100644 --- a/main/Act.scala +++ b/main/Act.scala @@ -72,7 +72,7 @@ object Act def taskExtrasParser(tasks: Set[AttributeKey[_]], knownKeys: Map[String, AttributeKey[_]], knownValues: IMap[AttributeKey, Set]): Parser[(ScopeAxis[AttributeKey[_]], ScopeAxis[AttributeMap])] = { 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 = taskParser flatMap { taskAxis => if(taskAxis.isSelect) @@ -80,7 +80,7 @@ object Act else extras map { x => (taskAxis, Select(x)) } } - val base = token('(') ~> taskAndExtra <~ token(')') + val base = token('(', hide = tasks.isEmpty) ~> taskAndExtra <~ token(')') base ?? ( (Global, Global) ) }