From a6d3850e69e35f166407a469b580634439d05385 Mon Sep 17 00:00:00 2001
From: Chris Eppstein <chris@eppsteins.net>
Date: Fri, 6 Feb 2009 02:41:47 -0800
Subject: [PATCH] Sass changes for Ruby 1.9 compatibility.

---
 lib/sass/script/funcall.rb | 2 +-
 test/test_helper.rb        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/sass/script/funcall.rb b/lib/sass/script/funcall.rb
index 919fc8da..dbb13c0c 100644
--- a/lib/sass/script/funcall.rb
+++ b/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
diff --git a/test/test_helper.rb b/test/test_helper.rb
index aa5342df..44f2967d 100644
--- a/test/test_helper.rb
+++ b/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