XS version of get_all_package_symbols

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

diff --git a/lib/Class/MOP.pm b/lib/Class/MOP.pm
index 6c82116..0c0550f 100644 (file)
--- a/lib/Class/MOP.pm
+++ b/lib/Class/MOP.pm
@@ -9,12 +9,6 @@ use MRO::Compat;
 use Carp          'confess';
 use Scalar::Util  'weaken';
 
-use Class::MOP::Class;
-use Class::MOP::Attribute;
-use Class::MOP::Method;
-
-use Class::MOP::Immutable;
-
 BEGIN {
     
     our $VERSION   = '0.65';
@@ -63,16 +57,20 @@ BEGIN {
         # now try our best to get as much 
         # of the XS loaded as possible
         {
-            local $@;
-            eval {
-                require XSLoader;
-                XSLoader::load( 'Class::MOP', $VERSION );            
+            my $e = do {
+                local $@;
+                eval {
+                    require XSLoader;
+                    __PACKAGE__->XSLoader::load($VERSION);
+                };
+                $@;
             };
-            die $@ if $@ && $@ !~ /object version|loadable object/;
+
+            die $e if $e && $e !~ /object version|loadable object/;
             
             # okay, so the XS failed to load, so 
             # use the pure perl one instead.
-            *get_code_info = $_PP_get_code_info if $@; 
+            *get_code_info = $_PP_get_code_info if $e; 
         }        
         
         # get it from MRO::Compat
@@ -92,6 +90,12 @@ BEGIN {
     }
 }
 
+use Class::MOP::Class;
+use Class::MOP::Attribute;
+use Class::MOP::Method;
+
+use Class::MOP::Immutable;
+
 {
     # Metaclasses are singletons, so we cache them here.
     # there is no need to worry about destruction though