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=60cc49e144b402a63d4a5eaa08577da77be28a7d;hp=935be3b2b70fce600ee31cb34f9c40cddd121c96;hb=06a970ab9fb60a4cac5e3f1774cf9a2914c94cc1;hpb=0c15085d773ac3c69ac27b4d515895a97bd55b3d

diff --git a/lib/Mouse/Meta/Method/Destructor.pm b/lib/Mouse/Meta/Method/Destructor.pm
index 935be3b..60cc49e 100644
--- a/lib/Mouse/Meta/Method/Destructor.pm
+++ b/lib/Mouse/Meta/Method/Destructor.pm
@@ -1,37 +1,63 @@
 package Mouse::Meta::Method::Destructor;
-use strict;
-use warnings;
-
-sub generate_destructor_method_inline {
-    my ($class, $meta) = @_;
-
-    my $demolishall = do {
-        if ($meta->name->can('DEMOLISH')) {
-            my @code = ();
-            no strict 'refs';
-            for my $klass ($meta->linearized_isa) {
-                if (*{$klass . '::DEMOLISH'}{CODE}) {
-                    push @code, "${klass}::DEMOLISH(\$self);";
-                }
-            }
-            join "\n", @code;
-        } else {
-            return 'sub { }'; # no demolish =)
+use Mouse::Util; # 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) {
+        no strict 'refs';
+        if (*{$class . '::DEMOLISH'}{CODE}) {
+            $demolishall .= "${class}::DEMOLISH(\$self);\n";
         }
-    };
+    }
 
-    my $code = <<"...";
+    my $source = sprintf("#line %d %s\n", __LINE__, __FILE__) . <<"...";
     sub {
         my \$self = shift;
-        $demolishall;
+        local \$?;
+
+        my \$e = do{
+            local \$@;
+            eval{
+                $demolishall;
+            };
+            \$@;
+        };
+        no warnings 'misc';
+        die \$e if \$e; # rethrow
     }
 ...
-    warn $code if $ENV{DEBUG};
 
-    local $@;
-    my $res = eval $code;
-    die $@ if $@;
-    return $res;
+    my $code;
+    my $e = do{
+        local $@;
+        $code = eval $source;
+        $@;
+    };
+    die $e if $e;
+    return $code;
 }
 
 1;
+__END__
+
+=head1 NAME
+
+Mouse::Meta::Method::Accessor - A Mouse method generator for destructors
+
+=head1 VERSION
+
+This document describes Mouse version 0.38
+
+=head1 SEE ALSO
+
+L<Moose::Meta::Method::Destructor>
+
+=cut