X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FObject.pm;h=7cc315aeb730513ee0431b00a739902c68cdfe82;hb=af04626de226ce78ec19d583e86fce4c1df2267d;hp=268e845e592fad06bba4559d69cb4f2846e35b7b;hpb=9b9e4b6566015d6d6e2aa6c745644174efa74623;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Object.pm b/lib/Mouse/Object.pm
index 268e845..7cc315a 100644
--- a/lib/Mouse/Object.pm
+++ b/lib/Mouse/Object.pm
@@ -1,41 +1,32 @@
 package Mouse::Object;
 use Mouse::Util qw(does dump); # enables strict and warnings
 
-sub new {
-    my $class = shift;
-
-    $class->throw_error('Cannot call new() on an instance') if ref $class;
-
-    my $args = $class->BUILDARGS(@_);
-
-    my $instance = Mouse::Meta::Class->initialize($class)->new_object($args);
-    $instance->BUILDALL($args);
-    return $instance;
-}
-
-sub BUILDARGS {
-    my $class = shift;
-
-    if (scalar @_ == 1) {
-        (ref($_[0]) eq 'HASH')
-            || $class->meta->throw_error("Single parameters to new() must be a HASH ref");
-
-        return {%{$_[0]}};
-    }
-    else {
-        return {@_};
-    }
-}
+sub new;
 
 sub DESTROY {
     my $self = shift;
 
+    return unless $self->can('DEMOLISH'); # short circuit
+
     local $?;
 
     my $e = do{
         local $@;
         eval{
-            $self->DEMOLISHALL();
+
+            # DEMOLISHALL
+
+            # We cannot count on being able to retrieve a previously made
+            # metaclass, _or_ being able to make a new one during global
+            # destruction. However, we should still be able to use mro at
+            # that time (at least tests suggest so ;)
+
+            foreach my $class (@{ Mouse::Util::get_linear_isa(ref $self) }) {
+                my $demolish = Mouse::Util::get_code_ref($class, 'DEMOLISH')
+                    || next;
+
+                $self->$demolish();
+            }
         };
         $@;
     };
@@ -51,11 +42,8 @@ sub BUILDALL {
     return unless $self->can('BUILD');
 
     for my $class (reverse $self->meta->linearized_isa) {
-        my $build = do{
-            no strict 'refs';
-            no warnings 'once';
-            *{ $class . '::BUILD' }{CODE};
-        } or next;
+        my $build = Mouse::Util::get_code_ref($class, 'BUILD')
+            || next;
 
         $self->$build(@_);
     }
@@ -74,11 +62,8 @@ 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';
-            no warnings 'once';
-            *{ $class . '::DEMOLISH'}{CODE};
-        } or next;
+        my $demolish = Mouse::Util::get_code_ref($class, 'DEMOLISH')
+            || next;
 
         $self->$demolish();
     }
@@ -95,7 +80,7 @@ Mouse::Object - The base object for Mouse classes
 
 =head1 VERSION
 
-This document describes Mouse version 0.39
+This document describes Mouse version 0.40_05
 
 =head1 METHODS