From 30f49bb28fd0b2bb771ed3fa75a2d70dbda361f3 Mon Sep 17 00:00:00 2001 From: Markus Roberts Date: Mon, 23 Nov 2009 10:03:47 -0800 Subject: Resolving conflicts with ??? Brice's hash implementation introduces new occurances of SQTEXT/DQTEXT which, with string interpolation, should simply be STRING. --- lib/puppet/parser/grammar.ra | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lib/puppet/parser') 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] -- cgit