X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FImmutable.pm;h=b71baf9a644ce21ab793794bf10e3a0218e0f852;hb=88b8ac17305b1bf7f1795337d7d443aec0bd3057;hp=fb52bd647936c7dd6cebb6b77c6554a30fb09db5;hpb=6ff0d647e421883334a27b1ce5c59bcb00bbda43;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Immutable.pm b/lib/Class/MOP/Immutable.pm index fb52bd6..b71baf9 100644 --- a/lib/Class/MOP/Immutable.pm +++ b/lib/Class/MOP/Immutable.pm @@ -9,29 +9,54 @@ use Class::MOP::Method::Constructor; use Carp 'confess'; use Scalar::Util 'blessed'; -our $VERSION = '0.03'; +our $VERSION = '0.70_01'; +$VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; +use base 'Class::MOP::Object'; + sub new { - my ($class, $metaclass, $options) = @_; + my ($class, @args) = @_; + + my ( $metaclass, $options ); + + if ( @args == 2 ) { + # compatibility args + ( $metaclass, $options ) = @args; + } else { + unshift @args, "metaclass" if @args % 2 == 1; - my $self = bless { - '$!metaclass' => $metaclass, - '%!options' => $options, - '$!immutable_metaclass' => undef, - } => $class; + # default named args + my %options = @args; + $options = \%options; + $metaclass = $options{metaclass}; + } + + my $self = $class->_new( + 'metaclass' => $metaclass, + 'options' => $options, + 'immutable_metaclass' => undef, + ); # NOTE: # we initialize the immutable # version of the metaclass here + # FIXME lazify $self->create_immutable_metaclass; return $self; } -sub immutable_metaclass { (shift)->{'$!immutable_metaclass'} } -sub metaclass { (shift)->{'$!metaclass'} } -sub options { (shift)->{'%!options'} } +sub _new { + my $class = shift; + my $options = @_ == 1 ? $_[0] : {@_}; + + bless $options, $class; +} + +sub immutable_metaclass { (shift)->{'immutable_metaclass'} } +sub metaclass { (shift)->{'metaclass'} } +sub options { (shift)->{'options'} } sub create_immutable_metaclass { my $self = shift; @@ -41,7 +66,7 @@ sub create_immutable_metaclass { # metaclass is just a anon-class # which shadows the methods # appropriately - $self->{'$!immutable_metaclass'} = Class::MOP::Class->create_anon_class( + $self->{'immutable_metaclass'} = Class::MOP::Class->create_anon_class( superclasses => [ blessed($self->metaclass) ], methods => $self->create_methods_for_immutable_metaclass, ); @@ -53,11 +78,19 @@ my %DEFAULT_METHODS = ( meta => sub { my $self = shift; # if it is not blessed, then someone is asking - # for the meta of Class::MOP::Class::Immutable + # for the meta of Class::MOP::Immutable return Class::MOP::Class->initialize($self) unless blessed($self); # otherwise, they are asking for the metaclass # which has been made immutable, which is itself - return $self; + # except in the cases where it is a metaclass itself + # that has been made immutable and for that we need + # to dig a bit ... + if ($self->isa('Class::MOP::Class')) { + return $self->{'___original_class'}->meta; + } + else { + return $self; + } }, is_mutable => sub { 0 }, is_immutable => sub { 1 }, @@ -71,17 +104,16 @@ my %DEFAULT_METHODS = ( sub make_metaclass_immutable { my ($self, $metaclass, $options) = @_; - foreach my $pair ( - [ inline_accessors => 1 ], - [ inline_constructor => 1 ], - [ inline_destructor => 0 ], - [ constructor_name => 'new' ], - [ debug => 0 ], - ) { - $options->{$pair->[0]} = $pair->[1] unless exists $options->{$pair->[0]}; - } + my %options = ( + inline_accessors => 1, + inline_constructor => 1, + inline_destructor => 0, + constructor_name => 'new', + debug => 0, + %$options, + ); - my %options = %$options; + %$options = %options; # FIXME who the hell is relying on this?!? tests fail =( if ($options{inline_accessors}) { foreach my $attr_name ($metaclass->get_attribute_list) { @@ -96,11 +128,13 @@ sub make_metaclass_immutable { $metaclass->add_method( $options{constructor_name}, $constructor_class->new( - options => \%options, - metaclass => $metaclass, - is_inline => 1, + options => \%options, + metaclass => $metaclass, + is_inline => 1, + package_name => $metaclass->name, + name => $options{constructor_name} ) - ) unless $metaclass->has_method($options{constructor_name}); + ) if $options{replace_constructor} or !$metaclass->has_method($options{constructor_name}); } if ($options{inline_destructor}) { @@ -110,18 +144,27 @@ sub make_metaclass_immutable { my $destructor_class = $options{destructor_class}; - my $destructor = $destructor_class->new( - options => \%options, - metaclass => $metaclass, - ); - - $metaclass->add_method('DESTROY' => $destructor) - # NOTE: - # we allow the destructor to determine - # if it is needed or not, it can perform - # all sorts of checks because it has the - # metaclass instance - if $destructor->is_needed; + # NOTE: + # we allow the destructor to determine + # if it is needed or not before we actually + # create the destructor too + # - SL + if ($destructor_class->is_needed($metaclass)) { + my $destructor = $destructor_class->new( + options => \%options, + metaclass => $metaclass, + package_name => $metaclass->name, + name => 'DESTROY' + ); + + $metaclass->add_method('DESTROY' => $destructor) + # NOTE: + # we allow the destructor to determine + # if it is needed or not, it can perform + # all sorts of checks because it has the + # metaclass instance + if $destructor->is_needed; + } } my $memoized_methods = $self->options->{memoize}; @@ -168,7 +211,7 @@ sub make_metaclass_mutable { if ($options{inline_destructor} && $immutable->has_method('DESTROY')) { $immutable->remove_method('DESTROY') - if $immutable->get_method('DESTROY')->blessed eq $options{destructor_class}; + if blessed($immutable->get_method('DESTROY')) eq $options{destructor_class}; } # NOTE: @@ -188,10 +231,10 @@ sub make_metaclass_mutable { # 14:26 <@stevan> the only user of ::Method::Constructor is immutable # 14:27 <@stevan> if someone uses it outside of immutable,.. they are either: mst or groditi # 14:27 <@stevan> so I am not worried - if ($options{inline_constructor}) { + if ($options{inline_constructor} && $immutable->has_method($options{constructor_name})) { my $constructor_class = $options{constructor_class} || 'Class::MOP::Method::Constructor'; $immutable->remove_method( $options{constructor_name} ) - if $immutable->get_method($options{constructor_name})->blessed eq $constructor_class; + if blessed($immutable->get_method($options{constructor_name})) eq $constructor_class; } } @@ -231,9 +274,24 @@ sub create_methods_for_immutable_metaclass { $methods{$method_name} = sub { $_[0]->{'___' . $method_name} }; } } + + my $wrapped_methods = $self->options->{wrapped}; + + foreach my $method_name (keys %{ $wrapped_methods }) { + my $method = $self->metaclass->meta->find_method_by_name($method_name); + + (defined $method) + || confess "Could not find the method '$method_name' in " . $self->metaclass->name; + + my $wrapper = $wrapped_methods->{$method_name}; + + $methods{$method_name} = sub { $wrapper->($method, @_) }; + } $methods{get_mutable_metaclass_name} = sub { (shift)->{'___original_class'} }; + $methods{immutable_transformer} = sub { $self }; + return \%methods; } @@ -279,8 +337,9 @@ metaclass. Current features include making methods read-only, making methods un-callable and memoizing methods (in a type specific way too). -This module is fairly new to the MOP, and quite possibly will be -expanded and further generalized as the need arises. +This module is not for the feint of heart, it does some whacky things +to the metaclass in order to make it immutable. If you are just curious, +I suggest you turn back now, there is nothing to see here. =head1 METHODS @@ -337,7 +396,7 @@ Stevan Little Estevan@iinteractive.comE =head1 COPYRIGHT AND LICENSE -Copyright 2006, 2007 by Infinity Interactive, Inc. +Copyright 2006-2008 by Infinity Interactive, Inc. L