X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole%2FApplication%2FToRole.pm;h=52b18b70e3bcf8b127b647f0b939931d9fe8b96b;hb=a3319906531cef2b41a87138e75461ced7a3394b;hp=9b8787605389612d310917283e33acea814dc180;hpb=82750a8aa67b0f6cd139537bef64162d7a7c4d52;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/Role/Application/ToRole.pm b/lib/Moose/Meta/Role/Application/ToRole.pm
index 9b87876..52b18b7 100644
--- a/lib/Moose/Meta/Role/Application/ToRole.pm
+++ b/lib/Moose/Meta/Role/Application/ToRole.pm
@@ -6,7 +6,7 @@ use metaclass;
 
 use Scalar::Util    'blessed';
 
-our $VERSION   = '0.62_01';
+our $VERSION   = '0.73_01';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -20,11 +20,15 @@ sub apply {
 
 sub check_role_exclusions {
     my ($self, $role1, $role2) = @_;
-    Moose->throw_error("Conflict detected: " . $role2->name . " excludes role '" . $role1->name . "'")
-        if $role2->excludes_role($role1->name);
+    if ( $role2->excludes_role($role1->name) ) {
+        require Moose;
+        Moose->throw_error("Conflict detected: " . $role2->name . " excludes role '" . $role1->name . "'");
+    }
     foreach my $excluded_role_name ($role1->get_excluded_roles_list) {
-        Moose->throw_error("The class " . $role2->name . " does the excluded role '$excluded_role_name'")
-            if $role2->does_role($excluded_role_name);
+        if ( $role2->does_role($excluded_role_name) ) {
+            require Moose;
+            Moose->throw_error("The class " . $role2->name . " does the excluded role '$excluded_role_name'");
+        }
         $role2->add_excluded_roles($excluded_role_name);
     }
 }
@@ -51,6 +55,8 @@ sub apply_attributes {
         if ($role2->has_attribute($attribute_name) &&
             # make sure we haven't seen this one already too
             $role2->get_attribute($attribute_name) != $role1->get_attribute($attribute_name)) {
+
+            require Moose;
             Moose->throw_error("Role '" . $role1->name . "' has encountered an attribute conflict " .
                     "during composition. This is fatal error and cannot be disambiguated.");
         }
@@ -73,6 +79,8 @@ sub apply_methods {
             if ($role2->has_method($aliased_method_name) &&
                 # and if they are not the same thing ...
                 $role2->get_method($aliased_method_name)->body != $role1->get_method($method_name)->body) {
+
+                require Moose;
                 Moose->throw_error("Cannot create a method alias if a local method of the same name exists");
             }
 
@@ -100,7 +108,7 @@ sub apply_methods {
             $role2->add_required_methods($method_name);
         }
         else {
-            # add it, although it could be overriden
+            # add it, although it could be overridden
             $role2->add_method(
                 $method_name,
                 $role1->get_method($method_name)
@@ -118,8 +126,9 @@ sub apply_override_method_modifiers {
         if ($role2->has_method($method_name)) {
             # if it is being composed into another role
             # we have a conflict here, because you cannot
-            # combine an overriden method with a locally
+            # combine an overridden method with a locally
             # defined one
+            require Moose;
             Moose->throw_error("Role '" . $role1->name . "' has encountered an 'override' method conflict " .
                     "during composition (A local method of the same name as been found). This " .
                     "is fatal error.");
@@ -130,6 +139,8 @@ sub apply_override_method_modifiers {
             # we are composing into
             if ($role2->has_override_method_modifier($method_name) &&
                 $role2->get_override_method_modifier($method_name) != $role2->get_override_method_modifier($method_name)) {
+
+                require Moose;
                 Moose->throw_error("Role '" . $role1->name . "' has encountered an 'override' method conflict " .
                         "during composition (Two 'override' methods of the same name encountered). " .
                         "This is fatal error.");
@@ -209,7 +220,7 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2008 by Infinity Interactive, Inc.
+Copyright 2006-2009 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>