X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FExporter.pm;h=8e54df16b5aa2e07d4bc2e1e12c621843984153e;hb=0eb86915f8801eff206c6dcfdec7af056d0a1c3d;hp=5884c68a7bf1c6c6e949fc61bfdd566492d1e475;hpb=1ff34b4c204afd341fbb946205acb1a08fe2d4a4;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Exporter.pm b/lib/Mouse/Exporter.pm
index 5884c68..8e54df1 100644
--- a/lib/Mouse/Exporter.pm
+++ b/lib/Mouse/Exporter.pm
@@ -4,12 +4,21 @@ use warnings;
 
 use Carp qw(confess);
 
-use Mouse::Util qw(get_code_info not_supported);
-
 my %SPEC;
 
 my $strict_bits = strict::bits(qw(subs refs vars));
 
+# it must be "require", because Mouse::Util depends on Mouse::Exporter,
+# which depends on Mouse::Util::import()
+require Mouse::Util;
+
+sub import{
+    $^H              |= $strict_bits;         # strict->import;
+    ${^WARNING_BITS}  = $warnings::Bits{all}; # warnings->import;
+    return;
+}
+
+
 sub setup_import_methods{
     my($class, %args) = @_;
 
@@ -27,7 +36,7 @@ sub setup_import_methods{
             push @export_from, $current;
 
             my $also = $SPEC{$current}{also} or next;
-            push @stack, grep{ !$seen{$_}++ } @{ $also };
+            push @stack, grep{ !$seen{$_}++ } ref($also) ? @{ $also } : $also;
         }
     }
     else{
@@ -50,7 +59,7 @@ sub setup_import_methods{
 
                     if(ref($thingy)){
                         $code = $thingy;
-                        ($code_package, $code_name) = get_code_info($code);
+                        ($code_package, $code_name) = Mouse::Util::get_code_info($code);
                     }
                     else{
                         no strict 'refs';
@@ -76,9 +85,9 @@ sub setup_import_methods{
         $args{EXPORTS}    = \%exports;
         $args{REMOVABLES} = \@removables;
 
-        $args{group}{all}     ||= \@all;
+        $args{groups}{all}     ||= \@all;
 
-        if(my $default_list = $args{group}{default}){
+        if(my $default_list = $args{groups}{default}){
             my %default;
             foreach my $keyword(@{$default_list}){
                 $default{$keyword} = $exports{$keyword}
@@ -87,8 +96,8 @@ sub setup_import_methods{
             $args{DEFAULT} = \%default;
         }
         else{
-            $args{group}{default} ||= \@all;
-            $args{DEFAULT}          = $args{EXPORTS};
+            $args{groups}{default} ||= \@all;
+            $args{DEFAULT}           = $args{EXPORTS};
         }
 
         if(@init_meta_methods){
@@ -117,10 +126,10 @@ sub do_import {
     my @exports;
     foreach my $arg(@args){
         if($arg =~ s/^-//){
-            not_supported "-$arg";
+            Mouse::Util::not_supported("-$arg");
         }
         elsif($arg =~ s/^://){
-            my $group = $spec->{group}{$arg}
+            my $group = $spec->{groups}{$arg}
                 || confess(qq{The $package package does not export the group "$arg"});
             push @exports, @{$group};
         }
@@ -132,7 +141,7 @@ sub do_import {
     $^H              |= $strict_bits;         # strict->import;
     ${^WARNING_BITS}  = $warnings::Bits{all}; # warnings->import;
 
-    if($into eq 'main' && !$spec->{_not_export_to_main}){
+    if($into eq 'main' && !$spec->{_export_to_main}){
         warn qq{$package does not export its sugar to the 'main' package.\n};
         return;
     }