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

diff --git a/lib/Method/Generate/BuildAll.pm b/lib/Method/Generate/BuildAll.pm
index b7895b8..1d6b5ad 100644
--- a/lib/Method/Generate/BuildAll.pm
+++ b/lib/Method/Generate/BuildAll.pm
@@ -1,21 +1,34 @@
 package Method::Generate::BuildAll;
 
 use strictures 1;
-use base qw(Class::Tiny::Object);
+use base qw(Moo::Object);
 use Sub::Quote;
-use Class::Tiny::_mro;
-use Class::Tiny::_Utils;
+use Moo::_Utils;
+use B 'perlstring';
 
 sub generate_method {
   my ($self, $into) = @_;
-  my @builds =
-    grep *{_getglob($_)}{CODE},
-    map "${_}::BUILD",
-    reverse @{mro::get_linear_isa($into)};
   quote_sub "${into}::BUILDALL", join '',
+    $self->_handle_subbuild($into),
     qq{    my \$self = shift;\n},
-    (map qq{    \$self->${_}(\@_);\n}, @builds),
+    $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 @{Moo::_Utils::_get_linear_isa($into)};
+  join '', map qq{    ${me}->${_}(${args});\n}, @builds;
+}
+
 1;