fix BUILDALL constructor

[gitmo/Role-Tiny.git] / lib / Method / Generate / BuildAll.pm

diff --git a/lib/Method/Generate/BuildAll.pm b/lib/Method/Generate/BuildAll.pm
index 3b4b363..b4aa1fb 100644 (file)
--- a/lib/Method/Generate/BuildAll.pm
+++ b/lib/Method/Generate/BuildAll.pm
@@ -1,16 +1,22 @@
 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::_mro;
+use Moo::_Utils;
+use B 'perlstring';
 
 sub generate_method {
   my ($self, $into) = @_;
   quote_sub "${into}::BUILDALL", join '',
     qq{    my \$self = shift;\n},
-    $self->buildall_body_for($into, '$self', '@_'),
+    qq{    my \$class = ref \$self;\n},
+      '    if ('. perlstring($into) ." ne \$class) {\n",
+    qq{        return \$self->\${\\(\$Moo::Object::BUILD_MAKER->generate_method(\$class))}(\@_);\n},
+      "    } else {\n",
+               $self->buildall_body_for($into, '$self', '@_'),
+      "    }\n",
     qq{    return \$self\n};
 }
 
@@ -20,7 +26,7 @@ sub buildall_body_for {
     grep *{_getglob($_)}{CODE},
     map "${_}::BUILD",
     reverse @{mro::get_linear_isa($into)};
-  join '', map qq{    ${me}->${_}(${args});\n}, @builds;
+  join '', map qq{        ${me}->${_}(${args});\n}, @builds;
 }
 
 1;