From: Stevan Little <stevan.little@iinteractive.com>
Date: Sun, 18 May 2008 23:27:31 +0000 (+0000)
Subject: working without XS
X-Git-Tag: 0_64~59
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=87f3c1333528a6d43b8a061c12babfff778116da;p=gitmo%2FClass-MOP.git

working without XS
---

diff --git a/examples/C3MethodDispatchOrder.pod b/examples/C3MethodDispatchOrder.pod
index f6156d5..b635f56 100644
--- a/examples/C3MethodDispatchOrder.pod
+++ b/examples/C3MethodDispatchOrder.pod
@@ -23,21 +23,28 @@ my $_find_method = sub {
 C3MethodDispatchOrder->meta->add_around_method_modifier('initialize' => sub {
 	my $cont = shift;
     my $meta = $cont->(@_);
-    $meta->add_method('AUTOLOAD' => sub {
-        my $meta = $_[0]->meta;
-        my $method_name;
-        {
-            no strict 'refs';
-            my $label = ${$meta->name . '::AUTOLOAD'};
-            $method_name = (split /\:\:/ => $label)[-1];
-        }
-        my $method = $_find_method->($meta, $method_name);
+    
+    # we need to look at $AUTOLOAD in the package where the coderef belongs
+    # if subname works, then it'll be where this AUTOLOAD method was installed
+    # otherwise, it'll be $C3MethodDispatchOrder::AUTOLOAD. get_code_info
+    # tells us where AUTOLOAD will look
+    my $autoload;
+    $autoload = sub {
+        my ($package) = Class::MOP::get_code_info($autoload);
+        my $label = ${ $package->meta->get_package_symbol('$AUTOLOAD') };
+        my $method_name = (split /\:\:/ => $label)[-1];
+        my $method = $_find_method->($_[0]->meta, $method_name);
         (defined $method) || confess "Method ($method_name) not found";
         goto &$method;
-    }) unless $meta->has_method('AUTOLOAD');
+    };
+
+    $meta->add_method('AUTOLOAD' => $autoload)
+        unless $meta->has_method('AUTOLOAD');
+    
     $meta->add_method('can' => sub {
         $_find_method->($_[0]->meta, $_[1]);
     }) unless $meta->has_method('can');   
+    
 	return $meta;
 });
 
diff --git a/t/003_methods.t b/t/003_methods.t
index 0946d49..53b957e 100644
--- a/t/003_methods.t
+++ b/t/003_methods.t
@@ -7,6 +7,7 @@ use Test::More tests => 66;
 use Test::Exception;
 
 use Scalar::Util qw/reftype/;
+use Sub::Name ();
 
 BEGIN {
     use_ok('Class::MOP');