X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FExporter.pm;h=9d538bac91a6a49cb07b3c3cb986e79d2d32686a;hb=c7ec86fc6a846dd4e08ebbfca2bf9808a951bfe4;hp=639b044494ebd3fc5c54d447c850d77784fc4bb1;hpb=72dc2c9d7f309b7e9216cdc7ab0e30feb0f2edd8;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Exporter.pm b/lib/Mouse/Exporter.pm
index 639b044..9d538ba 100644
--- a/lib/Mouse/Exporter.pm
+++ b/lib/Mouse/Exporter.pm
@@ -1,20 +1,27 @@
 package Mouse::Exporter;
 use strict;
 use warnings;
-
-use Carp qw(confess);
+use Carp ();
 
 my %SPEC;
 
-use constant _strict_bits => strict::bits(qw(subs refs vars));
+my $strict_bits;
+my $warnings_extra_bits;
+BEGIN{
+    $strict_bits         = strict::bits(qw(subs refs vars));
+    $warnings_extra_bits = warnings::bits(FATAL => 'recursion');
+}
 
 # 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;
+    # strict->import;
+    $^H              |= $strict_bits;
+    # warnings->import('all', FATAL => 'recursion');
+    ${^WARNING_BITS} |= $warnings::Bits{all};
+    ${^WARNING_BITS} |= $warnings_extra_bits;
     return;
 }
 
