X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FClass.pm;h=93b6f6c77e663ca18e38a46af9cec42c2fbb995e;hb=67fb42e0ee9e0d69d84de9908acfe34ef2c8fb49;hp=f09cdaa8147e49c7d45e6dad89772e2e715e5f4e;hpb=4859d490c20857ad700946803544f1d9e83a56bd;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Meta/Class.pm b/lib/Mouse/Meta/Class.pm
index f09cdaa..93b6f6c 100644
--- a/lib/Mouse/Meta/Class.pm
+++ b/lib/Mouse/Meta/Class.pm
@@ -76,7 +76,7 @@ sub get_method_list {
     no strict 'refs';
     # Get all the CODE symbol table entries
     my @functions =
-      grep !/^(?:has|with|around|before|after|blessed|extends|confess)$/,
+      grep !/^(?:has|with|around|before|after|blessed|extends|confess|override|super)$/,
       grep { defined &{"${name}::$_"} }
       keys %{"${name}::"};
     push @functions, keys %{$self->{'methods'}->{$name}};
@@ -145,10 +145,18 @@ sub clone_instance {
 
 sub make_immutable {
     my $self = shift;
-    my %args = @_;
+    my %args = (
+        inline_constructor => 1,
+        @_,
+    );
+
     my $name = $self->name;
     $self->{is_immutable}++;
-    $self->add_method('new' => Mouse::Meta::Method::Constructor->generate_constructor_method_inline( $self ));
+
+    if ($args{inline_constructor}) {
+        $self->add_method('new' => Mouse::Meta::Method::Constructor->generate_constructor_method_inline( $self ));
+    }
+
     if ($args{inline_destructor}) {
         $self->add_method('DESTROY' => Mouse::Meta::Method::Destructor->generate_destructor_method_inline( $self ));
     }
@@ -160,38 +168,10 @@ sub is_immutable { $_[0]->{is_immutable} }
 
 sub attribute_metaclass { "Mouse::Meta::Class" }
 
-sub _install_fast_modifier {
-    my $self     = shift;
-    my $into     = shift;
-    my $type     = shift;
-    my $modifier = pop;
-
-    foreach my $name (@_) {
-        my $method = Data::Util::get_code_ref( $into, $name );
-
-        if ( !$method || !Data::Util::subroutine_modifier($method) ) {
-
-            unless ($method) {
-                $method = $into->can($name)
-                    or confess "The method '$name' is not found in the inheritance hierarchy for class $into";
-            }
-            $method = Data::Util::modify_subroutine( $method,
-                $type => [$modifier] );
-
-            no warnings 'redefine';
-            Data::Util::install_subroutine( $into, $name => $method );
-        }
-        else {
-            Data::Util::subroutine_modifier( $method, $type => $modifier );
-        }
-    }
-    return;
-}
-
 sub _install_modifier {
     my ( $self, $into, $type, $name, $code ) = @_;
-    if (eval "require Data::Util; 1") {
-        $self->_install_fast_modifier( 
+    if (eval "require Class::Method::Modifiers::Fast; 1") {
+        Class::Method::Modifiers::Fast::_install_modifier( 
             $into,
             $type,
             $name,