X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FObject.pm;h=8aab6195384773561cff077024406a8e5af4a9d5;hp=f68f390aae8b565308cc21746214e7a0cf1ed810;hb=034587d897c53d4df84085a9229334bd2d51f1c6;hpb=7ca5c5fb6e084d9c57bc022b336458afc74c6847

diff --git a/lib/Mouse/Object.pm b/lib/Mouse/Object.pm
index f68f390..8aab619 100644
--- a/lib/Mouse/Object.pm
+++ b/lib/Mouse/Object.pm
@@ -1,8 +1,5 @@
 package Mouse::Object;
-use strict;
-use warnings;
-
-use Mouse::Util qw(does dump);
+use Mouse::Util qw(does dump); # enables strict and warnings
 
 sub new {
     my $class = shift;
@@ -33,7 +30,18 @@ sub BUILDARGS {
 sub DESTROY {
     my $self = shift;
 
-    $self->DEMOLISHALL();
+    local $?;
+
+    my $e = do{
+        local $@;
+        eval{
+            $self->DEMOLISHALL();
+        };
+        $@;
+    };
+
+    no warnings 'misc';
+    die $e if $e; # rethrow
 }
 
 sub BUILDALL {
@@ -43,8 +51,11 @@ sub BUILDALL {
     return unless $self->can('BUILD');
 
     for my $class (reverse $self->meta->linearized_isa) {
-        my $build = do{ no strict 'refs'; *{ $class . '::BUILD' }{CODE} }
-            or next;
+        my $build = do{
+            no strict 'refs';
+            no warnings 'once';
+            *{ $class . '::BUILD' }{CODE};
+        } or next;
 
         $self->$build(@_);
     }
@@ -63,8 +74,11 @@ sub DEMOLISHALL {
     # that time (at least tests suggest so ;)
 
     foreach my $class (@{ Mouse::Util::get_linear_isa(ref $self) }) {
-        my $demolish = do{ no strict 'refs'; *{ $class . '::DEMOLISH'}{CODE} }
-            or next;
+        my $demolish = do{
+            no strict 'refs';
+            no warnings 'once';
+            *{ $class . '::DEMOLISH'}{CODE};
+        } or next;
 
         $self->$demolish();
     }
@@ -77,25 +91,29 @@ __END__
 
 =head1 NAME
 
-Mouse::Object - we don't need to steenkin' constructor
+Mouse::Object - The base object for Mouse classes
+
+=head1 VERSION
+
+This document describes Mouse version 0.40
 
 =head1 METHODS
 
-=head2 C<< new arguments -> Object >>
+=head2 C<< new (Arguments) -> Object >>
 
 Instantiates a new C<Mouse::Object>. This is obviously intended for subclasses.
 
-=head2 C<< BUILDARGS(@args) -> HashRef >>
+=head2 C<< BUILDARGS (Arguments) -> HashRef >>
 
 Lets you override the arguments that C<new> takes. Return a hashref of
 parameters.
 
-=head2 C<< BUILDALL \%args >>
+=head2 C<< BUILDALL (\%args) >>
 
 Calls C<BUILD> on each class in the class hierarchy. This is called at the
 end of C<new>.
 
-=head2 C<< BUILD \%args >>
+=head2 C<< BUILD (\%args) >>
 
 You may put any business logic initialization in BUILD methods. You don't
 need to redispatch or return any specific value.