X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fmetaclass.pm;h=2dee906244ba4e385bdbe47ea2c5d1aec85a4261;hb=8af039cd0ec8983c598c4a5d4a76744a43254c52;hp=b688f267b9f2c670d999a423e06acb83abf81042;hpb=20b0fc6fc5e739cc02e049b4468570a88e6453ed;p=gitmo%2FClass-MOP.git diff --git a/lib/metaclass.pm b/lib/metaclass.pm index b688f26..2dee906 100644 --- a/lib/metaclass.pm +++ b/lib/metaclass.pm @@ -20,7 +20,7 @@ sub import { unshift @args, "metaclass" if @args % 2 == 1; my %options = @args; - my $should_install_meta = !delete $options{no_meta}; + my $meta_name = exists $options{meta_name} ? $options{meta_name} : 'meta'; my $metaclass = delete $options{metaclass}; unless ( defined $metaclass ) { @@ -43,22 +43,8 @@ sub import { # create a meta object so we can install &meta my $meta = $metaclass->initialize($package => %options); - $meta->add_method('meta' => sub { - # we must re-initialize so that it - # works as expected in subclasses, - # since metaclass instances are - # singletons, this is not really a - # big deal anyway. - if (Class::MOP::DEBUG_NO_META()) { - my ($self) = @_; - if (my $meta = try { $self->SUPER::meta }) { - return $meta if $meta->isa('Class::MOP::Class'); - } - confess "'meta' method called by MOP internals" - if caller =~ /Class::MOP|metaclass/; - } - $metaclass->initialize((blessed($_[0]) || $_[0])) - }) if $should_install_meta; + $meta->_add_meta_method($meta_name) + if defined $meta_name; } 1; @@ -98,14 +84,16 @@ metaclass - a pragma for installing and using Class::MOP metaclasses ); # if we'd rather not install a 'meta' method, we can do this - use metaclass no_meta => 1; + use metaclass meta_name => undef; + # or if we'd like it to have a different name, + use metaclass meta_name => 'my_meta'; =head1 DESCRIPTION This is a pragma to make it easier to use a specific metaclass and a set of custom attribute and method metaclasses. It also -installs a C method to your class as well, if the -C option is not specified. +installs a C method to your class as well, unless C +is passed to the C option. =head1 AUTHORS