@@ -26,25 +33,24 @@ sub setup_import_methods{
 
     my($import, $unimport) = $class->build_import_methods(%args);
 
-    no strict 'refs';
-
-    *{$exporting_package . '::import'}    = $import;
-    *{$exporting_package . '::unimport'}  = $unimport;
-
-    # for backward compatibility
-    *{$exporting_package . '::export_to_level'} = sub{
-        my($package, $level, undef, @args) = @_; # the third argument is redundant
-        $package->import({ into_level => $level + 1 }, @args);
-    };
-    *{$exporting_package . '::export'} = sub{
-        my($package, $into, @args) = @_;
-        $package->import({ into => $into }, @args);
-    };
+    Mouse::Util::install_subroutines($exporting_package,
+        import   => $import,
+        unimport => $unimport,
+
+        export_to_level => sub {
+            my($package, $level, undef, @args) = @_; # the third argument is redundant
+            $package->import({ into_level => $level + 1 }, @args);
+        },
+        export => sub {
+            my($package, $into, @args) = @_;
+            $package->import({ into => $into }, @args);
+        },
+    );
     return;
 }
 
 sub build_import_methods{
-    my($class, %args) = @_;
+    my($self, %args) = @_;
 
     my $exporting_package = $args{exporting_package} ||= caller();
 
@@ -85,9 +91,9 @@ sub build_import_methods{
                     ($code_package, $code_name) = Mouse::Util::get_code_info($code);
                 }
                 else{
-                    no strict 'refs';
                     $code_package = $package;
                     $code_name    = $thingy;
+                    no strict 'refs';
                     $code         = \&{ $code_package . '::' . $code_name };
                }
 
@@ -108,13 +114,13 @@ sub build_import_methods{
     $args{EXPORTS}    = \%exports;
     $args{REMOVABLES} = \@removables;
 
-    $args{groups}{all}     ||= \@all;
+    $args{groups}{all} ||= \@all;
 
     if(my $default_list = $args{groups}{default}){
         my %default;
         foreach my $keyword(@{$default_list}){
             $default{$keyword} = $exports{$keyword}
-                || confess(qq{The $exporting_package package does not export "$keyword"});
+                || Carp::confess(qq{The $exporting_package package does not export "$keyword"});
         }
         $args{DEFAULT} = \%default;
     }
@@ -130,13 +136,12 @@ sub build_import_methods{
     return (\&do_import, \&do_unimport);
 }
 
-
 # the entity of general import()
 sub do_import {
     my($package, @args) = @_;
 
     my $spec = $SPEC{$package}
-        || confess("The package $package package does not use Mouse::Exporter");
+        || Carp::confess("The package $package package does not use Mouse::Exporter");
 
     my $into = _get_caller_package(ref($args[0]) ? shift @args : undef);
 
@@ -155,7 +160,7 @@ sub do_import {
         }
         elsif($arg =~ s/^://){
             my $group = $spec->{groups}{$arg}
-                || confess(qq{The $package package does not export the group "$arg"});
+                || Carp::confess(qq{The $package package does not export the group "$arg"});
             push @exports, @{$group};
         }
         else{
@@ -163,8 +168,11 @@ sub do_import {
         }
     }
 
-    $^H              |= _strict_bits;         # strict->import;
-    ${^WARNING_BITS} |= $warnings::Bits{all}; # warnings->import;
+    # strict->import;
+    $^H              |= $strict_bits;
+    # warnings->import('all', FATAL => 'recursion');
+    ${^WARNING_BITS} |= $warnings::Bits{all};
+    ${^WARNING_BITS} |= $warnings_extra_bits;
 
     if($spec->{INIT_META}){
         my $meta;
@@ -174,15 +182,15 @@ sub do_import {
 
         if(@traits){
             my $type = (split /::/, ref $meta)[-1]; # e.g. "Class" for "My::Meta::Class"
-            @traits =
-                map{
-                    ref($_) ? $_
-                            : Mouse::Util::resolve_metaclass_alias($type => $_, trait => 1)
-                } @traits;
+            @traits = map{
+              ref($_)
+                ? $_
+                : Mouse::Util::resolve_metaclass_alias($type => $_, trait => 1)
+            } @traits;
 
             require Mouse::Util::MetaRole;
             Mouse::Util::MetaRole::apply_metaroles(
-                for       => $into,
+                for => $into,
                 Mouse::Util::is_a_metarole($into->meta)
                     ? (role_metaroles  => { role  => \@traits })
                     : (class_metaroles => { class => \@traits }),
@@ -194,18 +202,17 @@ sub do_import {
     }
 
     if(@exports){
+        my @export_table;
         foreach my $keyword(@exports){
-            no strict 'refs';
-            *{$into.'::'.$keyword} = $spec->{EXPORTS}{$keyword}
-                || confess(qq{The $package package does not export "$keyword"});
+            push @export_table,
+                $keyword => ($spec->{EXPORTS}{$keyword}
+                    || Carp::confess(qq{The $package package does not export "$keyword"})
+                );
         }
+        Mouse::Util::install_subroutines($into, @export_table);
     }
     else{
-        my $default = $spec->{DEFAULT};
-        while(my($keyword, $code) = each %{$default}){
-            no strict 'refs';
-            *{$into.'::'.$keyword} = $code;
-        }
+        Mouse::Util::install_subroutines($into, %{$spec->{DEFAULT}});
     }
     return;
 }
@@ -215,7 +222,7 @@ sub do_unimport {
     my($package, $arg) = @_;
 
     my $spec = $SPEC{$package}
-        || confess("The package $package does not use Mouse::Exporter");
+        || Carp::confess("The package $package does not use Mouse::Exporter");
 
     my $from = _get_caller_package($arg);
 
@@ -227,7 +234,9 @@ sub do_unimport {
     for my $keyword (@{ $spec->{REMOVABLES} }) {
         next if !exists $stash->{$keyword};
         my $gv = \$stash->{$keyword};
-        if(ref($gv) eq 'GLOB' && *{$gv}{CODE} == $spec->{EXPORTS}{$keyword}){ # make sure it is from us
+
+        # remove what is from us
+        if(ref($gv) eq 'GLOB' && *{$gv}{CODE} == $spec->{EXPORTS}{$keyword}){
             delete $stash->{$keyword};
         }
     }
@@ -249,8 +258,6 @@ sub _get_caller_package {
     }
 }
 
-#sub _spec{ %SPEC }
-
 1;
 __END__
 
@@ -260,7 +267,7 @@ Mouse::Exporter - make an import() and unimport() just like Mouse.pm
 
 =head1 VERSION
 
-This document describes Mouse version 0.50_03
+This document describes Mouse version 0.95
 
 =head1 SYNOPSIS
 
@@ -270,8 +277,8 @@ This document describes Mouse version 0.50_03
     use Mouse::Exporter;
 
     Mouse::Exporter->setup_import_methods(
-      as_is     => [ 'has_rw', 'other_sugar', \&Some::Random::thing ],
-      also      => 'Mouse',
+      as_is => [ 'has_rw', 'other_sugar', \&Some::Random::thing ],
+      also  => 'Mouse',
     );
 
     sub has_rw {