Fix destructor fallbacks in pure Perl

[gitmo/Mouse.git] / lib / Mouse / Meta / Method / Destructor.pm

diff --git a/lib/Mouse/Meta/Method/Destructor.pm b/lib/Mouse/Meta/Method/Destructor.pm
index b91ed2a..7649525 100644 (file)
--- a/lib/Mouse/Meta/Method/Destructor.pm
+++ b/lib/Mouse/Meta/Method/Destructor.pm
@@ -1,15 +1,9 @@
 package Mouse::Meta::Method::Destructor;
 use Mouse::Util qw(:meta); # enables strict and warnings
 
-sub _empty_DESTROY{ }
-
 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')) {
@@ -18,22 +12,27 @@ sub _generate_destructor{
         }
     }
 
-    my $source = sprintf("#line %d %s\n", __LINE__, __FILE__) . <<"...";
+    my $name   = $metaclass->name;
+    my $source = sprintf(<<'EOT', __LINE__, __FILE__, $name, $demolishall);
+#line %d %s
+    package %s;
     sub {
-        my \$self = shift;
-        local \$?;
-
-        my \$e = do{
-            local \$@;
+        my $self = shift;
+        return $self->Mouse::Object::DESTROY()
+            if ref($self) ne __PACKAGE__;
+        my $e = do{
+            local $?;
+            local $@;
             eval{
-                $demolishall;
+                # demolishall
+                %s;
             };
-            \$@;
+            $@;
         };
         no warnings 'misc';
-        die \$e if \$e; # rethrow
+        die $e if $e; # rethrow
     }
-...
+EOT
 
     my $code;
     my $e = do{
@@ -54,7 +53,7 @@ Mouse::Meta::Method::Destructor - A Mouse method generator for destructors
 
 =head1 VERSION
 
-This document describes Mouse version 0.50_02
+This document describes Mouse version 0.71
 
 =head1 SEE ALSO