use strict;
use warnings;
+use Class::Load qw(is_class_loaded);
use Class::MOP;
use List::MoreUtils qw( first_index uniq );
use Moose::Util::MetaRole;
my $is_reexport = {};
my $exports = $class->_make_sub_exporter_params(
- [ @exports_from, $exporting_package ],
+ [ $exporting_package, @exports_from ],
$export_recorder,
$is_reexport,
- $meta_lookup,
+ $args{meta_lookup}, # so that we don't pass through the default
);
my $exporter = $class->_make_exporter(
local %$seen = ( $exporting_package => 1 );
- return reverse uniq( _follow_also_real($exporting_package) );
+ return uniq( _follow_also_real($exporting_package) );
}
sub _follow_also_real {
my $exporting_package = shift;
if ( !exists $EXPORT_SPEC{$exporting_package} ) {
- my $loaded = Class::MOP::is_class_loaded($exporting_package);
+ my $loaded = is_class_loaded($exporting_package);
die "Package in also ($exporting_package) does not seem to "
. "use Moose::Exporter"
}
sub _make_sub_exporter_params {
- my $class = shift;
- my $packages = shift;
- my $export_recorder = shift;
- my $is_reexport = shift;
- my $meta_lookup = shift;
+ my $class = shift;
+ my $packages = shift;
+ my $export_recorder = shift;
+ my $is_reexport = shift;
+ my $meta_lookup_override = shift;
my %exports;
+ my $current_meta_lookup;
for my $package ( @{$packages} ) {
my $args = $EXPORT_SPEC{$package}
or die "The $package package does not use Moose::Exporter\n";
+ $current_meta_lookup = $meta_lookup_override || $args->{meta_lookup};
+ $meta_lookup_override = $current_meta_lookup;
+
+ my $meta_lookup = $current_meta_lookup
+ || sub { Class::MOP::class_of(shift) };
+
for my $name ( @{ $args->{with_meta} } ) {
my $sub = $class->_sub_from_package( $package, $name )
or next;
$sub,
$export_recorder,
$meta_lookup,
- );
+ ) unless exists $exports{$name};
}
for my $name ( @{ $args->{with_caller} } ) {
$fq_name,
$sub,
$export_recorder,
- );
+ ) unless exists $exports{$name};
}
my @extra_exports = $class->_parse_trait_aliases(
$export_recorder->{$sub} = 1;
- $exports{$coderef_name} = sub {$sub};
+ $exports{$coderef_name} = sub { $sub }
+ unless exists $exports{$coderef_name};
}
}