X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FClass.pm;h=187ba003ab749e5fcdea81833f68647e492db3d1;hb=902174eb6dc2afbe8a2b8fb0a27446b3276787d8;hp=a3fe71b36bca2fcd09a735d31ddb315fa19b6138;hpb=a0d746d2f364b97682306cd942d4ad0f6a96897e;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Meta/Class.pm b/lib/Mouse/Meta/Class.pm
index a3fe71b..187ba00 100644
--- a/lib/Mouse/Meta/Class.pm
+++ b/lib/Mouse/Meta/Class.pm
@@ -56,16 +56,25 @@ sub superclasses {
     if (@_) {
         foreach my $super(@_){
             Mouse::Util::load_class($super);
-            my $meta = Mouse::Util::get_metaclass_by_name($super);
 
-            next if not defined $meta;
+            my $meta = Mouse::Util::get_metaclass_by_name($super);
+            unless(defined $meta) {
+                # checks if $super is a foreign class (i.e. non-Mouse class)
+                my $mm = $super->can('meta');
+                if(!($mm && $mm == \&Mouse::Util::meta)) {
+                    if($super->can('new') or $super->can('DESTROY')) {
+                        $self->inherit_from_foreign_class($super);
+                    }
+                }
+                next;
+            }
 
             if(Mouse::Util::is_a_metarole($meta)){
                 $self->throw_error("You cannot inherit from a Mouse Role ($super)");
             }
 
+            # checks and fixes in metaclass compatiility
             next if $self->isa(ref $meta); # _superclass_meta_is_compatible
-
             $self->_reconcile_with_superclass_meta($meta);
         }
         @{ $self->{superclasses} } = @_;
@@ -73,6 +82,15 @@ sub superclasses {
 
     return @{ $self->{superclasses} };
 }
+
+sub inherit_from_foreign_class {
+    my($class, $super) = @_;
+    Carp::carp("You inherit from non-Mouse class ($super),"
+        . " but it is unlikely to work correctly."
+        . " Please concider to use MouseX::Foreign");
+    return;
+}
+
 my @MetaClassTypes = (
     'attribute',   # Mouse::Meta::Attribute
     'method',      # Mouse::Meta::Method
@@ -271,22 +289,25 @@ sub make_mutable {
 sub is_immutable;
 sub is_mutable   { !$_[0]->is_immutable }
 
-sub _install_modifier_pp{
+sub _install_modifier {
     my( $self, $type, $name, $code ) = @_;
     my $into = $self->name;
 
     my $original = $into->can($name)
-        or $self->throw_error("The method '$name' is not found in the inheritance hierarchy for class $into");
+        or $self->throw_error("The method '$name' was not found in the inheritance hierarchy for $into");
 
     my $modifier_table = $self->{modifiers}{$name};
 
     if(!$modifier_table){
-        my(@before, @after, @around, $cache, $modified);
-
-        $cache = $original;
-
-        $modified = sub {
-            for my $c (@before) { $c->(@_) }
+        my(@before, @after, @around);
+        my $cache = $original;
+        my $modified = sub {
+            if(@before) {
+                for my $c (@before) { $c->(@_) }
+            }
+            unless(@after) {
+                return $cache->(@_);
+            }
 
             if(wantarray){ # list context
                 my @rval = $cache->(@_);
@@ -337,55 +358,6 @@ sub _install_modifier_pp{
     return;
 }
 
-sub _install_modifier {
-    my ( $self, $type, $name, $code ) = @_;
-
-    # load Data::Util first
-    my $no_cmm_fast = do{
-        local $@;
-        eval q{ use Data::Util 0.55 () };
-        $@;
-    };
-
-    my $impl;
-    if($no_cmm_fast){
-        $impl = \&_install_modifier_pp;
-    }
-    else{
-        $impl = sub {
-            my ( $self, $type, $name, $code ) = @_;
-            my $into = $self->name;
-
-            my $method = Mouse::Util::get_code_ref( $into, $name );
-
-            if ( !$method || !Data::Util::subroutine_modifier($method) ) {
-                unless ($method) {
-                    $method = $into->can($name)
-                        or Carp::confess("The method '$name' is not found in the inheritance hierarchy for class $into");
-                }
-                $method = Data::Util::modify_subroutine( $method,
-                    $type => [$code] );
-
-                $self->add_method($name => $method);
-            }
-            else {
-                Data::Util::subroutine_modifier( $method, $type => $code );
-                $self->add_method($name => Mouse::Util::get_code_ref($into, $name));
-            }
-
-            return;
-        };
-    }
-
-    # replace this method itself :)
-    {
-        no warnings 'redefine';
-        *_install_modifier = $impl;
-    }
-
-    $self->$impl( $type, $name, $code );
-}
-
 sub add_before_method_modifier {
     my ( $self, $name, $code ) = @_;
     $self->_install_modifier( 'before', $name, $code );
@@ -473,7 +445,12 @@ Mouse::Meta::Class - The Mouse class metaclass
 
 =head1 VERSION
 
-This document describes Mouse version 0.64
+This document describes Mouse version 0.70
+
+=head1 DESCRIPTION
+
+This class is a meta object protocol for Mouse classes,
+which is a subset of Moose::Meta:::Class.
 
 =head1 METHODS