X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FAccessor%2FGrouped.pm;h=afe019bd62a15bb2f04c13edac472098cd61b093;hb=00e42e876950facc93918342bf6a4bfc1bc0a985;hp=5fe4c3daf3d022b01c031380fb7ebc5abc2b05cc;hpb=cc8ab1f27da5ced46c64e40474d7dd5f0be49fd7;p=p5sagit%2FClass-Accessor-Grouped.git diff --git a/lib/Class/Accessor/Grouped.pm b/lib/Class/Accessor/Grouped.pm index 5fe4c3d..afe019b 100644 --- a/lib/Class/Accessor/Grouped.pm +++ b/lib/Class/Accessor/Grouped.pm @@ -15,12 +15,12 @@ BEGIN { } } -our $VERSION = '0.10006'; +our $VERSION = '0.10007'; $VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases # when changing minimum version don't forget to adjust Makefile.PL as well our $__minimum_xsa_version; -BEGIN { $__minimum_xsa_version = '1.13' } +BEGIN { $__minimum_xsa_version = '1.15' } our $USE_XS; # the unless defined is here so that we can override the value @@ -29,7 +29,8 @@ $USE_XS = $ENV{CAG_USE_XS} unless defined $USE_XS; BEGIN { - package __CAG_ENV__; + package # hide from PAUSE + __CAG_ENV__; die "Huh?! No minimum C::XSA version?!\n" unless $__minimum_xsa_version; @@ -43,10 +44,23 @@ BEGIN { Module::Runtime::require_module('Sub::Name') } ? 0 : "$@" ); + my $found_cxsa; constant->import( NO_CXSA => ( !NO_SUBNAME() and eval { - Module::Runtime::use_module('Class::XSAccessor' => $__minimum_xsa_version) + Module::Runtime::require_module('Class::XSAccessor'); + $found_cxsa = Class::XSAccessor->VERSION; + Class::XSAccessor->VERSION($__minimum_xsa_version); } ) ? 0 : "$@" ); + if (NO_CXSA() and $found_cxsa and !$ENV{CAG_OLD_XS_NOWARN}) { + warn( + 'The installed version of Class::XSAccessor is too old ' + . "(v$found_cxsa < v$__minimum_xsa_version). Please upgrade " + . "to instantly quadruple the performance of 'simple' accessors. " + . 'Set $ENV{CAG_OLD_XS_NOWARN} if you wish to disable this ' + . "warning.\n" + ); + } + constant->import( BROKEN_GOTO => ($] < '5.008009') ? 1 : 0 ); constant->import( UNSTABLE_DOLLARAT => ($] < '5.013002') ? 1 : 0 ); @@ -64,7 +78,7 @@ BEGIN { # %$*@!?&!&#*$!!! sub _mk_group_accessors { my($self, $maker, $group, @fields) = @_; - my $class = Scalar::Util::blessed $self || $self; + my $class = length (ref ($self) ) ? ref ($self) : $self; no strict 'refs'; no warnings 'redefine'; @@ -76,21 +90,22 @@ sub _mk_group_accessors { my ($name, $field) = (ref $_) ? (@$_) : ($_, $_); - for (qw/DESTROY AUTOLOAD CLONE/) { - Carp::carp("Having a data accessor named '$name' in '$class' is unwise.") - if $name eq $_; - } + Carp::croak("Illegal accessor name '$name'") + unless $name =~ /\A[A-Z_a-z][0-9A-Z_a-z]*\z/; + + Carp::carp("Having a data accessor named '$name' in '$class' is unwise.") + if $name =~ /\A(?: DESTROY | AUTOLOAD | CLONE )\z/x; my $alias = "_${name}_accessor"; - for my $meth ($name, $alias) { + for ($name, $alias) { # the maker may elect to not return anything, meaning it already # installed the coderef for us (e.g. lack of Sub::Name) - my $cref = $self->$maker($group, $field, $meth) + my $cref = $self->$maker($group, $field, $_) or next; - my $fq_meth = "${class}::${meth}"; + my $fq_meth = "${class}::$_"; *$fq_meth = Sub::Name::subname($fq_meth, $cref); #unless defined &{$class."\:\:$field"} @@ -98,7 +113,7 @@ sub _mk_group_accessors { } }; -# coderef is setup at the end for clarity +# $gen_accessor coderef is setup at the end for clarity my $gen_accessor; =head1 NAME @@ -178,6 +193,7 @@ sub mk_group_ro_accessors { my($self, $group, @fields) = @_; $self->_mk_group_accessors('make_group_ro_accessor', $group, @fields); + return; } =head2 mk_group_wo_accessors @@ -202,6 +218,7 @@ sub mk_group_wo_accessors { my($self, $group, @fields) = @_; $self->_mk_group_accessors('make_group_wo_accessor', $group, @fields); + return; } =head2 get_simple @@ -220,7 +237,7 @@ name passed as an argument. =cut sub get_simple { - return $_[0]->{$_[1]}; + $_[0]->{$_[1]}; } =head2 set_simple @@ -239,7 +256,7 @@ for the field name passed as an argument. =cut sub set_simple { - return $_[0]->{$_[1]} = $_[2]; + $_[0]->{$_[1]} = $_[2]; } @@ -262,25 +279,25 @@ instances. =cut sub get_inherited { - my $class; - - if ( defined( $class = Scalar::Util::blessed $_[0] ) ) { + if ( length (ref ($_[0]) ) ) { if (Scalar::Util::reftype $_[0] eq 'HASH') { return $_[0]->{$_[1]} if exists $_[0]->{$_[1]}; + # everything in @_ is aliased, an assignment won't work + splice @_, 0, 1, ref($_[0]); } else { Carp::croak('Cannot get inherited value on an object instance that is not hash-based'); } } - else { - $class = $_[0]; - } + # if we got this far there is nothing in the instance + # OR this is a class call + # in any case $_[0] contains the class name (see splice above) no strict 'refs'; no warnings 'uninitialized'; my $cag_slot = '::__cag_'. $_[1]; - return ${$class.$cag_slot} if defined(${$class.$cag_slot}); + return ${$_[0].$cag_slot} if defined(${$_[0].$cag_slot}); do { return ${$_.$cag_slot} if defined(${$_.$cag_slot}) } for $_[0]->get_super_paths; @@ -309,17 +326,16 @@ hash-based object. =cut sub set_inherited { - if (defined Scalar::Util::blessed $_[0]) { + if (length (ref ($_[0]) ) ) { if (Scalar::Util::reftype $_[0] eq 'HASH') { return $_[0]->{$_[1]} = $_[2]; } else { Carp::croak('Cannot set inherited value on an object instance that is not hash-based'); }; - } else { - no strict 'refs'; + } - return ${$_[0].'::__cag_'.$_[1]} = $_[2]; - }; + no strict 'refs'; + ${$_[0].'::__cag_'.$_[1]} = $_[2]; } =head2 get_component_class @@ -344,7 +360,7 @@ Gets the value of the specified component class. =cut sub get_component_class { - return $_[0]->get_inherited($_[1]); + $_[0]->get_inherited($_[1]); }; =head2 set_component_class @@ -389,7 +405,7 @@ sub set_component_class { } }; - return $_[0]->set_inherited($_[1], $_[2]); + $_[0]->set_inherited($_[1], $_[2]); }; =head1 INTERNAL METHODS @@ -569,62 +585,98 @@ if (! defined $USE_XS) { $xsa_autodetected++; } +my $perlstring; +if ($] < '5.008') { + require Data::Dumper; + my $d = Data::Dumper->new([])->Indent(0)->Purity(0)->Pad('')->Useqq(1)->Terse(1)->Freezer('')->Toaster(''); + $perlstring = sub { $d->Values([shift])->Dump }; +} +else { + require B; + $perlstring = \&B::perlstring; +} + + my $maker_templates = { rw => { - xs_call => 'accessors', - pp_code => sub { - my $set = "set_$_[0]"; - my $get = "get_$_[0]"; - my $field = $_[1]; - $field =~ s/'/\\'/g; - - " - \@_ != 1 - ? shift->$set('$field', \@_) - : shift->$get('$field') - " + cxsa_call => 'accessors', + pp_generator => sub { + # my ($group, $fieldname) = @_; + my $quoted_fieldname = $perlstring->($_[1]); + sprintf <<'EOS', ($_[0], $quoted_fieldname) x 2; + +@_ > 1 + ? shift->set_%s(%s, @_) + : shift->get_%s(%s) +EOS + }, }, ro => { - xs_call => 'getters', - pp_code => sub { - my $get = "get_$_[0]"; - my $field = $_[1]; - $field =~ s/'/\\'/g; - - " - \@_ == 1 - ? shift->$get('$field') - : do { - my \$caller = caller; - my \$class = ref \$_[0] || \$_[0]; - Carp::croak(\"'\$caller' cannot alter the value of '$field' \". - \"(read-only attributes of class '\$class')\"); - } - " + cxsa_call => 'getters', + pp_generator => sub { + # my ($group, $fieldname) = @_; + my $quoted_fieldname = $perlstring->($_[1]); + sprintf <<'EOS', $_[0], $quoted_fieldname; + +@_ > 1 + ? do { + my ($meth) = (caller(0))[3] =~ /([^\:]+)$/; + my $class = length( ref($_[0]) ) ? ref($_[0]) : $_[0]; + Carp::croak( + "'$meth' cannot alter its value (read-only attribute of class $class)" + ); + } + : shift->get_%s(%s) +EOS + }, }, wo => { - xs_call => 'setters', - pp_code => sub { - my $set = "set_$_[0]"; - my $field = $_[1]; - $field =~ s/'/\\'/g; - - " - \@_ != 1 - ? shift->$set('$field', \@_) - : do { - my \$caller = caller; - my \$class = ref \$_[0] || \$_[0]; - Carp::croak(\"'\$caller' cannot access the value of '$field' \". - \"(write-only attributes of class '\$class')\"); - } - " + cxsa_call => 'setters', + pp_generator => sub { + # my ($group, $fieldname) = @_; + my $quoted_fieldname = $perlstring->($_[1]); + sprintf <<'EOS', $_[0], $quoted_fieldname; + +@_ > 1 + ? shift->set_%s(%s, @_) + : do { + my ($meth) = (caller(0))[3] =~ /([^\:]+)$/; + my $class = length( ref($_[0]) ) ? ref($_[0]) : $_[0]; + Carp::croak( + "'$meth' cannot access its value (write-only attribute of class $class)" + ); + } +EOS + }, }, }; +my $cag_eval = sub { + #my ($src, $no_warnings, $err_msg) = @_; + + my $src = sprintf "{ %s warnings; use strict; no strict 'refs'; %s }", + $_[1] ? 'no' : 'use', + $_[0], + ; + + my (@rv, $err); + { + local $@ if __CAG_ENV__::UNSTABLE_DOLLARAT; + wantarray + ? @rv = eval $src + : $rv[0] = eval $src + ; + $err = $@ if $@ ne ''; + } + + Carp::croak(join ': ', ($_[2] || 'String-eval failed'), "$err\n$src\n" ) + if defined $err; + + wantarray ? @rv : $rv[0]; +}; my ($accessor_maker_cache, $no_xsa_warned_classes); @@ -636,9 +688,7 @@ my $original_simple_setter = __PACKAGE__->can ('set_simple'); # Note!!! Unusual signature $gen_accessor = sub { my ($type, $class, $group, $field, $methname) = @_; - if (my $c = Scalar::Util::blessed( $class )) { - $class = $c; - } + $class = ref $class if length ref $class; # When installing an XSA simple accessor, we need to make sure we are not # short-circuiting a (compile or runtime) get_simple/set_simple override. @@ -655,7 +705,7 @@ $gen_accessor = sub { my ($expected_cref, $cached_implementation); my $ret = $expected_cref = sub { - my $current_class = Scalar::Util::blessed( $_[0] ) || $_[0]; + my $current_class = length (ref ($_[0] ) ) ? ref ($_[0]) : $_[0]; # $cached_implementation will be set only if the shim got # 'around'ed, in which case it is handy to avoid re-running @@ -679,7 +729,7 @@ $gen_accessor = sub { Class::XSAccessor->import( replace => 1, class => '__CAG__XSA__BREEDER__', - $maker_templates->{$type}{xs_call} => { + $maker_templates->{$type}{cxsa_call} => { $methname => $field, }, ); @@ -730,7 +780,7 @@ $gen_accessor = sub { "Deferred version of method $cframe[3] invoked more than once (originally " . "invoked at $already_seen). This is a strong indication your code has " . 'cached the original ->can derived method coderef, and is using it instead ' - . 'of the proper method re-lookup, causing performance regressions' + . 'of the proper method re-lookup, causing minor performance regressions' ); } else { @@ -768,11 +818,11 @@ $gen_accessor = sub { # no Sub::Name - just install the coderefs directly (compiling every time) elsif (__CAG_ENV__::NO_SUBNAME) { my $src = $accessor_maker_cache->{source}{$type}{$group}{$field} ||= - $maker_templates->{$type}{pp_code}->($group, $field); + $maker_templates->{$type}{pp_generator}->($group, $field); - no warnings 'redefine'; - local $@ if __CAG_ENV__::UNSTABLE_DOLLARAT; - eval "sub ${class}::${methname} { $src }"; + $cag_eval->( + "no warnings 'redefine'; sub ${class}::${methname} { $src }; 1", + ); undef; # so that no further attempt will be made to install anything } @@ -781,10 +831,9 @@ $gen_accessor = sub { else { ($accessor_maker_cache->{pp}{$type}{$group}{$field} ||= do { my $src = $accessor_maker_cache->{source}{$type}{$group}{$field} ||= - $maker_templates->{$type}{pp_code}->($group, $field); + $maker_templates->{$type}{pp_generator}->($group, $field); - local $@ if __CAG_ENV__::UNSTABLE_DOLLARAT; - eval "sub { my \$dummy; sub { \$dummy if 0; $src } }" or die $@; + $cag_eval->( "sub { my \$dummy; sub { \$dummy if 0; $src } }" ); })->() } };