diff options
| author | Markus Roberts <Markus@reality.com> | 2009-11-23 10:03:47 -0800 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | 30f49bb28fd0b2bb771ed3fa75a2d70dbda361f3 (patch) | |
| tree | 9b92fbc3230024dc65114282f6b601871b141e96 /lib | |
| parent | b7015d7610497f113479fad5f360aa5e03a458c5 (diff) | |
| download | puppet-30f49bb28fd0b2bb771ed3fa75a2d70dbda361f3.tar.gz puppet-30f49bb28fd0b2bb771ed3fa75a2d70dbda361f3.tar.xz puppet-30f49bb28fd0b2bb771ed3fa75a2d70dbda361f3.zip | |
Resolving conflicts with ???
Brice's hash implementation introduces new occurances of SQTEXT/DQTEXT which, with
string interpolation, should simply be STRING.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/parser/grammar.ra | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra index 79bc2b079..1e8a39940 100644 --- a/lib/puppet/parser/grammar.ra +++ b/lib/puppet/parser/grammar.ra @@ -822,9 +822,8 @@ hashpair: key FARROW rvalue { result = ast AST::ASTHash, { :value => { val[0] => val[2] } } } -key: NAME { result = val[0][:value] } - | SQTEXT { result = val[0][:value] } - | DQTEXT { result = val[0][:value] } +key: NAME { result = val[0][:value] } + | STRING { result = val[0][:value] } hasharrayaccess: VARIABLE LBRACK rvalue RBRACK { result = ast AST::HashOrArrayAccess, :variable => val[0][:value], :key => val[2] |