X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FClass.pm;h=b2cb51d9e665aca776a84672703039d0c4e5ceeb;hb=9d6dce77cd867d92c418eb4fcfd199eaca6efc10;hp=1b4580fb57573debff91009fc48c71f3a6277162;hpb=fa16e528c74e94ce28ddd8f6e7d8421e5ec0b3c9;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Class.pm b/lib/Class/MOP/Class.pm index 1b4580f..b2cb51d 100644 --- a/lib/Class/MOP/Class.pm +++ b/lib/Class/MOP/Class.pm @@ -5,11 +5,13 @@ use strict; use warnings; use Carp 'confess'; -use Scalar::Util 'blessed', 'reftype'; +use Scalar::Util 'blessed', 'reftype', 'weaken'; use Sub::Name 'subname'; use B 'svref_2object'; -our $VERSION = '0.14'; +our $VERSION = '0.17'; + +use base 'Class::MOP::Module'; use Class::MOP::Instance; @@ -17,6 +19,15 @@ use Class::MOP::Instance; sub meta { Class::MOP::Class->initialize(blessed($_[0]) || $_[0]) } +# Class globals ... + +# NOTE: +# we need a sufficiently annoying prefix +# this should suffice for now, this is +# used in a couple of places below, so +# need to put it up here for now. +my $ANON_CLASS_PREFIX = 'Class::MOP::Class::__ANON__::SERIAL::'; + # Creation { @@ -40,6 +51,15 @@ sub meta { Class::MOP::Class->initialize(blessed($_[0]) || $_[0]) } $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"; + $METAS{$package_name} = undef; + $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 @@ -59,16 +79,27 @@ sub meta { Class::MOP::Class->initialize(blessed($_[0]) || $_[0]) } # annoyingly enough during global destruction) return $METAS{$package_name} if exists $METAS{$package_name} && defined $METAS{$package_name}; + + # NOTE: + # we need to deal with the possibility + # of class immutability here, and then + # get the name of the class appropriately + $class = (blessed($class) + ? ($class->is_immutable + ? $class->get_mutable_metaclass_name() + : blessed($class)) + : $class); + $class = blessed($class) || $class; # now create the metaclass my $meta; - if ($class =~ /^Class::MOP::/) { + if ($class =~ /^Class::MOP::Class$/) { $meta = bless { '$:package' => $package_name, '%: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', + '$:instance_metaclass' => $options{':instance_metaclass'} || 'Class::MOP::Instance', } => $class; } else { @@ -76,12 +107,18 @@ sub meta { Class::MOP::Class->initialize(blessed($_[0]) || $_[0]) } # it is safe to use meta here because # class will always be a subclass of # Class::MOP::Class, which defines meta - $meta = bless $class->meta->construct_instance(%options) => $class + $meta = $class->meta->construct_instance(%options) } # and check the metaclass compatibility $meta->check_metaclass_compatability(); $METAS{$package_name} = $meta; - } + # NOTE: + # we need to weaken any anon classes + # so that they can call DESTROY properly + weaken($METAS{$package_name}) + if $package_name =~ /^$ANON_CLASS_PREFIX/; + $meta; + } sub check_metaclass_compatability { my $self = shift; @@ -95,10 +132,19 @@ sub meta { Class::MOP::Class->initialize(blessed($_[0]) || $_[0]) } foreach my $class_name (@class_list) { my $meta = $METAS{$class_name} || next; - ($self->isa(blessed($meta))) + + # NOTE: + # we need to deal with the possibility + # of class immutability here, and then + # get the name of the class appropriately + my $meta_type = ($meta->is_immutable + ? $meta->get_mutable_metaclass_name() + : blessed($meta)); + + ($self->isa($meta_type)) || confess $self->name . "->meta => (" . (blessed($self)) . ")" . " is not compatible with the " . - $class_name . "->meta => (" . (blessed($meta)) . ")"; + $class_name . "->meta => (" . ($meta_type) . ")"; # NOTE: # we also need to check that instance metaclasses # are compatabile in the same the class. @@ -110,6 +156,41 @@ sub meta { Class::MOP::Class->initialize(blessed($_[0]) || $_[0]) } } } +## ANON classes + +{ + # NOTE: + # this should be sufficient, if you have a + # use case where it is not, write a test and + # I will change it. + my $ANON_CLASS_SERIAL = 0; + + sub create_anon_class { + my ($class, %options) = @_; + my $package_name = $ANON_CLASS_PREFIX . ++$ANON_CLASS_SERIAL; + return $class->create($package_name, '0.00', %options); + } +} + +# NOTE: +# this will only get called for +# anon-classes, all other calls +# are assumed to occur during +# global destruction and so don't +# really need to be handled explicitly +sub DESTROY { + my $self = shift; + return unless $self->name =~ /^$ANON_CLASS_PREFIX/; + my ($serial_id) = ($self->name =~ /^$ANON_CLASS_PREFIX(\d+)/); + no strict 'refs'; + foreach my $key (keys %{$ANON_CLASS_PREFIX . $serial_id}) { + delete ${$ANON_CLASS_PREFIX . $serial_id}{$key}; + } + delete ${'main::' . $ANON_CLASS_PREFIX}{$serial_id . '::'}; +} + +# creating classes with MOP ... + sub create { my ($class, $package_name, $package_version, %options) = @_; (defined $package_name && $package_name) @@ -122,7 +203,7 @@ sub create { my $meta = $class->initialize($package_name); $meta->add_method('meta' => sub { - Class::MOP::Class->initialize(blessed($_[0]) || $_[0]); + $class->initialize(blessed($_[0]) || $_[0]); }); $meta->superclasses(@{$options{superclasses}}) @@ -145,27 +226,12 @@ sub create { return $meta; } -{ - # NOTE: - # this should be sufficient, if you have a - # use case where it is not, write a test and - # I will change it. - my $ANON_CLASS_SERIAL = 0; - - sub create_anon_class { - my ($class, %options) = @_; - my $package_name = 'Class::MOP::Class::__ANON__::SERIAL::' . ++$ANON_CLASS_SERIAL; - return $class->create($package_name, '0.00', %options); - } -} - ## Attribute readers # NOTE: # all these attribute readers will be bootstrapped # away in the Class::MOP bootstrap section -sub name { $_[0]->{'$:package'} } sub get_attribute_map { $_[0]->{'%:attributes'} } sub attribute_metaclass { $_[0]->{'$:attribute_metaclass'} } sub method_metaclass { $_[0]->{'$:method_metaclass'} } @@ -222,31 +288,20 @@ sub clone_instance { || confess "You can only clone instances, \$self is not a blessed instance"; my $meta_instance = $class->get_meta_instance(); my $clone = $meta_instance->clone_instance($instance); - foreach my $key (%params) { + foreach my $key (keys %params) { next unless $meta_instance->is_valid_slot($key); $meta_instance->set_slot_value($clone, $key, $params{$key}); } return $clone; } -# Informational - -# &name should be here too, but it is above -# because it gets bootstrapped away - -sub version { - my $self = shift; - ${$self->get_package_variable('$VERSION')}; -} - # Inheritance sub superclasses { my $self = shift; - no strict 'refs'; if (@_) { my @supers = @_; - @{$self->name . '::ISA'} = @supers; + @{$self->get_package_symbol('@ISA')} = @supers; # NOTE: # we need to check the metaclass # compatability here so that we can @@ -255,7 +310,7 @@ sub superclasses { # we don't know about $self->check_metaclass_compatability(); } - @{$self->name . '::ISA'}; + @{$self->get_package_symbol('@ISA')}; } sub class_precedence_list { @@ -286,11 +341,11 @@ sub add_method { || confess "Your code block must be a CODE reference"; my $full_method_name = ($self->name . '::' . $method_name); + # FIXME: + # dont bless subs, its bad mkay $method = $self->method_metaclass->wrap($method) unless blessed($method); - no strict 'refs'; - no warnings 'redefine'; - *{$full_method_name} = subname $full_method_name => $method; + $self->add_package_symbol("&${method_name}" => subname $full_method_name => $method); } { @@ -300,23 +355,22 @@ sub add_method { my $method = $self->get_method($method_name); # if we dont have local ... unless ($method) { - # make sure this method even exists ... - ($self->find_next_method_by_name($method_name)) + # try to find the next method + $method = $self->find_next_method_by_name($method_name); + # die if it does not exist + (defined $method) || confess "The method '$method_name' is not found in the inherience hierarchy for this class"; - # if so, then create a local which just - # calls the next applicable method ... - $self->add_method($method_name => sub { - $self->find_next_method_by_name($method_name)->(@_); - }); - $method = $self->get_method($method_name); - } - - # now make sure we wrap it properly - # (if it isnt already) - unless ($method->isa('Class::MOP::Method::Wrapped')) { + # and now make sure to wrap it + # even if it is already wrapped + # because we need a new sub ref $method = Class::MOP::Method::Wrapped->wrap($method); - $self->add_method($method_name => $method); - } + } + else { + # now make sure we wrap it properly + $method = Class::MOP::Method::Wrapped->wrap($method) + unless $method->isa('Class::MOP::Method::Wrapped'); + } + $self->add_method($method_name => $method); return $method; }; @@ -365,31 +419,33 @@ sub alias_method { # use reftype here to allow for blessed subs ... ('CODE' eq (reftype($method) || '')) || confess "Your code block must be a CODE reference"; - my $full_method_name = ($self->name . '::' . $method_name); + # FIXME: + # dont bless subs, its bad mkay $method = $self->method_metaclass->wrap($method) unless blessed($method); - no strict 'refs'; - no warnings 'redefine'; - *{$full_method_name} = $method; + $self->add_package_symbol("&${method_name}" => $method); +} + +sub find_method_by_name { + my ($self, $method_name) = @_; + return $self->name->can($method_name); } sub has_method { my ($self, $method_name) = @_; (defined $method_name && $method_name) || confess "You must define a method name"; - - my $sub_name = ($self->name . '::' . $method_name); - no strict 'refs'; - return 0 if !defined(&{$sub_name}); - my $method = \&{$sub_name}; + return 0 if !$self->has_package_symbol("&${method_name}"); + my $method = $self->get_package_symbol("&${method_name}"); return 0 if (svref_2object($method)->GV->STASH->NAME || '') ne $self->name && (svref_2object($method)->GV->NAME || '') ne '__ANON__'; - - # at this point we are relatively sure - # it is our method, so we bless/wrap it + + # FIXME: + # dont bless subs, its bad mkay $self->method_metaclass->wrap($method) unless blessed($method); + return 1; } @@ -399,9 +455,8 @@ sub get_method { || confess "You must define a method name"; return unless $self->has_method($method_name); - - no strict 'refs'; - return \&{$self->name . '::' . $method_name}; + + return $self->get_package_symbol("&${method_name}"); } sub remove_method { @@ -411,8 +466,7 @@ sub remove_method { my $removed_method = $self->get_method($method_name); - no strict 'refs'; - delete ${$self->name . '::'}{$method_name} + $self->remove_package_symbol("&${method_name}") if defined $removed_method; return $removed_method; @@ -420,8 +474,7 @@ sub remove_method { sub get_method_list { my $self = shift; - no strict 'refs'; - grep { $self->has_method($_) } keys %{$self->name . '::'}; + grep { $self->has_method($_) } $self->list_all_package_symbols; } sub compute_all_applicable_methods { @@ -509,9 +562,6 @@ sub add_attribute { $attribute->attach_to_class($self); $attribute->install_accessors(); $self->get_attribute_map->{$attribute->name} = $attribute; - - # FIXME - # in theory we have to tell everyone the slot structure may have changed } sub has_attribute { @@ -587,69 +637,13 @@ sub find_attribute_by_name { return; } -# Class attributes +## Class closing -sub add_package_variable { - my ($self, $variable, $initial_value) = @_; - (defined $variable && $variable =~ /^[\$\@\%]/) - || confess "variable name does not have a sigil"; - - my ($sigil, $name) = ($variable =~ /^(.)(.*)$/); - if (defined $initial_value) { - no strict 'refs'; - *{$self->name . '::' . $name} = $initial_value; - } - else { - my $e; - { - # NOTE: - # We HAVE to localize $@ or all - # hell breaks loose. It is not - # good, believe me, not good. - local $@; - eval $sigil . $self->name . '::' . $name; - $e = $@ if $@; - } - confess "Could not create package variable ($variable) because : $e" if $e; - } -} - -sub has_package_variable { - my ($self, $variable) = @_; - (defined $variable && $variable =~ /^[\$\@\%]/) - || confess "variable name does not have a sigil"; - my ($sigil, $name) = ($variable =~ /^(.)(.*)$/); - no strict 'refs'; - defined ${$self->name . '::'}{$name} ? 1 : 0; -} - -sub get_package_variable { - my ($self, $variable) = @_; - (defined $variable && $variable =~ /^[\$\@\%]/) - || confess "variable name does not have a sigil"; - my ($sigil, $name) = ($variable =~ /^(.)(.*)$/); - my ($ref, $e); - { - # NOTE: - # We HAVE to localize $@ or all - # hell breaks loose. It is not - # good, believe me, not good. - local $@; - $ref = eval '\\' . $sigil . $self->name . '::' . $name; - $e = $@ if $@; - } - confess "Could not get the package variable ($variable) because : $e" if $e; - # if we didn't die, then we can return it - return $ref; -} +sub is_mutable { 1 } +sub is_immutable { 0 } -sub remove_package_variable { - my ($self, $variable) = @_; - (defined $variable && $variable =~ /^[\$\@\%]/) - || confess "variable name does not have a sigil"; - my ($sigil, $name) = ($variable =~ /^(.)(.*)$/); - no strict 'refs'; - delete ${$self->name . '::'}{$name}; +sub make_immutable { + return Class::MOP::Class::Immutable->make_metaclass_immutable(@_); } 1; @@ -765,11 +759,17 @@ This will create an anonymous class, it works much like C but it does not need a C<$package_name>. Instead it will create a suitably unique package name for you to stash things into. -=item B +=item B 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 @@ -959,6 +959,13 @@ C<$method_name> is actually a method. However, it will DWIM about This will return a CODE reference of the specified C<$method_name>, or return undef if that method does not exist. +=item B + +This will return a CODE reference of the specified C<$method_name>, +or return undef if that method does not exist. + +Unlike C this will also look in the superclasses. + =item B This will attempt to remove a given C<$method_name> from the class. @@ -1186,7 +1193,7 @@ the creation and inspection of package scoped variables. =over 4 -=item B +=item B Given a C<$variable_name>, which must contain a leading sigil, this method will create that variable within the package which houses the @@ -1194,26 +1201,40 @@ class. It also takes an optional C<$initial_value>, which must be a reference of the same type as the sigil of the C<$variable_name> implies. -=item B +=item B This will return a reference to the package variable in C<$variable_name>. -=item B +=item B Returns true (C<1>) if there is a package variable defined for C<$variable_name>, and false (C<0>) otherwise. -=item B +=item B This will attempt to remove the package variable at C<$variable_name>. =back -=head1 AUTHOR +=head2 Class closing + +=over 4 + +=item B + +=item B + +=item B + +=back + +=head1 AUTHORS Stevan Little Estevan@iinteractive.comE +Yuval Kogman Enothingmuch@woobling.comE + =head1 COPYRIGHT AND LICENSE Copyright 2006 by Infinity Interactive, Inc. @@ -1223,4 +1244,4 @@ L This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. -=cutchistian +=cut