diff options
author | Brice Figureau <brice-puppet@daysofwonder.com> | 2009-06-12 13:40:15 +0200 |
---|---|---|
committer | James Turnbull <james@lovedthanlost.net> | 2009-06-12 22:52:29 +1000 |
commit | d3323331e96cbc79563febc249e106a3ae8e7647 (patch) | |
tree | 648a221994ab28725c6e61b36ed26c7ee8820bea /lib | |
parent | 5fbf63ce789b015da9abb95d7e9fbbf4a44ba7d1 (diff) | |
download | puppet-d3323331e96cbc79563febc249e106a3ae8e7647.tar.gz puppet-d3323331e96cbc79563febc249e106a3ae8e7647.tar.xz puppet-d3323331e96cbc79563febc249e106a3ae8e7647.zip |
Fix #2333 - Make sure lexer skip whitespace on non-token
Comments and multi-line comments produces no token per-se during
lexing, so the lexer loops to find another token.
The issue was that we were not skipping whitespace after finding
such non-token.
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/puppet/parser/lexer.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/puppet/parser/lexer.rb b/lib/puppet/parser/lexer.rb index 8bbcb84fb..6884e687e 100644 --- a/lib/puppet/parser/lexer.rb +++ b/lib/puppet/parser/lexer.rb @@ -417,7 +417,10 @@ class Puppet::Parser::Lexer final_token, value = munge_token(matched_token, value) - next unless final_token + unless final_token + skip() + next + end if match = @@pairs[value] and final_token.name != :DQUOTE and final_token.name != :SQUOTE @expected << match |