diff options
| author | Daniel Pittman <daniel@rimspace.net> | 2011-02-12 15:51:30 -0800 |
|---|---|---|
| committer | Daniel Pittman <daniel@rimspace.net> | 2011-02-12 15:51:30 -0800 |
| commit | a0d320439c72f7b7969cd51b33a8db141eb9a599 (patch) | |
| tree | e13fe264ee0cb2f4e5fdc8dbafae3f3773d17d5e /lib/puppet/parser/grammar.ra | |
| parent | 98f79dc2e44502bf781dbce180762b892859d4e1 (diff) | |
| parent | c373b6272ddd4daabf15d1b459ef3e86072e3f26 (diff) | |
| download | puppet-a0d320439c72f7b7969cd51b33a8db141eb9a599.tar.gz puppet-a0d320439c72f7b7969cd51b33a8db141eb9a599.tar.xz puppet-a0d320439c72f7b7969cd51b33a8db141eb9a599.zip | |
(Fixes #6269) merge changes from masterzen that resolve the issue.
parser.rb manually rebuilt to resolve global grammer chances.
Diffstat (limited to 'lib/puppet/parser/grammar.ra')
| -rw-r--r-- | lib/puppet/parser/grammar.ra | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra index 3a386d89a..98b8cfcfb 100644 --- a/lib/puppet/parser/grammar.ra +++ b/lib/puppet/parser/grammar.ra @@ -845,7 +845,7 @@ hasharrayaccess: VARIABLE LBRACK rvalue RBRACK { } hasharrayaccesses: hasharrayaccess - | hasharrayaccess LBRACK rvalue RBRACK { + | hasharrayaccesses LBRACK rvalue RBRACK { result = ast AST::HashOrArrayAccess, :variable => val[0], :key => val[2] } |