X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMethod%2FGenerate%2FBuildAll.pm;h=1d6b5adb78f3efaae1eb76f4b78f857f937ba779;hb=HEAD;hp=b8c8a19142508620bd4e70b832812c6397d36f8d;hpb=b1eebd55fe3d34b6afa73a4880737dc91379b71e;p=gitmo%2FMoo.git

diff --git a/lib/Method/Generate/BuildAll.pm b/lib/Method/Generate/BuildAll.pm
index b8c8a19..1d6b5ad 100644
--- a/lib/Method/Generate/BuildAll.pm
+++ b/lib/Method/Generate/BuildAll.pm
@@ -3,23 +3,31 @@ package Method::Generate::BuildAll;
 use strictures 1;
 use base qw(Moo::Object);
 use Sub::Quote;
-use Moo::_mro;
 use Moo::_Utils;
+use B 'perlstring';
 
 sub generate_method {
   my ($self, $into) = @_;
   quote_sub "${into}::BUILDALL", join '',
+    $self->_handle_subbuild($into),
     qq{    my \$self = shift;\n},
     $self->buildall_body_for($into, '$self', '@_'),
     qq{    return \$self\n};
 }
 
+sub _handle_subbuild {
+  my ($self, $into) = @_;
+  '    if (ref($_[0]) ne '.perlstring($into).') {'."\n".
+  '      return shift->Moo::Object::BUILDALL(@_)'.";\n".
+  '    }'."\n";
+}
+
 sub buildall_body_for {
   my ($self, $into, $me, $args) = @_;
   my @builds =
     grep *{_getglob($_)}{CODE},
     map "${_}::BUILD",
-    reverse @{mro::get_linear_isa($into)};
+    reverse @{Moo::_Utils::_get_linear_isa($into)};
   join '', map qq{    ${me}->${_}(${args});\n}, @builds;
 }