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=7775a14f76befc309917f596dfc607fa170215f9;hp=783e6d39c856faa1dbb1be04ebe639f65ecaf229;hb=380e1cd7159fdf0efd57348736ca901825e1e4e8;hpb=cd00d876826ae9df767871dea63aa7f77be0603d

diff --git a/lib/Mouse/Meta/Method/Destructor.pm b/lib/Mouse/Meta/Method/Destructor.pm
index 783e6d3..7775a14 100644
--- a/lib/Mouse/Meta/Method/Destructor.pm
+++ b/lib/Mouse/Meta/Method/Destructor.pm
@@ -1,42 +1,38 @@
 package Mouse::Meta::Method::Destructor;
 use Mouse::Util; # enables strict and warnings
 
-sub _empty_destroy{ }
+sub _empty_DESTROY{ }
 
-sub _generate_destructor_method {
-    my ($class, $metaclass) = @_;
+sub _generate_destructor{
+    my (undef, $metaclass) = @_;
 
-    my $demolishall = do {
-        if ($metaclass->name->can('DEMOLISH')) {
-            my @code = ();
-            for my $class ($metaclass->linearized_isa) {
-                no strict 'refs';
-                if (*{$class . '::DEMOLISH'}{CODE}) {
-                    push @code, "${class}::DEMOLISH(\$self);";
-                }
-            }
-            join "\n", @code;
-        } else {
-            $metaclass->add_method(DESTROY => \&_empty_destroy);
-            return;
+    if(!$metaclass->name->can('DEMOLISH')){
+        return \&_empty_DESTROY;
+    }
+
+    my $demolishall = '';
+    for my $class ($metaclass->linearized_isa) {
+        no strict 'refs';
+        if (*{$class . '::DEMOLISH'}{CODE}) {
+            $demolishall .= "${class}::DEMOLISH(\$self);\n";
         }
-    };
+    }
 
-    my $destructor_name = $metaclass->name . '::DESTROY';
     my $source = sprintf("#line %d %s\n", __LINE__, __FILE__) . <<"...";
-    sub $destructor_name \{
+    sub {
         my \$self = shift;
         $demolishall;
     }
 ...
 
+    my $code;
     my $e = do{
         local $@;
-        eval $source;
+        $code = eval $source;
         $@;
     };
     die $e if $e;
-    return;
+    return $code;
 }
 
 1;