From: Dave Rolsky <autarch@urth.org>
Date: Sun, 15 Aug 2010 08:48:05 +0000 (+0200)
Subject: Refactor role application code to call ->get_method much less.
X-Git-Tag: 1.10~13
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=4a9e8ff6131ac147d6d3de3e7570bf5e57e1ee67;p=gitmo%2FMoose.git

Refactor role application code to call ->get_method much less.
---

diff --git a/lib/Moose/Meta/Role/Application/ToClass.pm b/lib/Moose/Meta/Role/Application/ToClass.pm
index db8a36d..00207b0 100644
--- a/lib/Moose/Meta/Role/Application/ToClass.pm
+++ b/lib/Moose/Meta/Role/Application/ToClass.pm
@@ -147,40 +147,43 @@ sub apply_attributes {
 }
 
 sub apply_methods {
-    my ($self, $role, $class) = @_;
-    foreach my $method_name ($role->get_method_list) {
+    my ( $self, $role, $class ) = @_;
+
+    foreach my $method ( $role->_get_local_methods ) {
+        my $method_name = $method->name;
+
         next if $method_name eq 'meta';
 
-        unless ($self->is_method_excluded($method_name)) {
-            # it if it has one already
-            if ($class->has_method($method_name) &&
-                # and if they are not the same thing ...
-                $class->get_method($method_name)->body != $role->get_method($method_name)->body) {
-                next;
-            }
-            else {
-                # add it, although it could be overridden
-                $class->add_method(
-                    $method_name,
-                    $role->get_method($method_name)
-                );
-            }
-        }
+        unless ( $self->is_method_excluded($method_name) ) {
+
+            my $class_method = $class->get_method($method_name);
+
+            next if $class_method && $class_method->body != $method->body;
 
-        if ($self->is_method_aliased($method_name)) {
-            my $aliased_method_name = $self->get_method_aliases->{$method_name};
-            # it if it has one already
-            if ($class->has_method($aliased_method_name) &&
-                # and if they are not the same thing ...
-                $class->get_method($aliased_method_name)->body != $role->get_method($method_name)->body) {
-                $class->throw_error("Cannot create a method alias if a local method of the same name exists");
-            }
             $class->add_method(
-                $aliased_method_name,
-                $role->get_method($method_name)
+                $method_name,
+                $method,
+            );
+        }
+
+        next unless $self->is_method_aliased($method_name);
+
+        my $aliased_method_name = $self->get_method_aliases->{$method_name};
+
+        my $class_method = $class->get_method($aliased_method_name);
+
+        if ( $class_method && $class_method->body != $method->body ) {
+            $class->throw_error(
+                "Cannot create a method alias if a local method of the same name exists"
             );
         }
+
+        $class->add_method(
+            $aliased_method_name,
+            $method,
+        );
     }
+
     # we must reset the cache here since
     # we are just aliasing methods, otherwise
     # the modifiers go wonky.
diff --git a/lib/Moose/Meta/Role/Application/ToRole.pm b/lib/Moose/Meta/Role/Application/ToRole.pm
index 33cb612..3c96872 100644
--- a/lib/Moose/Meta/Role/Application/ToRole.pm
+++ b/lib/Moose/Meta/Role/Application/ToRole.pm
@@ -70,14 +70,18 @@ sub apply_attributes {
 }
 
 sub apply_methods {
-    my ($self, $role1, $role2) = @_;
-    foreach my $method_name ($role1->get_method_list) {
+    my ( $self, $role1, $role2 ) = @_;
+    foreach my $method ( $role1->_get_local_methods ) {
+
+        my $method_name = $method->name;
+
         next if $method_name eq 'meta';
 
         unless ( $self->is_method_excluded($method_name) ) {
-            if (   $role2->has_method($method_name)
-                && $role2->get_method($method_name)->body
-                != $role1->get_method($method_name)->body ) {
+
+            my $role2_method = $role2->get_method($method_name);
+            if (   $role2_method
+                && $role2_method->body != $method->body ) {
 
                 # method conflicts between roles result in the method becoming
                 # a requirement
@@ -89,30 +93,34 @@ sub apply_methods {
             else {
                 $role2->add_method(
                     $method_name,
-                    $role1->get_method($method_name)
+                    $method,
                 );
             }
         }
 
-        if ($self->is_method_aliased($method_name)) {
-            my $aliased_method_name = $self->get_method_aliases->{$method_name};
+        next unless $self->is_method_aliased($method_name);
 
-            if ($role2->has_method($aliased_method_name) &&
-                $role2->get_method($aliased_method_name)->body != $role1->get_method($method_name)->body) {
+        my $aliased_method_name = $self->get_method_aliases->{$method_name};
 
-                require Moose;
-                Moose->throw_error("Cannot create a method alias if a local method of the same name exists");
-            }
+        my $role2_method = $role2->get_method($aliased_method_name);
 
-            $role2->add_method(
-                $aliased_method_name,
-                $role1->get_method($method_name)
+        if (   $role2_method
+            && $role2_method->body != $method->body ) {
+
+            require Moose;
+            Moose->throw_error(
+                "Cannot create a method alias if a local method of the same name exists"
             );
+        }
 
-            if (!$role2->has_method($method_name)) {
-                $role2->add_required_methods($method_name)
-                    unless $self->is_method_excluded($method_name);
-            }
+        $role2->add_method(
+            $aliased_method_name,
+            $role1->get_method($method_name)
+        );
+
+        if ( !$role2->has_method($method_name) ) {
+            $role2->add_required_methods($method_name)
+                unless $self->is_method_excluded($method_name);
         }
     }
 }