X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FMethod%2FDestructor.pm;h=db966423c21ecad9b97542f03678c1c0e32cd1d8;hp=60cc49e144b402a63d4a5eaa08577da77be28a7d;hb=70a922201a3b13a22b86ea918f53d3b964c377c7;hpb=06a970ab9fb60a4cac5e3f1774cf9a2914c94cc1

diff --git a/lib/Mouse/Meta/Method/Destructor.pm b/lib/Mouse/Meta/Method/Destructor.pm
index 60cc49e..db96642 100644
--- a/lib/Mouse/Meta/Method/Destructor.pm
+++ b/lib/Mouse/Meta/Method/Destructor.pm
@@ -1,5 +1,5 @@
 package Mouse::Meta::Method::Destructor;
-use Mouse::Util; # enables strict and warnings
+use Mouse::Util qw(:meta); # enables strict and warnings
 
 sub _empty_DESTROY{ }
 
@@ -12,28 +12,29 @@ sub _generate_destructor{
 
     my $demolishall = '';
     for my $class ($metaclass->linearized_isa) {
-        no strict 'refs';
-        if (*{$class . '::DEMOLISH'}{CODE}) {
-            $demolishall .= "${class}::DEMOLISH(\$self);\n";
+        if (Mouse::Util::get_code_ref($class, 'DEMOLISH')) {
+            $demolishall .= sprintf "%s::DEMOLISH(\$self, \$Mouse::Util::in_global_destruction);\n",
+                $class,
         }
     }
 
-    my $source = sprintf("#line %d %s\n", __LINE__, __FILE__) . <<"...";
+    my $source = sprintf(<<'END_DESTROY', __LINE__, __FILE__, $demolishall);
+#line %d %s
     sub {
-        my \$self = shift;
-        local \$?;
-
-        my \$e = do{
-            local \$@;
+        my $self = shift;
+        my $e = do{
+            local $?;
+            local $@;
             eval{
-                $demolishall;
+                # demolishall
+                %s;
             };
-            \$@;
+            $@;
         };
         no warnings 'misc';
-        die \$e if \$e; # rethrow
+        die $e if $e; # rethrow
     }
-...
+END_DESTROY
 
     my $code;
     my $e = do{
@@ -50,11 +51,11 @@ __END__
 
 =head1 NAME
 
-Mouse::Meta::Method::Accessor - A Mouse method generator for destructors
+Mouse::Meta::Method::Destructor - A Mouse method generator for destructors
 
 =head1 VERSION
 
-This document describes Mouse version 0.38
+This document describes Mouse version 0.50_03
 
 =head1 SEE ALSO