start pushing constructor inlining back into the metaclass

[gitmo/Class-MOP.git] / lib / Class / MOP / Method / Constructor.pm

diff --git a/lib/Class/MOP/Method/Constructor.pm b/lib/Class/MOP/Method/Constructor.pm
index 7dc678c..b64c1c5 100644 (file)
--- a/lib/Class/MOP/Method/Constructor.pm
+++ b/lib/Class/MOP/Method/Constructor.pm
@@ -5,9 +5,10 @@ use strict;
 use warnings;
 
 use Carp         'confess';
-use Scalar::Util 'blessed', 'weaken', 'looks_like_number';
+use Scalar::Util 'blessed', 'weaken';
+use Try::Tiny;
 
-our $VERSION   = '1.03';
+our $VERSION   = '1.11';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -72,11 +73,6 @@ sub associated_metaclass { (shift)->{'associated_metaclass'} }
 
 ## cached values ...
 
-sub _meta_instance {
-    my $self = shift;
-    $self->{'meta_instance'} ||= $self->associated_metaclass->get_meta_instance;
-}
-
 sub _attributes {
     my $self = shift;
     $self->{'attributes'} ||= [ $self->associated_metaclass->get_all_attributes ]
@@ -93,6 +89,14 @@ sub _initialize_body {
     $self->{'body'} = $self->$method_name;
 }
 
+sub _eval_environment {
+    my $self = shift;
+    my $defaults = [map { $_->default } @{ $self->_attributes }];
+    return {
+        '$defaults' => \$defaults,
+    };
+}
+
 sub _generate_constructor_method {
     return sub { Class::MOP::Class->initialize(shift)->new_object(@_) }
 }
@@ -100,84 +104,25 @@ sub _generate_constructor_method {
 sub _generate_constructor_method_inline {
     my $self = shift;
 
-    my $close_over = {};
-
-    my $source = 'sub {';
-    $source .= "\n" . 'my $class = shift;';
+    my $meta = $self->associated_metaclass;
 
-    $source .= "\n" . 'return Class::MOP::Class->initialize($class)->new_object(@_)';
-    $source .= "\n" . '    if $class ne \'' . $self->associated_metaclass->name . '\';';
-
-    $source .= "\n" . 'my $params = @_ == 1 ? $_[0] : {@_};';
-
-    $source .= "\n" . 'my $instance = ' . $self->_meta_instance->inline_create_instance('$class');
-    $source .= ";\n" . (join ";\n" => map {
-        $self->_generate_slot_initializer($_, $close_over)
-    } @{ $self->_attributes });
-    $source .= ";\n" . 'return $instance';
-    $source .= ";\n" . '}';
-    warn $source if $self->options->{debug};
-
-    my ( $code, $e ) = $self->_eval_closure(
-        $close_over,
-        $source
+    my @source = (
+        'sub {',
+            $meta->_inline_new_object,
+        '}',
     );
-    confess "Could not eval the constructor :\n\n$source\n\nbecause :\n\n$e" if $e;
 
-    return $code;
-}
+    warn join("\n", @source) if $self->options->{debug};
 
-sub _generate_slot_initializer {
-    my $self  = shift;
-    my $attr  = shift;
-    my $close = shift;
-
-    my $default;
-    if ($attr->has_default) {
-        # NOTE:
-        # default values can either be CODE refs
-        # in which case we need to call them. Or
-        # they can be scalars (strings/numbers)
-        # in which case we can just deal with them
-        # in the code we eval.
-        if ($attr->is_default_a_coderef) {
-            my $idx = @{$close->{'@defaults'}||=[]};
-            push(@{$close->{'@defaults'}}, $attr->default);
-            $default = '$defaults[' . $idx . ']->($instance)';
-        }
-        else {
-            $default = $attr->default;
-            # make sure to quote strings ...
-            unless (looks_like_number($default)) {
-                $default = "'$default'";
-            }
-        }
-    } elsif( $attr->has_builder ) {
-        $default = '$instance->'.$attr->builder;
+    my $code = try {
+        $self->_compile_code(\@source);
     }
+    catch {
+        my $source = join("\n", @source);
+        confess "Could not eval the constructor :\n\n$source\n\nbecause :\n\n$_";
+    };
 
-    if ( defined(my $init_arg = $attr->init_arg) ) {
-      return (
-          'if(exists $params->{\'' . $init_arg . '\'}){' . "\n" .
-                $self->_meta_instance->inline_set_slot_value(
-                    '$instance',
-                    $attr->name,
-                    '$params->{\'' . $init_arg . '\'}' ) . "\n" .
-           '} ' . (!defined $default ? '' : 'else {' . "\n" .
-                $self->_meta_instance->inline_set_slot_value(
-                    '$instance',
-                    $attr->name,
-                     $default ) . "\n" .
-           '}')
-        );
-    } elsif ( defined $default ) {
-        return (
-            $self->_meta_instance->inline_set_slot_value(
-                '$instance',
-                $attr->name,
-                 $default ) . "\n"
-        );
-    } else { return '' }
+    return $code;
 }
 
 1;