X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FMethod%2FAccessor.pm;h=d643816cf02d4869ce82ad3dcae21e57f71d62fd;hb=66e3df7a8d3d839b53f6fc3af8f4bad6fc27fefe;hp=fcee6b82f44ea583f29bcdf7ca745a05bf601b0c;hpb=7e0e6837dcef39d945629cb04d5f4d7619b08034;p=gitmo%2FMouse.git diff --git a/lib/Mouse/Meta/Method/Accessor.pm b/lib/Mouse/Meta/Method/Accessor.pm old mode 100755 new mode 100644 index fcee6b8..d643816 --- a/lib/Mouse/Meta/Method/Accessor.pm +++ b/lib/Mouse/Meta/Method/Accessor.pm @@ -1,6 +1,8 @@ package Mouse::Meta::Method::Accessor; use Mouse::Util qw(:meta); # enables strict and warnings +use constant _MOUSE_DEBUG => $ENV{MOUSE_DEBUG} ? 1 : 0; + sub _inline_slot{ my(undef, $self_var, $attr_name) = @_; return sprintf '%s->{q{%s}}', $self_var, $attr_name; @@ -16,9 +18,13 @@ sub _generate_accessor_any{ my $trigger = $attribute->trigger; my $is_weak = $attribute->is_weak_ref; my $should_deref = $attribute->should_auto_deref; - my $should_coerce = (defined($constraint) && $constraint->has_coercion && $attribute->should_coerce); + my $should_coerce = (defined($constraint) + && $constraint->has_coercion + && $attribute->should_coerce); - my $compiled_type_constraint = defined($constraint) ? $constraint->_compiled_type_constraint : undef; + my $compiled_type_constraint = defined($constraint) + ? $constraint->_compiled_type_constraint + : undef; my $self = '$_[0]'; my $slot = $method_class->_inline_slot($self, $name);; @@ -28,15 +34,15 @@ sub _generate_accessor_any{ if ($type eq 'rw' || $type eq 'wo') { if($type eq 'rw'){ - $accessor .= + $accessor .= 'if (scalar(@_) >= 2) {' . "\n"; } else{ # writer - $accessor .= - 'if(@_ < 2){ Carp::confess("Not enough arguments for the writer of '.$name.'") }'. + $accessor .= + 'if(@_ < 2){ Carp::confess("Not enough arguments for the writer of $name") }'. '{' . "\n"; } - + my $value = '$_[1]'; if (defined $constraint) { @@ -46,7 +52,7 @@ sub _generate_accessor_any{ 'my $val = $constraint->coerce('.$value.');'; $value = '$val'; } - $accessor .= + $accessor .= "\n". '$compiled_type_constraint->('.$value.') or $attribute->_throw_type_constraint_error('.$value.', $constraint);' . "\n"; @@ -69,7 +75,7 @@ sub _generate_accessor_any{ $accessor .= "}\n"; } elsif($type eq 'ro') { - $accessor .= 'Carp::confess("Cannot assign a value to a read-only accessor") if scalar(@_) >= 2;' . "\n"; + $accessor .= 'Carp::confess("Cannot assign a value to a read-only accessor of $name") if scalar(@_) >= 2;' . "\n"; } else{ $class->throw_error("Unknown accessor type '$type'"); @@ -95,7 +101,6 @@ sub _generate_accessor_any{ } elsif(defined $constraint){ $accessor .= "my \$tmp = $value;\n"; - $accessor .= "\$compiled_type_constraint->(\$tmp)"; $accessor .= " || \$attribute->_throw_type_constraint_error(\$tmp, \$constraint);\n"; $accessor .= "$slot = \$tmp;\n"; @@ -123,7 +128,7 @@ sub _generate_accessor_any{ $accessor .= "return $slot;\n}\n"; - #print $accessor, "\n"; + warn $accessor if _MOUSE_DEBUG; my $code; my $e = do{ local $@; @@ -182,7 +187,7 @@ Mouse::Meta::Method::Accessor - A Mouse method generator for accessors =head1 VERSION -This document describes Mouse version 0.63 +This document describes Mouse version 0.88 =head1 SEE ALSO