X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMixin%2FHasMethods.pm;h=d08d27389da44f5c9098f6612117f9a6e166b5a1;hb=39e3013b71e122e0e309e62b7c5cfd1e02d860cb;hp=a593125b78b0059e32720270f58380d033a43997;hpb=e4679e2cce46297ade239d8d5fd87ba9e32eb840;p=gitmo%2FClass-MOP.git

diff --git a/lib/Class/MOP/Mixin/HasMethods.pm b/lib/Class/MOP/Mixin/HasMethods.pm
index a593125..d08d273 100644
--- a/lib/Class/MOP/Mixin/HasMethods.pm
+++ b/lib/Class/MOP/Mixin/HasMethods.pm
@@ -167,17 +167,7 @@ sub remove_method {
 sub get_method_list {
     my $self = shift;
 
-    my $namespace = $self->namespace;
-
-    # Constants may show up as some sort of non-GLOB reference in the
-    # namespace hash ref, depending on the Perl version.
-    return grep {
-        defined $namespace->{$_}
-            && ( ref( \$namespace->{$_} ) ne 'GLOB'
-            || *{ $namespace->{$_} }{CODE} )
-            && $self->has_method($_)
-        }
-        keys %{$namespace};
+    return keys %{ $self->_full_method_map };
 }
 
 # This should probably be what get_method_list actually does, instead of just
@@ -186,15 +176,7 @@ sub get_method_list {
 sub _get_local_methods {
     my $self = shift;
 
-    my $namespace = $self->namespace;
-
-    return map { $self->get_method($_) }
-        grep {
-        defined $namespace->{$_}
-            && ( ref $namespace->{$_}
-            || *{ $namespace->{$_} }{CODE} )
-        }
-        keys %{$namespace};
+    return values %{ $self->_full_method_map };
 }
 
 sub _restore_metamethods_from {
@@ -219,6 +201,21 @@ sub update_package_cache_flag {
     $self->{'_package_cache_flag'} = Class::MOP::check_package_cache_flag($self->name);
 }
 
+sub _full_method_map {
+    my $self = shift;
+
+    my $pkg_gen = Class::MOP::check_package_cache_flag($self->name);
+
+    if (($self->{_package_cache_flag_full} || -1) != $pkg_gen) {
+        # forcibly reify all method map entries
+        $self->get_method($_)
+            for $self->list_all_package_symbols('CODE');
+        $self->{_package_cache_flag_full} = $pkg_gen;
+    }
+
+    return $self->_method_map;
+}
+
 1;
 
 __END__