diff options
| -rw-r--r-- | lib/puppet/parser/scope.rb | 2 | ||||
| -rwxr-xr-x | test/language/scope.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb index 02192c572..25a6551af 100644 --- a/lib/puppet/parser/scope.rb +++ b/lib/puppet/parser/scope.rb @@ -604,6 +604,8 @@ class Puppet::Parser::Scope end elsif ss.scan(/^\$/) out << '$' + elsif ss.scan(/^\\\n/) # an escaped carriage return + next else tmp = ss.scan(/[^\\$]+/) # Puppet.debug("Got other: pos:%d; m:%s" % [ss.pos, tmp]) diff --git a/test/language/scope.rb b/test/language/scope.rb index c58719e79..610375f0d 100755 --- a/test/language/scope.rb +++ b/test/language/scope.rb @@ -288,6 +288,7 @@ class TestScope < Test::Unit::TestCase '$test string' => "value string", 'a testing $' => "a testing $", 'a testing \$' => "a testing $", + "an escaped \\\n carriage return" => "an escaped carriage return", '\$' => "$", '\s' => "\s", '\t' => "\t", |