use strict;
use warnings;
-use Carp 'confess';
use Scalar::Util 'blessed', 'weaken', 'looks_like_number';
-our $VERSION = '0.57';
+our $VERSION = '0.62';
our $AUTHORITY = 'cpan:STEVAN';
use base 'Moose::Meta::Method',
my $class = shift;
my %options = @_;
- (exists $options{options} && ref $options{options} eq 'HASH')
- || confess "You must pass a hash of options";
+ my $meta = $options{metaclass};
+
+ (ref $options{options} eq 'HASH')
+ || $class->throw_error("You must pass a hash of options", data => $options{options});
($options{package_name} && $options{name})
- || confess "You must supply the package_name and name parameters $Class::MOP::Method::UPGRADE_ERROR_TEXT";
+ || $class->throw_error("You must supply the package_name and name parameters $Class::MOP::Method::UPGRADE_ERROR_TEXT");
my $self = bless {
# from our superclass
- '&!body' => undef,
- '$!package_name' => $options{package_name},
- '$!name' => $options{name},
+ 'body' => undef,
+ 'package_name' => $options{package_name},
+ 'name' => $options{name},
# specific to this subclass
- '%!options' => $options{options},
- '$!meta_instance' => $options{metaclass}->get_meta_instance,
- '@!attributes' => [ $options{metaclass}->compute_all_applicable_attributes ],
+ 'options' => $options{options},
+ 'meta_instance' => $meta->get_meta_instance,
+ 'attributes' => [ $meta->compute_all_applicable_attributes ],
# ...
- '$!associated_metaclass' => $options{metaclass},
+ 'associated_metaclass' => $meta,
} => $class;
# we don't want this creating
# a cycle in the code, if not
# needed
- weaken($self->{'$!associated_metaclass'});
+ weaken($self->{'associated_metaclass'});
$self->initialize_body;
## accessors
-sub options { (shift)->{'%!options'} }
-sub meta_instance { (shift)->{'$!meta_instance'} }
-sub attributes { (shift)->{'@!attributes'} }
+sub options { (shift)->{'options'} }
+sub meta_instance { (shift)->{'meta_instance'} }
+sub attributes { (shift)->{'attributes'} }
-sub associated_metaclass { (shift)->{'$!associated_metaclass'} }
+sub associated_metaclass { (shift)->{'associated_metaclass'} }
## method
# this was changed in 0.41, but broke MooseX::Singleton, so try to catch
# any other code using the original broken spelling
-sub intialize_body { confess "Please correct the spelling of 'intialize_body' to 'initialize_body'" }
+sub intialize_body { Moose->throw_error("Please correct the spelling of 'intialize_body' to 'initialize_body'") }
sub initialize_body {
my $self = shift;
my $code;
{
+ my $meta = $self; # FIXME for _inline_throw_error...
+
# NOTE:
# create the nessecary lexicals
# to be picked up in the eval
} @type_constraints;
$code = eval $source;
- confess "Could not eval the constructor :\n\n$source\n\nbecause :\n\n$@" if $@;
+ $self->throw_error("Could not eval the constructor :\n\n$source\n\nbecause :\n\n$@", error => $@, data => $source ) if $@;
}
- $self->{'&!body'} = $code;
+ $self->{'body'} = $code;
}
sub _generate_BUILDARGS {
if ( $args eq '@_' and ( !$buildargs or $buildargs->body == \&Moose::Object::BUILDARGS ) ) {
return join("\n",
'do {',
- 'confess "Single parameters to new() must be a HASH ref"',
+ $self->_inline_throw_error('"Single parameters to new() must be a HASH ref"', 'data => $_[0]'),
' if scalar @_ == 1 && defined $_[0] && ref($_[0]) ne q{HASH};',
'(scalar @_ == 1) ? {%{$_[0]}} : {@_};',
'}',
if ($is_moose && defined($attr->init_arg) && $attr->is_required && !$attr->has_default && !$attr->has_builder) {
push @source => ('(exists $params->{\'' . $attr->init_arg . '\'}) ' .
- '|| confess "Attribute (' . $attr->name . ') is required";');
+ '|| ' . $self->_inline_throw_error('"Attribute (' . $attr->name . ') is required"') .';');
}
if (($attr->has_default || $attr->has_builder) && !($is_moose && $attr->is_lazy)) {
sub _generate_type_constraint_check {
my ($self, $attr, $type_constraint_cv, $type_constraint_obj, $value_name) = @_;
return (
- $type_constraint_cv . '->(' . $value_name . ')'
- . "\n\t" . '|| confess "Attribute ('
+ $self->_inline_throw_error('"Attribute (' # FIXME add 'dad'
. $attr->name
. ') does not pass the type constraint because: " . '
- . $type_constraint_obj . '->get_message(' . $value_name . ');'
+ . $type_constraint_obj . '->get_message(' . $value_name . ')')
+ . "\n\t unless " . $type_constraint_cv . '->(' . $value_name . ');'
);
}
else {
my $default = $attr->default;
# make sure to quote strings ...
- unless (looks_like_number($default)) {
- $default = "'$default'";
- }
-
- return $default;
+ return "'$default'";
+
}
}