Mouse::Util::does_role() respects $thing->does() method

[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 8b50f82..3611392 100644 (file)
--- a/lib/Mouse/Meta/Method/Destructor.pm
+++ b/lib/Mouse/Meta/Method/Destructor.pm
@@ -1,39 +1,51 @@
 package Mouse::Meta::Method::Destructor;
 use Mouse::Util qw(:meta); # enables strict and warnings
 
+use constant _MOUSE_DEBUG => $ENV{MOUSE_DEBUG} ? 1 : 0;
+
 sub _generate_destructor{
     my (undef, $metaclass) = @_;
 
     my $demolishall = '';
     for my $class ($metaclass->linearized_isa) {
         if (Mouse::Util::get_code_ref($class, 'DEMOLISH')) {
-            $demolishall .= sprintf "%s::DEMOLISH(\$self, \$Mouse::Util::in_global_destruction);\n",
-                $class,
+            $demolishall .= '                ' . $class
+                . '::DEMOLISH($self, $Mouse::Util::in_global_destruction);'
+                . "\n",
         }
     }
 
-    my $name   = $metaclass->name;
-    my $source = sprintf(<<'EOT', __LINE__, __FILE__, $name, $demolishall);
-#line %d %s
-    package %s;
-    sub {
-        my $self = shift;
-        return $self->Mouse::Object::DESTROY()
-            if ref($self) ne __PACKAGE__;
+    if($demolishall) {
+        $demolishall = sprintf <<'EOT', $demolishall;
         my $e = do{
             local $?;
             local $@;
             eval{
-                # demolishall
                 %s;
             };
             $@;
         };
         no warnings 'misc';
         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{
         local $@;
@@ -53,7 +65,7 @@ Mouse::Meta::Method::Destructor - A Mouse method generator for destructors
 
 =head1 VERSION
 
-This document describes Mouse version 0.73
+This document describes Mouse version 0.95
 
 =head1 SEE ALSO