diff options
| -rw-r--r-- | lib/puppet/parser/lexer.rb | 5 | ||||
| -rwxr-xr-x | spec/unit/parser/lexer.rb | 4 | ||||
| -rw-r--r-- | test/data/snippets/multilinecomments.pp | 4 |
3 files changed, 12 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 diff --git a/spec/unit/parser/lexer.rb b/spec/unit/parser/lexer.rb index 2946c4152..2952b73c8 100755 --- a/spec/unit/parser/lexer.rb +++ b/spec/unit/parser/lexer.rb @@ -472,6 +472,10 @@ describe Puppet::Parser::Lexer, "when lexing comments" do @lexer.getcomment.should == "2\n" end + it "should skip whitespace before lexing the next token after a non-token" do + @lexer.string = "/* 1\n\n */ \ntest" + @lexer.fullscan.include?([:NAME, "test"]).should be_true + end end # FIXME: We need to rewrite all of these tests, but I just don't want to take the time right now. diff --git a/test/data/snippets/multilinecomments.pp b/test/data/snippets/multilinecomments.pp index b20ce1d9d..f9819c020 100644 --- a/test/data/snippets/multilinecomments.pp +++ b/test/data/snippets/multilinecomments.pp @@ -4,3 +4,7 @@ file { "/tmp/multilinecomments": content => "pouet" } */ + +/* and another one for #2333, the whitespace after the +end comment is here on purpose */ + |