diff options
Diffstat (limited to 'lib/puppet/parser/lexer.rb')
| -rw-r--r-- | lib/puppet/parser/lexer.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/puppet/parser/lexer.rb b/lib/puppet/parser/lexer.rb index 6884e687e..e296872f9 100644 --- a/lib/puppet/parser/lexer.rb +++ b/lib/puppet/parser/lexer.rb @@ -353,7 +353,7 @@ class Puppet::Parser::Lexer return if token.skip - return token, value + return token, { :value => value, :line => @line } end # Go up one in the namespace. @@ -415,13 +415,15 @@ class Puppet::Parser::Lexer @last_return = false end - final_token, value = munge_token(matched_token, value) + final_token, token_value = munge_token(matched_token, value) unless final_token skip() next end + value = token_value[:value] + if match = @@pairs[value] and final_token.name != :DQUOTE and final_token.name != :SQUOTE @expected << match elsif exp = @expected[-1] and exp == value and final_token.name != :DQUOTE and final_token.name != :SQUOTE @@ -432,7 +434,7 @@ class Puppet::Parser::Lexer commentpush end - yield [final_token.name, value] + yield [final_token.name, token_value] if @previous_token namestack(value) if @previous_token.name == :CLASS |