Applying a modified form of the patch by cstorey from #523. The modifications were mostly around the fact that Strscan does not set $1 and its ilk.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2239 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 2 insertions, 4 deletions

diff --git a/lib/puppet/parser/ast/leaf.rb b/lib/puppet/parser/ast/leaf.rb
index 298c0168f..ed02c4eef 100644
--- a/lib/puppet/parser/ast/leaf.rb
+++ b/lib/puppet/parser/ast/leaf.rb
@@ -41,14 +41,12 @@ class Puppet::Parser::AST
         # Interpolate the string looking for variables, and then return
         # the result.
         def evaluate(hash)
-            return hash[:scope].strinterp(@value)
+            return hash[:scope].strinterp(@value, @file, @line)
         end
     end
 
-    # The base string class.
+    # An uninterpreted string.
     class FlatString < AST::Leaf
-        # Interpolate the string looking for variables, and then return
-        # the result.
         def evaluate(hash)
             return @value
         end