Sass changes for Ruby 1.9 compatibility.

lib/sass/script/funcall.rb

@@ -20,7 +20,7 @@ module Sass
 
         return Functions.send(name, *args)
       rescue ArgumentError => e
-        raise e unless e.backtrace.first =~ /:in `#{name}'$/
+        raise e unless e.backtrace.first =~ /:in `(#{name}|perform)'$/
         raise Sass::SyntaxError.new("#{e.message} for `#{name}'")
       end
     end

test/test_helper.rb

@@ -15,7 +15,7 @@ end
 class Test::Unit::TestCase
   def munge_filename(opts)
     return if opts[:filename]
-    test_name = caller[1].gsub(/^.*`(.*)'.*$/, '\1')
+    test_name = caller[1].gsub(/^.*`(?:\w+ )*(\w+)'.*$/, '\1')
     opts[:filename] = "#{test_name}_inline.sass"
   end
 end