use Carp ();
use List::Util qw( first );
-use List::MoreUtils qw( any all );
+use List::MoreUtils qw( any all uniq );
use Scalar::Util 'weaken', 'blessed';
our $VERSION = '0.57';
use Moose::Meta::Method::Overriden;
use Moose::Meta::Method::Augmented;
+use Moose::Error::Default;
use base 'Class::MOP::Class';
__PACKAGE__->meta->add_attribute('constructor_class' => (
accessor => 'constructor_class',
- default => sub { 'Moose::Meta::Method::Constructor' }
+ default => 'Moose::Meta::Method::Constructor',
));
__PACKAGE__->meta->add_attribute('destructor_class' => (
accessor => 'destructor_class',
- default => sub { 'Moose::Meta::Method::Destructor' }
-));
-
-__PACKAGE__->meta->add_attribute('error_builder' => (
- reader => 'error_builder',
- default => 'confess',
+ default => 'Moose::Meta::Method::Destructor',
));
__PACKAGE__->meta->add_attribute('error_class' => (
- reader => 'error_class',
+ accessor => 'error_class',
+ default => 'Moose::Error::Default',
));
(ref $options{roles} eq 'ARRAY')
|| $self->throw_error("You must pass an ARRAY ref of roles", data => $options{roles})
if exists $options{roles};
-
- my $super = delete $options{superclasses};
+ my $roles = delete $options{roles};
my $class = $self->SUPER::create($package_name, %options);
- if ( my @super = @{ $super || [] } ) {
- $class->_fix_metaclass_incompatibility(@super);
- $class->superclasses(@super);
- }
-
- if (exists $options{roles}) {
- Moose::Util::apply_all_roles($class, @{$options{roles}});
+ if ($roles) {
+ Moose::Util::apply_all_roles( $class, @$roles );
}
return $class;
}
+sub check_metaclass_compatibility {
+ my $self = shift;
+
+ if ( my @supers = $self->superclasses ) {
+ $self->_fix_metaclass_incompatibility(@supers);
+ }
+
+ $self->SUPER::check_metaclass_compatibility(@_);
+}
+
my %ANON_CLASSES;
sub create_anon_class {
# I don't want to have to type this >1 time
my @MetaClassTypes =
- qw( attribute_metaclass method_metaclass instance_metaclass constructor_class destructor_class );
+ qw( attribute_metaclass method_metaclass instance_metaclass
+ constructor_class destructor_class error_class );
sub _reconcile_with_superclass_meta {
my ($self, $super) = @_;
instance_metaclass => $new_meta->instance_metaclass,
);
- $new_self->$_( $new_meta->$_ ) for qw( constructor_class destructor_class );
+ $new_self->$_( $new_meta->$_ )
+ for qw( constructor_class destructor_class error_class );
%$self = %$new_self;
bless $self, ref $new_self;
- # FIXME? This seems to be necessary in some cases because of how
- # Class::MOP::Class->construct_class_instance will weaken the
- # metaclass store entry for an anonymous class. However, if that
- # anonymous class is a metaclass's metaclass, we don't want it
- # going out of scope. I'm not sure this is the right fix at all.
+ # We need to replace the cached metaclass instance or else when it
+ # goes out of scope Class::MOP::Class destroy's the namespace for
+ # the metaclass's class, causing much havoc.
Class::MOP::store_metaclass_by_name( $self->name, $self );
+ Class::MOP::weaken_metaclass( $self->name ) if $self->is_anon_class;
}
# In the more complex case, we share a common ancestor with our
push @roles, $meta->calculate_all_roles;
}
- return @roles;
+ return uniq @roles;
}
sub _reconcile_role_differences {
$roles{ $thing . '_roles' } = \@roles;
}
- $self = $self->_reinitialize_with($super_meta);
+ $self->_reinitialize_with($super_meta);
Moose::Util::MetaRole::apply_metaclass_roles(
for_class => $self->name,
@args = %{$args[0]} if scalar @args == 1 && ref($args[0]) eq 'HASH';
- if ($name =~ /^\+(.*)/) {
+ if (($name || '') =~ /^\+(.*)/) {
return $self->_process_inherited_attribute($1, @args);
}
else {
);
}
-#{ package Moose::Meta::Class::ErrorRoutines; %Carp::Internal?
-
-our $level;
+our $error_level;
sub throw_error {
my ( $self, @args ) = @_;
- local $level = 1;
+ local $error_level = ($error_level || 0) + 1;
$self->raise_error($self->create_error(@args));
}
sub create_error {
my ( $self, @args ) = @_;
+ require Carp::Heavy;
+
+ local $error_level = ($error_level || 0 ) + 1;
+
if ( @args % 2 == 1 ) {
unshift @args, "message";
}
- my %args = ( meta => $self, error => $@, @args );
+ my %args = ( metaclass => $self, last_error => $@, @args );
- local $level = $level + 1;
-
- if ( my $class = $args{class} || ( ref $self && $self->error_class ) ) {
- return $self->create_error_object( %args, class => $class );
- } else {
- my $builder = $args{builder} || ( ref($self) ? $self->error_builder : "confess" );
-
- my $builder_method = ( ( ref($builder) && ref($builder) eq 'CODE' )
- ? $builder
- : ( $self->can("create_error_$builder") || "create_error_confess" ));
-
- return $self->$builder_method(%args);
- }
-}
+ $args{depth} += $error_level;
-sub create_error_object {
- my ( $self, %args ) = @_;
+ my $class = ref $self ? $self->error_class : "Moose::Error::Default";
- my $class = delete $args{class};
+ Class::MOP::load_class($class);
$class->new(
- %args,
- depth => ( ($args{depth} || 1) + ( $level + 1 ) ),
+ Carp::caller_info($args{depth}),
+ %args
);
}
-sub create_error_croak {
- my ( $self, @args ) = @_;
- $self->_create_error_carpmess( @args );
-}
-
-sub create_error_confess {
- my ( $self, @args ) = @_;
- $self->_create_error_carpmess( @args, longmess => 1 );
-}
-
-sub _create_error_carpmess {
- my ( $self, %args ) = @_;
-
- my $carp_level = $level + 1 + ( $args{depth} || 1 );
-
- local $Carp::CarpLevel = $carp_level; # $Carp::CarpLevel + $carp_level ?
- local $Carp::MaxArgNums = 20; # default is 8, usually we use named args which gets messier though
-
- my @args = exists $args{message} ? $args{message} : ();
-
- if ( $args{longmess} ) {
- return Carp::longmess(@args);
- } else {
- return Carp::shortmess(@args);
- }
-}
-
1;
__END__
L<Moose::Meta::Method::Destructor> respectively. These accessors are
read-write, so you can use them to change the class name.
+=item B<error_class ($class_name)>
+
+The name of the class used to throw errors. This default to
+L<Moose::Error::Default>, which generates an error with a stacktrace
+just like C<Carp::confess>.
+
+=item B<check_metaclass_compatibility>
+
+Moose overrides this method from C<Class::MOP::Class> and attempts to
+fix some incompatibilities before doing the check.
+
=item B<throw_error $message, %extra>
Throws the error created by C<create_error> using C<raise_error>
projects / gitmo/Moose.git / blobdiff