X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FMethod%2FDestructor.pm;h=9e2491eadbbd8d101ec62d4e8ead7d3cdcbeefca;hb=eaf5a43ef108f6a9dce74c84afc25a892cffdfb1;hp=3b24f9e6c7fdb5847e44b94633117f152279fca7;hpb=56d7c7453888ed2c684bcdb1d905841d8d03aeb1;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/Method/Destructor.pm b/lib/Moose/Meta/Method/Destructor.pm
index 3b24f9e..9e2491e 100644
--- a/lib/Moose/Meta/Method/Destructor.pm
+++ b/lib/Moose/Meta/Method/Destructor.pm
@@ -4,19 +4,21 @@ package Moose::Meta::Method::Destructor;
 use strict;
 use warnings;
 
+use Devel::GlobalDestruction ();
 use Scalar::Util 'blessed', 'weaken';
+use Try::Tiny ();
 
-our $VERSION   = '0.73';
+our $VERSION   = '0.90';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Moose::Meta::Method',
-         'Class::MOP::Method::Generated';
+         'Class::MOP::Method::Inlined';
 
 sub new {
     my $class   = shift;
     my %options = @_;
-    
+
     (ref $options{options} eq 'HASH')
         || $class->throw_error("You must pass a hash of options", data => $options{options});
 
@@ -25,25 +27,25 @@ sub new {
 
     my $self = bless {
         # from our superclass
-        'body'                 => undef, 
+        'body'                 => undef,
         'package_name'         => $options{package_name},
-        'name'                 => $options{name},              
+        'name'                 => $options{name},
         # ...
-        'options'              => $options{options},        
+        'options'              => $options{options},
         'associated_metaclass' => $options{metaclass},
     } => $class;
 
-    # we don't want this creating 
-    # a cycle in the code, if not 
+    # we don't want this creating
+    # a cycle in the code, if not
     # needed
-    weaken($self->{'associated_metaclass'});    
+    weaken($self->{'associated_metaclass'});
 
-    $self->initialize_body;
+    $self->_initialize_body;
 
-    return $self;    
+    return $self;
 }
 
-## accessors 
+## accessors
 
 sub options              { (shift)->{'options'}              }
 
@@ -57,39 +59,61 @@ sub is_needed {
         || $self->throw_error(
         "The is_needed method expected a metaclass object as its arugment");
 
-    return $metaclass->meta->can('DEMOLISH');
+    return $metaclass->find_method_by_name("DEMOLISHALL");
 }
 
 sub initialize_body {
+    Carp::cluck('The initialize_body method has been made private.'
+        . " The public version is deprecated and will be removed in a future release.\n");
+    shift->_initialize_body;
+}
+
+sub _initialize_body {
     my $self = shift;
     # TODO:
-    # the %options should also include a both 
-    # a call 'initializer' and call 'SUPER::' 
-    # options, which should cover approx 90% 
-    # of the possible use cases (even if it 
-    # requires some adaption on the part of 
+    # the %options should also include a both
+    # a call 'initializer' and call 'SUPER::'
+    # options, which should cover approx 90%
+    # of the possible use cases (even if it
+    # requires some adaption on the part of
     # the author, after all, nothing is free)
-    
+
     my @DEMOLISH_methods = $self->associated_metaclass->find_all_methods_by_name('DEMOLISH');
-    
-    return unless @DEMOLISH_methods;
-    
-    my $source = 'sub {';
-
-    my @DEMOLISH_calls;
-    foreach my $method (@DEMOLISH_methods) {
-        push @DEMOLISH_calls => '$_[0]->' . $method->{class} . '::DEMOLISH()';    
+
+    my $source;
+    if ( @DEMOLISH_methods ) {
+        $source = 'sub {';
+        $source .= 'my $self = shift;' . "\n";
+
+        $source .= 'local $?;' . "\n";
+
+        $source .= 'my $in_global_destruction = Devel::GlobalDestruction::in_global_destruction;' . "\n";
+
+        $source .= 'Try::Tiny::try {' . "\n";
+
+        $source .= '$self->' . $_->{class} . '::DEMOLISH($in_global_destruction);' . "\n"
+            for @DEMOLISH_methods;
+
+        $source .= '}';
+        $source .= q[ Try::Tiny::catch { no warnings 'misc'; die $_ };] . "\n";
+        $source .= 'return;' . "\n";
+
+        $source .= '}';
+    } else {
+        $source = 'sub { }';
     }
-    
-    $source .= join ";\n" => @DEMOLISH_calls;
 
-    $source .= ";\n" . '}'; 
-    warn $source if $self->options->{debug};    
-    
-    my $code = $self->_compile_code(
+    warn $source if $self->options->{debug};
+
+    my ( $code, $e ) = $self->_compile_code(
         environment => {},
         code => $source,
-    ) or $self->throw_error("Could not eval the destructor :\n\n$source\n\nbecause :\n\n$@", error => $@, data => $source);
+    );
+
+    $self->throw_error(
+        "Could not eval the destructor :\n\n$source\n\nbecause :\n\n$e",
+        error => $e, data => $source )
+        if $e;
 
     $self->{'body'} = $code;
 }
@@ -101,7 +125,7 @@ __END__
 
 =pod
 
-=head1 NAME 
+=head1 NAME
 
 Moose::Meta::Method::Destructor - Method Meta Object for destructors
 
@@ -164,7 +188,7 @@ Copyright 2006-2009 by Infinity Interactive, Inc.
 L<http://www.iinteractive.com>
 
 This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself. 
+it under the same terms as Perl itself.
 
 =cut