X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod%2FConstructor.pm;h=56f38c5c0db4557b43c3f55480a347e26a6fb870;hb=777b1f18dd34d5d656f15d14ce9836cfc9c2978f;hp=b10d091b701ac875238c861e1e55890d158cbb79;hpb=53edec17bae8aa34a398b0bd50dcd7e78e03b733;p=gitmo%2FClass-MOP.git

diff --git a/lib/Class/MOP/Method/Constructor.pm b/lib/Class/MOP/Method/Constructor.pm
index b10d091..56f38c5 100644
--- 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   = '0.95';
+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 ]
@@ -100,39 +96,94 @@ sub _generate_constructor_method {
 sub _generate_constructor_method_inline {
     my $self = shift;
 
-    my $close_over = {};
-
-    my $source = 'sub {';
-    $source .= "\n" . 'my $class = shift;';
-
-    $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] : {@_};';
+    my $defaults = [map { $_->default } @{ $self->_attributes }];
+    my $close_over = {
+        '$defaults' => \$defaults,
+    };
+
+    my $meta = $self->associated_metaclass;
+
+    my $idx = 0;
+    my @source = (
+        'sub {',
+            'my $class = shift;',
+            'return Class::MOP::Class->initialize($class)->new_object(@_)',
+                'if $class ne \'' . $meta->name . '\';',
+            'my $params = @_ == 1 ? $_[0] : {@_};',
+            'my $instance = ' . $meta->inline_create_instance('$class') . ';',
+            (map { $self->_generate_slot_initializer($_, $idx++) }
+                 @{ $self->_attributes }),
+            $self->_preserve_weak_metaclasses,
+            'return $instance',
+        '}',
+    );
 
-    $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};
+    warn join("\n", @source) if $self->options->{debug};
 
-    my ( $code, $e ) = $self->_eval_closure(
-        $close_over,
-        $source
-    );
-    confess "Could not eval the constructor :\n\n$source\n\nbecause :\n\n$e" if $e;
+    my $code = try {
+        $self->_compile_code(
+            source      => \@source,
+            environment => $close_over,
+        );
+    }
+    catch {
+        my $source = join("\n", @source);
+        confess "Could not eval the constructor :\n\n$source\n\nbecause :\n\n$_";
+    };
 
     return $code;
 }
 
 sub _generate_slot_initializer {
     my $self  = shift;
-    my $attr  = shift;
-    my $close = shift;
+    my ($attr, $idx) = @_;
+
+    my $default = $self->_generate_default_value($attr, $idx);
+
+    if (defined(my $init_arg = $attr->init_arg)) {
+        my @source = (
+            'if (exists $params->{\'' . $init_arg . '\'}) {',
+                $attr->inline_set(
+                    '$instance', '$params->{\'' . $init_arg . '\'}'
+                ) . ';',
+            '}',
+        );
+        if (defined $default) {
+            push @source, (
+                'else {',
+                    $attr->inline_set('$instance', $default) . ';',
+                '}',
+            );
+        }
+        return @source;
+    }
+    elsif (defined $default) {
+        return ($attr->inline_set('$instance', $default) . ';');
+    }
+    else {
+        return ();
+    }
+}
+
+sub _preserve_weak_metaclasses {
+    my $self = shift;
+    my $meta = $self->associated_metaclass;
+    if (Class::MOP::metaclass_is_weak($meta->name)) {
+        return (
+            $meta->_inline_set_mop_slot(
+                '$instance', 'Class::MOP::class_of($class)'
+            ) . ';'
+        );
+    }
+    else {
+        return ();
+    }
+}
+
+sub _generate_default_value {
+    my $self = shift;
+    my ($attr, $index) = @_;
 
-    my $default;
     if ($attr->has_default) {
         # NOTE:
         # default values can either be CODE refs
@@ -141,43 +192,18 @@ sub _generate_slot_initializer {
         # 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)';
+            return '$defaults->[' . $index . ']->($instance)';
         }
         else {
-            $default = $attr->default;
-            # make sure to quote strings ...
-            unless (looks_like_number($default)) {
-                $default = "'$default'";
-            }
+            return '$defaults->[' . $index . ']';
         }
-    } elsif( $attr->has_builder ) {
-        $default = '$instance->'.$attr->builder;
     }
-
-    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 '' }
+    elsif ($attr->has_builder) {
+        return '$instance->' . $attr->builder;
+    }
+    else {
+        return;
+    }
 }
 
 1;
@@ -256,7 +282,7 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2009 by Infinity Interactive, Inc.
+Copyright 2006-2010 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>