Make the constructor close over the metaclass, and bless into the right class (so...

[gitmo/Mouse.git] / lib / Mouse / Meta / Method / Constructor.pm

diff --git a/lib/Mouse/Meta/Method/Constructor.pm b/lib/Mouse/Meta/Method/Constructor.pm
index 84d36ee..b1db7d4 100644 (file)
--- a/lib/Mouse/Meta/Method/Constructor.pm
+++ b/lib/Mouse/Meta/Method/Constructor.pm
@@ -3,34 +3,29 @@ use strict;
 use warnings;
 
 sub generate_constructor_method_inline {
-    my ($class, $meta) = @_; 
-    my $code = $class->_generate_constructor_method_inline($meta);
-    warn $code if $ENV{DEBUG};
-
-    local $@;
-    my $res = eval $code;
-    die $@ if $@;
-    $res;
-}
-
-sub _generate_constructor_method_inline {
     my ($class, $meta) = @_;
+
     my $buildall = $class->_generate_BUILDALL($meta);
     my $buildargs = $class->_generate_BUILDARGS();
-    my $classname = $meta->name;
     my $processattrs = $class->_generate_processattrs($meta);
 
-    return <<"...";
+    my $code = <<"...";
     sub {
         my \$class = shift;
         my \$args = $buildargs;
-        my \$instance = bless {}, '$classname';
-        my \$meta = \$instance->meta;
+        my \$instance = bless {}, \$class;
         $processattrs;
         $buildall;
         return \$instance;
     }
 ...
+
+    warn $code if $ENV{DEBUG};
+
+    local $@;
+    my $res = eval $code;
+    die $@ if $@;
+    $res;
 }
 
 sub _generate_processattrs {