X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP.pm;h=10764122cf7519b29a7d19f4098fd539ce0e9670;hb=b7bdaeb4dabcafe91153b5c3000ebdbc30aa8114;hp=e3c38ffb7becd14d2c299fabf38c4c9b24e93560;hpb=efc98200d49cae9fb74285a58d12e3b988da0a97;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP.pm b/lib/Class/MOP.pm index e3c38ff..1076412 100644 --- a/lib/Class/MOP.pm +++ b/lib/Class/MOP.pm @@ -10,6 +10,7 @@ use MRO::Compat; use Carp 'confess'; use Scalar::Util 'weaken', 'reftype', 'blessed'; +use Try::Tiny; use Class::MOP::Class; use Class::MOP::Attribute; @@ -20,16 +21,11 @@ BEGIN { ? sub () { 0 } : sub () { 1 }; - sub HAVE_ISAREV () { - Carp::cluck("Class::MOP::HAVE_ISAREV is deprecated and will be removed in a future release. It has always returned 1 anyway."); - return 1; - } - # this is either part of core or set up appropriately by MRO::Compat *check_package_cache_flag = \&mro::get_pkg_gen; } -our $VERSION = '0.89'; +our $VERSION = '0.95'; our $XS_VERSION = $VERSION; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; @@ -80,7 +76,7 @@ sub _class_to_pmfile { sub load_first_existing_class { my @classes = @_ - or return; + or return; foreach my $class (@classes) { unless ( _is_valid_class_name($class) ) { @@ -91,54 +87,40 @@ sub load_first_existing_class { my $found; my %exceptions; - for my $class (@classes) { - my $pmfile = _class_to_pmfile($class); - my $e = _try_load_one_class($class); - if ($e) { - $exceptions{$class} = $e; - last if $e !~ /^Can't locate \Q$pmfile\E in \@INC/; - } - else { - $found = $class; - last; - } - } + for my $class (@classes) { + my $file = _class_to_pmfile($class); - return $found if $found; + return $class if is_class_loaded($class);; - confess join( - "\n", - map { - sprintf( - "Could not load class (%s) because : %s", $_, - $exceptions{$_} - ) + return $class if try { + local $SIG{__DIE__}; + require $file; + return 1; + } + catch { + unless (/^Can't locate \Q$file\E in \@INC/) { + confess "Couldn't load class ($class) because: $_"; } - grep { - exists $exceptions{$_} - } @classes - ); -} - -sub _try_load_one_class { - my $class = shift; - return if is_class_loaded($class); - - my $file = _class_to_pmfile($class); + return; + }; + } - return do { - local $@; - local $SIG{__DIE__}; - eval { require($file) }; - $@; - }; + if ( @classes > 1 ) { + confess "Can't locate any of @classes in \@INC (\@INC contains: @INC)."; + } else { + confess "Can't locate " . _class_to_pmfile($classes[0]) . " in \@INC (\@INC contains: @INC)."; + } } sub load_class { - my $class = load_first_existing_class($_[0]); - return get_metaclass_by_name($class) || $class; + load_first_existing_class($_[0]); + + # This is done to avoid breaking code which checked the return value. Said + # code is dumb. The return value was _always_ true, since it dies on + # failure! + return 1; } sub _is_valid_class_name { @@ -153,18 +135,6 @@ sub _is_valid_class_name { return 0; } -sub subname { - require Sub::Name; - Carp::carp("Class::MOP::subname is deprecated. Please use Sub::Name directly."); - goto \&Sub::Name::subname; -} - -sub in_global_destruction { - require Devel::GlobalDestruction; - Carp::carp("Class::MOP::in_global_destruction is deprecated. Please use Devel::GlobalDestruction directly."); - goto \&Devel::GlobalDestruction::in_global_destruction; -} - ## ---------------------------------------------------------------------------- ## Setting up our environment ... ## ---------------------------------------------------------------------------- @@ -219,6 +189,42 @@ Class::MOP::Package->meta->add_attribute( )) ); +Class::MOP::Package->meta->add_attribute( + Class::MOP::Attribute->new('_methods' => ( + reader => { + # NOTE: + # we just alias the original method + # rather than re-produce it here + '_full_method_map' => \&Class::MOP::Package::_full_method_map + }, + default => sub { {} } + )) +); + +Class::MOP::Package->meta->add_attribute( + Class::MOP::Attribute->new('method_metaclass' => ( + reader => { + # NOTE: + # we just alias the original method + # rather than re-produce it here + 'method_metaclass' => \&Class::MOP::Package::method_metaclass + }, + default => 'Class::MOP::Method', + )) +); + +Class::MOP::Package->meta->add_attribute( + Class::MOP::Attribute->new('wrapped_method_metaclass' => ( + reader => { + # NOTE: + # we just alias the original method + # rather than re-produce it here + 'wrapped_method_metaclass' => \&Class::MOP::Package::wrapped_method_metaclass + }, + default => 'Class::MOP::Method::Wrapped', + )) +); + ## -------------------------------------------------------- ## Class::MOP::Module @@ -276,25 +282,13 @@ Class::MOP::Class->meta->add_attribute( # # we just alias the original method # rather than re-produce it here - 'get_attribute_map' => \&Class::MOP::Class::get_attribute_map + '_attribute_map' => \&Class::MOP::Class::_attribute_map }, default => sub { {} } )) ); Class::MOP::Class->meta->add_attribute( - Class::MOP::Attribute->new('methods' => ( - reader => { - # NOTE: - # we just alias the original method - # rather than re-produce it here - 'get_method_map' => \&Class::MOP::Class::get_method_map - }, - default => sub { {} } - )) -); - -Class::MOP::Class->meta->add_attribute( Class::MOP::Attribute->new('superclasses' => ( accessor => { # NOTE: @@ -320,30 +314,6 @@ Class::MOP::Class->meta->add_attribute( ); Class::MOP::Class->meta->add_attribute( - Class::MOP::Attribute->new('method_metaclass' => ( - reader => { - # NOTE: - # we just alias the original method - # rather than re-produce it here - 'method_metaclass' => \&Class::MOP::Class::method_metaclass - }, - default => 'Class::MOP::Method', - )) -); - -Class::MOP::Class->meta->add_attribute( - Class::MOP::Attribute->new('wrapped_method_metaclass' => ( - reader => { - # NOTE: - # we just alias the original method - # rather than re-produce it here - 'wrapped_method_metaclass' => \&Class::MOP::Class::wrapped_method_metaclass - }, - default => 'Class::MOP::Method::Wrapped', - )) -); - -Class::MOP::Class->meta->add_attribute( Class::MOP::Attribute->new('instance_metaclass' => ( reader => { # NOTE: we need to do this in order @@ -676,6 +646,7 @@ Class::MOP::Instance->meta->add_attribute( ), ); +require Class::MOP::Deprecated unless our $no_deprecated; # we need the meta instance of the meta instance to be created now, in order # for the constructor to be able to use it @@ -691,8 +662,7 @@ undef Class::MOP::Instance->meta->{_package_cache_flag}; # the compile time of the MOP, and gives us no actual benefits. $_->meta->make_immutable( - inline_constructor => 1, - replace_constructor => 1, + inline_constructor => 0, constructor_name => "_new", inline_accessors => 0, ) for qw/ @@ -928,8 +898,11 @@ Note that these are all called as B. This will load the specified C<$class_name>, if it is not already loaded (as reported by C). This function can be used in place of tricks like C or using C -unconditionally. This will return the metaclass of C<$class_name> if -one exists, otherwise it will return C<$class_name>. +unconditionally. + +If the module cannot be loaded, an exception is thrown. + +For historical reasons, this function explicitly returns a true value. =item B @@ -1082,7 +1055,7 @@ L =over 4 -=item L +=item L =item L