aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsienkiew <sienkiew@d34015c8-bcbb-4646-8ac8-8ba5febf221d>2012-06-28 16:51:06 -0400
committersienkiew <sienkiew@d34015c8-bcbb-4646-8ac8-8ba5febf221d>2012-06-28 16:51:06 -0400
commitbd5d4684321ec15df3aa4c48cdcce78fbdc1f0e9 (patch)
treed5d0e6e4162714f08f8be15a4dff5406cf2506d6
parent02f515d65f34e9d30df6d21d332e7da110de61ae (diff)
downloadsteuermann-bd5d4684321ec15df3aa4c48cdcce78fbdc1f0e9.tar.gz
non-conditional hostgroups; nested hostgroups
git-svn-id: https://svn.stsci.edu/svn/ssb/etal/steuermann/trunk@736 d34015c8-bcbb-4646-8ac8-8ba5febf221d
-rw-r--r--steuermann/specfile.exy12
1 files changed, 8 insertions, 4 deletions
diff --git a/steuermann/specfile.exy b/steuermann/specfile.exy
index 4353069..73a5b20 100644
--- a/steuermann/specfile.exy
+++ b/steuermann/specfile.exy
@@ -55,14 +55,18 @@ parser specfile:
##
rule hostgroup_def :
HOSTGROUP hostgroup {{ nodes.define_hostgroup( hostgroup) }}
- ( hostgroup_if<<hostgroup>> )+
+ ( hostgroup_front<<hostgroup>> hostgroup_back<<hostgroup,hostgroup_front>> )+
- rule hostgroup_if<<hg>> :
+ rule hostgroup_front<<hg>> :
IF name
- {{ accept_nodes = nodes.check_condition(name, self._scanner.filename ) }}
+ {{ return nodes.check_condition(name, self._scanner.filename ) }}
+ | {{ return True }}
+
+ rule hostgroup_back<<hg,accept_nodes>> :
COLON (
name {{ if accept_nodes : nodes.add_hostgroup( hg, name ) }}
- )+
+ | hostgroup {{ if accept_nodes : nodes.add_hostgroup( hg, hostgroup ) }}
+ )*
rule command_list:
# one or more commands, appended together into a list