use base qw(Moo::Object);
use Sub::Quote;
use B 'perlstring';
+use Scalar::Util 'blessed';
+use overload ();
+use Module::Runtime qw(use_module);
BEGIN {
our $CAN_HAZ_XS =
!$ENV{MOO_XS_DISABLE}
if ($is eq 'ro') {
$spec->{reader} = $name unless exists $spec->{reader};
} elsif ($is eq 'rw') {
- $spec->{accessor} = $name unless exists $spec->{accessor};
+ $spec->{accessor} = $name unless exists $spec->{accessor}
+ or ( $spec->{reader} and $spec->{writer} );
} elsif ($is eq 'lazy') {
$spec->{reader} = $name unless exists $spec->{reader};
$spec->{lazy} = 1;
} elsif ($is ne 'bare') {
die "Unknown is ${is}";
}
- $spec->{builder} = '_build_'.$name if ($spec->{builder}||0) eq 1;
+ if (exists $spec->{builder}) {
+ if(ref $spec->{builder}) {
+ die "Invalid builder for $into->$name - not a method name, coderef or"
+ . " code-convertible object"
+ unless ref $spec->{builder} eq 'CODE'
+ or (blessed($spec->{builder}) and eval { \&{$spec->{builder}} });
+ $spec->{builder_sub} = $spec->{builder};
+ $spec->{builder} = 1;
+ }
+ $spec->{builder} = '_build_'.$name if ($spec->{builder}||0) eq 1;
+ die "Invalid builder for $into->$name - not a valid method name"
+ if $spec->{builder} !~ /\A[A-Za-z_][A-Za-z0-9_]*(?:::[A-Za-z_][A-Za-z0-9_]*)*\z/;
+ }
if (($spec->{predicate}||0) eq 1) {
$spec->{predicate} = $name =~ /^_/ ? "_has${name}" : "has_${name}";
}
if (($spec->{trigger}||0) eq 1) {
$spec->{trigger} = quote_sub('shift->_trigger_'.$name.'(@_)');
}
- if (exists $spec->{default}) {
- my $default = $spec->{default};
- require Scalar::Util;
- if (not ref $default) {
- die "Invalid default $default";
- }
- elsif (Scalar::Util::reftype $default ne 'CODE') {
- if (Scalar::Util::blessed $default) {
- die "Invalid default $default" unless $default->can('(&{}');
- }
- else {
- die "Invalid default $default";
- }
- }
+
+ for my $setting (qw( default coerce )) {
+ next if !exists $spec->{$setting};
+ my $value = $spec->{$setting};
+ my $invalid = "Invalid $setting '" . overload::StrVal($value)
+ . "' for $into->$name - not a coderef";
+ die "$invalid or code-convertible object"
+ unless ref $value and (ref $value eq 'CODE' or blessed($value));
+ die "$invalid and could not be converted to a coderef: $@"
+ if !eval { \&$value };
}
my %methods;
' '.$self->_generate_simple_has('$_[0]', $name, $spec)."\n"
;
}
+ if (my $pred = $spec->{builder_sub}) {
+ _install_coderef( "${into}::$spec->{builder}" => $spec->{builder_sub} );
+ }
if (my $cl = $spec->{clearer}) {
$methods{$cl} =
quote_sub "${into}::${cl}" =>
map [ $_ => ref($hspec->{$_}) ? @{$hspec->{$_}} : $hspec->{$_} ],
keys %$hspec;
} elsif (!ref($hspec)) {
- map [ $_ => $_ ], Role::Tiny->methods_provided_by($hspec);
+ map [ $_ => $_ ], use_module('Role::Tiny')->methods_provided_by(use_module($hspec))
} else {
die "You gave me a handles of ${hspec} and I have no idea why";
}
'do { '.$self->_generate_use_default(
'$_[0]', $name, $spec,
$self->_generate_simple_has('$_[0]', $name, $spec),
- ).'; '.$simple.' }';
+ ).'; '
+ .($spec->{isa}
+ ?($self->_generate_isa_check($name, $simple, $spec->{isa}).'; ')
+ :''
+ )
+ .$simple.' }';
}
}
($code, delete $self->{captures});
}
+sub _attr_desc {
+ my ($name, $init_arg) = @_;
+ return perlstring($name) if !defined($init_arg) or $init_arg eq $name;
+ return perlstring($name).' (constructor argument: '.perlstring($init_arg).')';
+}
+
sub _generate_coerce {
- my ($self, $name, $value, $coerce) = @_;
- $self->_generate_call_code($name, 'coerce', "${value}", $coerce);
+ my ($self, $name, $value, $coerce, $init_arg) = @_;
+ $self->_generate_die_prefix(
+ "coercion for ${\_attr_desc($name, $init_arg)} failed: ",
+ $self->_generate_call_code($name, 'coerce', "${value}", $coerce)
+ );
}
sub generate_trigger {
($code, delete $self->{captures});
}
+sub _generate_die_prefix {
+ my ($self, $prefix, $inside) = @_;
+ "do {\n"
+ .' my $sig_die = $SIG{__DIE__} || sub { die $_[0] };'."\n"
+ .' local $SIG{__DIE__} = sub {'."\n"
+ .' $sig_die->(ref($_[0]) ? $_[0] : '.perlstring($prefix).'.$_[0]);'."\n"
+ .' };'."\n"
+ .$inside
+ ."}\n"
+}
+
sub _generate_isa_check {
- my ($self, $name, $value, $check) = @_;
- $self->_generate_call_code($name, 'isa_check', $value, $check);
+ my ($self, $name, $value, $check, $init_arg) = @_;
+ $self->_generate_die_prefix(
+ "isa check for ${\_attr_desc($name, $init_arg)} failed: ",
+ $self->_generate_call_code($name, 'isa_check', $value, $check)
+ );
}
sub _generate_call_code {
my ($self, $name, $type, $values, $sub) = @_;
if (my $quoted = quoted_from_sub($sub)) {
my $code = $quoted->[1];
- my $at_ = '@_ = ('.$values.');';
if (my $captures = $quoted->[2]) {
my $cap_name = qq{\$${type}_captures_for_${name}};
$self->{captures}->{$cap_name} = \$captures;
Sub::Quote::inlinify(
- $code, $values, Sub::Quote::capture_unroll($cap_name, $captures, 6)
+ $code, $values, Sub::Quote::capture_unroll($cap_name, $captures, 6), 1
);
} else {
- Sub::Quote::inlinify($code, $values);
+ Sub::Quote::inlinify($code, $values, undef, 1);
}
} else {
my $cap_name = qq{\$${type}_for_${name}};
}
sub _generate_populate_set {
- my ($self, $me, $name, $spec, $source, $test) = @_;
+ my ($self, $me, $name, $spec, $source, $test, $init_arg) = @_;
if ($self->has_eager_default($name, $spec)) {
my $get_indent = ' ' x ($spec->{isa} ? 6 : 4);
my $get_default = $self->_generate_get_default(
if ($spec->{coerce}) {
$get_value = $self->_generate_coerce(
$name, $get_value,
- $spec->{coerce}
+ $spec->{coerce}, $init_arg
)
}
($spec->{isa}
? " {\n my \$value = ".$get_value.";\n "
.$self->_generate_isa_check(
- $name, '$value', $spec->{isa}
+ $name, '$value', $spec->{isa}, $init_arg
).";\n"
.' '.$self->_generate_simple_set($me, $name, $spec, '$value').";\n"
." }\n"
? " $source = "
.$self->_generate_coerce(
$name, $source,
- $spec->{coerce}
+ $spec->{coerce}, $init_arg
).";\n"
: ""
)
.($spec->{isa}
? " "
.$self->_generate_isa_check(
- $name, $source, $spec->{isa}
+ $name, $source, $spec->{isa}, $init_arg
).";\n"
: ""
)
}
}
-sub generate_multi_set {
- my ($self, $me, $to_set, $from) = @_;
- "\@{${me}}{qw(${\join ' ', @$to_set})} = $from";
-}
-
sub _generate_core_set {
my ($self, $me, $name, $spec, $value) = @_;
my $name_str = perlstring $name;
#
# but requires XS and is just too damn crazy
# so simply throw a better exception
- my $weak_simple = "my \$preserve; Scalar::Util::weaken(${simple})";
+ my $weak_simple = "my \$preserve; Scalar::Util::weaken(${simple}); no warnings 'void'; \$preserve";
Moo::_Utils::lt_5_8_3() ? <<"EOC" : $weak_simple;
my \$preserve;
- eval { Scalar::Util::weaken($simple); 1 } or do {
- if( \$@ =~ /Modification of a read-only value attempted/) {
- require Carp;
- Carp::croak( sprintf (
- 'Reference to readonly value in "%s" can not be weakened on Perl < 5.8.3',
- $name_str,
- ) );
- } else {
- die \$@;
+ eval { Scalar::Util::weaken($simple); 1 }
+ ? do { no warnings 'void'; \$preserve; }
+ : do {
+ if( \$@ =~ /Modification of a read-only value attempted/) {
+ require Carp;
+ Carp::croak( sprintf (
+ 'Reference to readonly value in "%s" can not be weakened on Perl < 5.8.3',
+ $name_str,
+ ) );
+ } else {
+ die \$@;
+ }
}
- };
EOC
} else {
$self->_generate_core_set($me, $name, $spec, $value);
projects / gitmo/Moo.git / blobdiff