cleanup require usage so we don't trample on $@ and tweak the DEMOLISH code slightly

[gitmo/Moo.git] / lib / Moo / _Utils.pm

diff --git a/lib/Moo/_Utils.pm b/lib/Moo/_Utils.pm
index 82ecfcb..2ee545c 100644 (file)
--- a/lib/Moo/_Utils.pm
+++ b/lib/Moo/_Utils.pm
@@ -1,17 +1,29 @@
 package Moo::_Utils;
 
 sub _getglob { \*{$_[0]} }
+sub _getstash { \%{"$_[0]::"} }
+
+BEGIN {
+  *lt_5_8_3 = $] < 5.008003
+    ? sub () { 1 }
+    : sub () { 0 }
+  ;
+}
 
 use strictures 1;
 use base qw(Exporter);
+use Moo::_mro;
 
-our @EXPORT = qw(_getglob _install_modifier _load_module _maybe_load_module);
+our @EXPORT = qw(
+    _getglob _install_modifier _load_module _maybe_load_module
+    _get_linear_isa
+);
 
 sub _install_modifier {
   my ($into, $type, $name, $code) = @_;
 
   if (my $to_modify = $into->can($name)) { # CMM will throw for us if not
-    require Sub::Defer;
+    { local $@; require Sub::Defer; }
     Sub::Defer::undefer_sub($to_modify);
   }
 
@@ -20,16 +32,22 @@ sub _install_modifier {
 
 our %MAYBE_LOADED;
 
+# _load_module is inlined in Role::Tiny - make sure to copy if you update it.
+
 sub _load_module {
-  return 1 if $_[0]->can('can');
   (my $proto = $_[0]) =~ s/::/\//g;
-  require "${proto}.pm";
+  return 1 if $INC{"${proto}.pm"};
+  # can't just ->can('can') because a sub-package Foo::Bar::Baz
+  # creates a 'Baz::' key in Foo::Bar's symbol table
+  return 1 if grep !/::$/, keys %{_getstash($_[0])||{}};
+  { local $@; require "${proto}.pm"; }
   return 1;
 }
 
 sub _maybe_load_module {
   return $MAYBE_LOADED{$_[0]} if exists $MAYBE_LOADED{$_[0]};
   (my $proto = $_[0]) =~ s/::/\//g;
+  local $@;
   if (eval { require "${proto}.pm"; 1 }) {
     $MAYBE_LOADED{$_[0]} = 1;
   } else {
@@ -41,4 +59,27 @@ sub _maybe_load_module {
   return $MAYBE_LOADED{$_[0]};
 }
 
+sub _get_linear_isa {
+    return mro::get_linear_isa($_[0]);
+}
+
+our $_in_global_destruction = 0;
+END { $_in_global_destruction = 1 }
+
+sub STANDARD_DESTROY {
+  my $self = shift;
+
+  my $e = do {
+    local $?;
+    local $@;
+    eval {
+      $self->DEMOLISHALL($_in_global_destruction);
+    };
+    $@;
+  };
+
+  no warnings 'misc';
+  die $e if $e; # rethrow
+}
+
 1;