initial spike towards sub naming to collaborate with namespace checks in DBIC

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

diff --git a/lib/Moo/_Utils.pm b/lib/Moo/_Utils.pm
index 2ee545c..047f6ca 100644 (file)
--- a/lib/Moo/_Utils.pm
+++ b/lib/Moo/_Utils.pm
@@ -1,29 +1,28 @@
 package Moo::_Utils;
 
+no warnings 'once'; # guard against -w
+
 sub _getglob { \*{$_[0]} }
 sub _getstash { \%{"$_[0]::"} }
 
-BEGIN {
-  *lt_5_8_3 = $] < 5.008003
-    ? sub () { 1 }
-    : sub () { 0 }
-  ;
-}
+use constant lt_5_8_3 => ( $] < 5.008003 ) ? 1 : 0;
+use constant can_haz_subname => eval { require Sub::Name };
 
 use strictures 1;
+use Module::Runtime qw(require_module);
 use base qw(Exporter);
 use Moo::_mro;
 
 our @EXPORT = qw(
     _getglob _install_modifier _load_module _maybe_load_module
-    _get_linear_isa
+    _get_linear_isa _getstash _install_coderef _name_coderef
 );
 
 sub _install_modifier {
   my ($into, $type, $name, $code) = @_;
 
   if (my $to_modify = $into->can($name)) { # CMM will throw for us if not
-    { local $@; require Sub::Defer; }
+    require Sub::Defer;
     Sub::Defer::undefer_sub($to_modify);
   }
 
@@ -32,15 +31,14 @@ sub _install_modifier {
 
 our %MAYBE_LOADED;
 
-# _load_module is inlined in Role::Tiny - make sure to copy if you update it.
-
 sub _load_module {
   (my $proto = $_[0]) =~ s/::/\//g;
   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"; }
+  my $stash = _getstash($_[0])||{};
+  return 1 if grep +(!ref($_) and *$_{CODE}), values %$stash;
+  require_module($_[0]);
   return 1;
 }
 
@@ -60,7 +58,15 @@ sub _maybe_load_module {
 }
 
 sub _get_linear_isa {
-    return mro::get_linear_isa($_[0]);
+  return mro::get_linear_isa($_[0]);
+}
+
+sub _install_coderef {
+  *{_getglob($_[0])} = _name_coderef(@_);
+}
+
+sub _name_coderef {
+  can_haz_subname ? Sub::Name::subname(@_) : $_[1];
 }
 
 our $_in_global_destruction = 0;