X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FMethod%2FDestructor.pm;h=220151a4a4db86be465fc5bcd7d75ecc9e55863c;hb=999072aba606906b12c2f18e0ebde72e224de4dc;hp=81323dca5a7f330873c265f25f8a77cb33e06c99;hpb=8c235ea79c109c704514acd56b10265220499d70;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Meta/Method/Destructor.pm b/lib/Mouse/Meta/Method/Destructor.pm
index 81323dc..220151a 100644
--- a/lib/Mouse/Meta/Method/Destructor.pm
+++ b/lib/Mouse/Meta/Method/Destructor.pm
@@ -1,38 +1,50 @@
 package Mouse::Meta::Method::Destructor;
 use Mouse::Util qw(:meta); # enables strict and warnings
 
-sub _empty_DESTROY{ }
+use constant _MOUSE_DEBUG => !!$ENV{MOUSE_DEBUG};
 
 sub _generate_destructor{
     my (undef, $metaclass) = @_;
 
-    if(!$metaclass->name->can('DEMOLISH')){
-        return \&_empty_DESTROY;
-    }
-
     my $demolishall = '';
     for my $class ($metaclass->linearized_isa) {
         if (Mouse::Util::get_code_ref($class, 'DEMOLISH')) {
-            $demolishall .= "${class}::DEMOLISH(\$self);\n";
+            $demolishall .= '                ' . $class
+                . '::DEMOLISH($self, $Mouse::Util::in_global_destruction);'
+                . "\n",
         }
     }
 
-    my $source = sprintf("#line %d %s\n", __LINE__, __FILE__) . <<"...";
-    sub {
-        my \$self = shift;
-        local \$?;
-
-        my \$e = do{
-            local \$@;
+    if($demolishall) {
+        $demolishall = sprintf <<'EOT', $demolishall;
+        my $e = do{
+            local $?;
+            local $@;
             eval{
-                $demolishall;
+                %s;
             };
-            \$@;
+            $@;
         };
         no warnings 'misc';
-        die \$e if \$e; # rethrow
+        die $e if $e; # rethrow
+EOT
     }
-...
+
+    my $name   = $metaclass->name;
+    my $source = sprintf(<<'EOT', __FILE__, $name, $demolishall);
+#line 1 "%s"
+    package %s;
+    sub {
+        my($self) = @_;
+        return $self->Mouse::Object::DESTROY()
+            if ref($self) ne __PACKAGE__;
+        # DEMOLISHALL
+        %s;
+        return;
+    }
+EOT
+
+    warn $source if _MOUSE_DEBUG;
 
     my $code;
     my $e = do{
@@ -53,7 +65,7 @@ Mouse::Meta::Method::Destructor - A Mouse method generator for destructors
 
 =head1 VERSION
 
-This document describes Mouse version 0.46
+This document describes Mouse version 0.82
 
 =head1 SEE ALSO