factor out meta method generation

[gitmo/Class-MOP.git] / lib / metaclass.pm

diff --git a/lib/metaclass.pm b/lib/metaclass.pm
index 816efcb..192a664 100644 (file)
--- a/lib/metaclass.pm
+++ b/lib/metaclass.pm
@@ -20,6 +20,7 @@ sub import {
     unshift @args, "metaclass" if @args % 2 == 1;
     my %options = @args;
 
+    my $should_install_meta = !delete $options{no_meta};
     my $metaclass = delete $options{metaclass};
 
     unless ( defined $metaclass ) {
@@ -42,23 +43,7 @@ sub import {
 
     # create a meta object so we can install &meta
     my $meta = $metaclass->initialize($package => %options);
-    my $should_install = !delete $options{no_meta};
-    $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]) => %options)
-    }) if $should_install;
+    $meta->_add_meta_method if $should_install_meta;
 }
 
 1;