diff options
| author | Brice Figureau <brice-puppet@daysofwonder.com> | 2008-10-16 22:02:37 +0200 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-10-21 21:15:53 +1100 |
| commit | 6d05cbc1e1a22d4316e18fb22d5cff9c7a42d3cf (patch) | |
| tree | f0e7be01442451f10574e9499268c2012be81988 /lib/puppet/parser/grammar.ra | |
| parent | ec2b4619d3c90b09e1b9fda0020552d5a2d6061f (diff) | |
| download | puppet-6d05cbc1e1a22d4316e18fb22d5cff9c7a42d3cf.tar.gz puppet-6d05cbc1e1a22d4316e18fb22d5cff9c7a42d3cf.tar.xz puppet-6d05cbc1e1a22d4316e18fb22d5cff9c7a42d3cf.zip | |
Fix #936 - Allow trailing comma in array definition
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
Diffstat (limited to 'lib/puppet/parser/grammar.ra')
| -rw-r--r-- | lib/puppet/parser/grammar.ra | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra index 0a85c2c42..23c2934b9 100644 --- a/lib/puppet/parser/grammar.ra +++ b/lib/puppet/parser/grammar.ra @@ -703,6 +703,13 @@ array: LBRACK rvalues RBRACK { else result = ast AST::ASTArray, :children => [val[1]] end +} + | LBRACK rvalues COMMA RBRACK { + if val[1].instance_of?(AST::ASTArray) + result = val[1] + else + result = ast AST::ASTArray, :children => [val[1]] + end } | LBRACK RBRACK { result = ast AST::ASTArray } |