use Scalar::Util 'blessed', 'weaken';
use Try::Tiny ();
-our $VERSION = '0.94';
+our $VERSION = '1.06';
$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
my @DEMOLISH_methods = $self->associated_metaclass->find_all_methods_by_name('DEMOLISH');
my $source;
- if ( @DEMOLISH_methods ) {
- $source = 'sub {';
- $source .= 'my $self = shift;' . "\n";
+ $source = 'sub {' . "\n";
+ $source .= 'my $self = shift;' . "\n";
+ $source .= 'return $self->Moose::Object::DESTROY(@_)' . "\n";
+ $source .= ' if Scalar::Util::blessed($self) ne ';
+ $source .= "'" . $self->associated_metaclass->name . "'";
+ $source .= ';' . "\n";
+ if ( @DEMOLISH_methods ) {
$source .= 'local $?;' . "\n";
$source .= 'my $in_global_destruction = Devel::GlobalDestruction::in_global_destruction;' . "\n";
$source .= q[ Try::Tiny::catch { no warnings 'misc'; die $_ };] . "\n";
$source .= 'return;' . "\n";
- $source .= '}';
- } else {
- $source = 'sub { }';
}
+ $source .= '}';
+
warn $source if $self->options->{debug};
my ( $code, $e ) = $self->_compile_code(