X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FClass.pm;h=c413292f09ba36c2969ce55294d8d8eaa6b98c10;hb=d519662a06488c8d15eecbb2858f9bad58986731;hp=fa2c92009b985e33e11a58cf1f156bd9c846abea;hpb=f3938c217bb3ff340d2744a56385df03b6847c3f;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Class.pm b/lib/Class/MOP/Class.pm index fa2c920..c413292 100644 --- a/lib/Class/MOP/Class.pm +++ b/lib/Class/MOP/Class.pm @@ -11,7 +11,8 @@ use Class::MOP::Method::Wrapped; use Carp 'confess'; use Scalar::Util 'blessed', 'weaken'; -our $VERSION = '0.65'; +our $VERSION = '0.64_01'; +$VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; use base 'Class::MOP::Module'; @@ -37,15 +38,6 @@ sub initialize { || $class->construct_class_instance(package => $package_name, @_); } -sub reinitialize { - my $class = shift; - my $package_name = shift; - (defined $package_name && $package_name && !blessed($package_name)) - || confess "You must pass a package name and it cannot be blessed"; - Class::MOP::remove_metaclass_by_name($package_name); - $class->construct_class_instance('package' => $package_name, @_); -} - # NOTE: (meta-circularity) # this is a special form of &construct_instance # (see below), which is used to construct class @@ -54,8 +46,8 @@ sub reinitialize { # normal &construct_instance. sub construct_class_instance { my $class = shift; - my %options = @_; - my $package_name = $options{'package'}; + my $options = @_ == 1 ? $_[0] : {@_}; + my $package_name = $options->{package}; (defined $package_name && $package_name) || confess "You must pass a package name"; # NOTE: @@ -82,14 +74,14 @@ sub construct_class_instance { my $meta; if ($class eq 'Class::MOP::Class') { no strict 'refs'; - $meta = $class->_new(%options) + $meta = $class->_new($options) } else { # NOTE: # it is safe to use meta here because # class will always be a subclass of # Class::MOP::Class, which defines meta - $meta = $class->meta->construct_instance(%options) + $meta = $class->meta->construct_instance($options) } # and check the metaclass compatibility @@ -106,10 +98,12 @@ sub construct_class_instance { } sub _new { - my ( $class, %options ) = @_; + my $class = shift; + my $options = @_ == 1 ? $_[0] : {@_}; + bless { # inherited from Class::MOP::Package - 'package' => $options{package}, + 'package' => $options->{package}, # NOTE: # since the following attributes will @@ -128,9 +122,9 @@ sub _new { 'methods' => {}, 'attributes' => {}, - 'attribute_metaclass' => $options{'attribute_metaclass'} || 'Class::MOP::Attribute', - 'method_metaclass' => $options{'method_metaclass'} || 'Class::MOP::Method', - 'instance_metaclass' => $options{'instance_metaclass'} || 'Class::MOP::Instance', + 'attribute_metaclass' => $options->{'attribute_metaclass'} || 'Class::MOP::Attribute', + 'method_metaclass' => $options->{'method_metaclass'} || 'Class::MOP::Method', + 'instance_metaclass' => $options->{'instance_metaclass'} || 'Class::MOP::Instance', }, $class; } @@ -312,12 +306,12 @@ sub get_method_map { my $current = Class::MOP::check_package_cache_flag($self->name); if (defined $self->{'_package_cache_flag'} && $self->{'_package_cache_flag'} == $current) { - return $self->{'methods'}; + return $self->{'methods'} ||= {}; } $self->{_package_cache_flag} = $current; - my $map = $self->{'methods'}; + my $map = $self->{'methods'} ||= {}; my $class_name = $self->name; my $method_metaclass = $self->method_metaclass; @@ -372,11 +366,12 @@ sub new_object { } sub construct_instance { - my ($class, %params) = @_; + my $class = shift; + my $params = @_ == 1 ? $_[0] : {@_}; my $meta_instance = $class->get_meta_instance(); my $instance = $meta_instance->create_instance(); foreach my $attr ($class->compute_all_applicable_attributes()) { - $attr->initialize_instance_slot($meta_instance, $instance, \%params); + $attr->initialize_instance_slot($meta_instance, $instance, $params); } # NOTE: # this will only work for a HASH instance type @@ -593,6 +588,20 @@ sub class_precedence_list { ## Methods +sub wrap_method_body { + my ( $self, %args ) = @_; + + my $body = delete $args{body}; # delete is for compat + + ('CODE' eq ref($body)) + || confess "Your code block must be a CODE reference"; + + $self->method_metaclass->wrap( $body => ( + package_name => $self->name, + %args, + )); +} + sub add_method { my ($self, $method_name, $method) = @_; (defined $method_name && $method_name) @@ -614,14 +623,7 @@ sub add_method { } else { $body = $method; - ('CODE' eq ref($body)) - || confess "Your code block must be a CODE reference"; - $method = $self->method_metaclass->wrap( - $body => ( - package_name => $self->name, - name => $method_name - ) - ); + $method = $self->wrap_method_body( body => $body, name => $method_name ); } $method->attach_to_class($self); @@ -719,6 +721,8 @@ sub alias_method { $self->add_package_symbol( { sigil => '&', type => 'CODE', name => $method_name } => $body ); + + $self->update_package_cache_flag; # the method map will not list aliased methods } sub has_method { @@ -726,8 +730,7 @@ sub has_method { (defined $method_name && $method_name) || confess "You must define a method name"; - return 0 unless exists $self->get_method_map->{$method_name}; - return 1; + exists $self->get_method_map->{$method_name}; } sub get_method { @@ -986,6 +989,25 @@ sub find_attribute_by_name { return; } +# check if we can reinitialize +sub is_pristine { + my $self = shift; + + # if any local attr is defined + return if $self->get_attribute_list; + + # or any non-declared methods + if ( my @methods = values %{ $self->get_method_map } ) { + my $metaclass = $self->method_metaclass; + foreach my $method ( @methods ) { + return if $method->isa("Class::MOP::Method::Generated"); + # FIXME do we need to enforce this too? return unless $method->isa($metaclass); + } + } + + return 1; +} + ## Class closing sub is_mutable { 1 } @@ -1077,7 +1099,9 @@ sub create_immutable_transformer { /], memoize => { class_precedence_list => 'ARRAY', - linearized_isa => 'ARRAY', + linearized_isa => 'ARRAY', # FIXME perl 5.10 memoizes this on its own, no need? + get_all_methods => 'ARRAY', + #get_all_attributes => 'ARRAY', # it's an alias, no need, but maybe in the future compute_all_applicable_attributes => 'ARRAY', get_meta_instance => 'SCALAR', get_method_map => 'SCALAR', @@ -1214,12 +1238,6 @@ as we use a special reserved slot (C<__MOP__>) to store this. This initializes and returns returns a B object for a given a C<$package_name>. -=item B - -This removes the old metaclass, and creates a new one in it's place. -Do B use this unless you really know what you are doing, it could -very easily make a very large mess of your program. - =item B This will construct an instance of B, it is @@ -1387,6 +1405,11 @@ This returns true if the class is still mutable. This returns true if the class has been made immutable. +=item B + +Checks whether the class has any data that will be lost if C is +called. + =back =head2 Inheritance Relationships @@ -1429,7 +1452,11 @@ Returns a HASH ref of name to CODE reference mapping for this class. Returns the class name of the method metaclass, see L for more information on the method metaclasses. -=item B +=item B + +Wrap a code ref (C<$attrs{body>) with C. + +=item B This will take a C<$method_name> and CODE reference to that C<$method> and install it into the class's package.