X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FMethod%2FConstructor.pm;h=0d5374aa936640d490e4829baa111fc882251966;hb=98a8fd12ede46b22edc10d229680d9d2e8deeade;hp=8e4fa629d271160a27f8900e49df8d446009ef5b;hpb=d990f7911dfd6a36d1dcc072e7adb72bf0379349;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Meta/Method/Constructor.pm b/lib/Mouse/Meta/Method/Constructor.pm
index 8e4fa62..0d5374a 100644
--- a/lib/Mouse/Meta/Method/Constructor.pm
+++ b/lib/Mouse/Meta/Method/Constructor.pm
@@ -1,40 +1,71 @@
 package Mouse::Meta::Method::Constructor;
 use Mouse::Util qw(:meta); # enables strict and warnings
 
-sub _inline_slot{
+sub _inline_create_instance {
+    my(undef, $class_expr) = @_;
+    return "bless {}, $class_expr";
+}
+
+sub _inline_slot {
     my(undef, $self_var, $attr_name) = @_;
     return sprintf '%s->{q{%s}}', $self_var, $attr_name;
 }
 
+sub _inline_has_slot {
+    my($class, $self_var, $attr_name) = @_;
+
+    return sprintf 'exists(%s)', $class->_inline_slot($self_var, $attr_name);
+}
+
+sub _inline_get_slot {
+    my($class, $self_var, $attr_name) = @_;
+
+    return $class->_inline_slot($self_var, $attr_name);
+}
+
+sub _inline_set_slot {
+    my($class, $self_var, $attr_name, $rvalue) = @_;
+
+    return $class->_inline_slot($self_var, $attr_name) . " = $rvalue";
+}
+
+sub _inline_weaken_slot {
+    my($class, $self_var, $attr_name) = @_;
+
+    return sprintf 'Scalar::Util::weaken(%s)', $class->_inline_slot($self_var, $attr_name);
+}
+
 sub _generate_constructor {
     my ($class, $metaclass, $args) = @_;
 
-    my $associated_metaclass_name = $metaclass->name;
-
     my @attrs         = $metaclass->get_all_attributes;
 
-    my $buildall      = $class->_generate_BUILDALL($metaclass);
+    my $init_attrs    = $class->_generate_processattrs($metaclass, \@attrs);
     my $buildargs     = $class->_generate_BUILDARGS($metaclass);
-    my $processattrs  = $class->_generate_processattrs($metaclass, \@attrs);
+    my $buildall      = $class->_generate_BUILDALL($metaclass);
 
     my @checks = map { $_ && $_->_compiled_type_constraint }
                  map { $_->type_constraint } @attrs;
 
-    my $source = sprintf("#line %d %s\n", __LINE__, __FILE__).<<"...";
-        sub \{
-            my \$class = shift;
-            return \$class->Mouse::Object::new(\@_)
-                if \$class ne q{$associated_metaclass_name};
+    my $class_name  = $metaclass->name;
+    my $source = sprintf(<<'END_CONSTRUCTOR', $class_name, __LINE__, __FILE__, $class_name, $buildargs, $class->_inline_create_instance('$class'), $init_attrs, $buildall);
+package %s;
+#line %d "constructor of %s (%s)"
+        sub {
+            my $class = shift;
+            return $class->Mouse::Object::new(@_)
+                if $class ne __PACKAGE__;
             # BUILDARGS
-            $buildargs;
-            my \$instance = bless {}, \$class;
+            %s;
+            # create instance
+            my $instance = %s;
             # process attributes
-            $processattrs;
+            %s;
             # BUILDALL
-            $buildall;
-            return \$instance;
+            %s;
+            return $instance;
         }
-...
+END_CONSTRUCTOR
     #warn $source;
     my $code;
     my $e = do{
@@ -51,10 +82,9 @@ sub _generate_processattrs {
     my @res;
 
     my $has_triggers;
-    my $strict_constructor = $metaclass->__strict_constructor;
-
+    my $strict = $metaclass->__strict_constructor;
 
-    if($strict_constructor){
+    if($strict){
         push @res, 'my $used = 0;';
     }
 
@@ -69,7 +99,8 @@ sub _generate_processattrs {
         my $is_weak_ref     = $attr->is_weak_ref;
         my $need_coercion;
 
-        my $instance_slot  = $method_class->_inline_slot('$instance', $key);
+        my $instance       = '$instance';
+        my $instance_slot  = $method_class->_inline_get_slot($instance, $key);
         my $attr_var       = "\$attrs[$index]";
         my $constraint_var;
 
@@ -86,7 +117,7 @@ sub _generate_processattrs {
             $post_process .= "  or $attr_var->_throw_type_constraint_error($instance_slot, $constraint_var);\n";
         }
         if($is_weak_ref){
-            $post_process .= "Scalar::Util::weaken($instance_slot) if ref $instance_slot;\n";
+            $post_process .= $method_class->_inline_weaken_slot($instance, $key) . " if ref $instance_slot;\n";
         }
 
         if (defined $init_arg) {
@@ -98,7 +129,7 @@ sub _generate_processattrs {
                 $value = "$constraint_var->coerce($value)";
             }
 
-            $code .= "$instance_slot = $value;\n";
+            $code .= $method_class->_inline_set_slot($instance, $key, $value) . ";\n";
             $code .= $post_process;
 
             if ($attr->has_trigger) {
@@ -106,8 +137,8 @@ sub _generate_processattrs {
                 $code .= "push \@triggers, [$attr_var\->{trigger}, $instance_slot];\n";
             }
 
-            if ($strict_constructor){
-                $code .= '$used++;' . "\n";
+            if ($strict){
+                $code .= '++$used;' . "\n";
             }
 
             $code .= "\n} else {\n"; # $value exists
@@ -136,9 +167,9 @@ sub _generate_processattrs {
                     $value = "$constraint_var->coerce($value)";
                 }
 
-                $code .= "$instance_slot = $value;\n";
+                $code .= $method_class->_inline_set_slot($instance, $key, $value) . ";\n";
                 if($is_weak_ref){
-                    $code .= "Scalar::Util::weaken($instance_slot);\n";
+                    $code .= $method_class->_inline_weaken_slot($instance, $key) . ";\n";
                 }
             }
         }
@@ -151,9 +182,9 @@ sub _generate_processattrs {
         push @res, $code;
     }
 
-    if($strict_constructor){
+    if($strict){
         push @res, q{if($used < keys %{$args})}
-            . q{{ Mouse::Meta::Method::Constructor::_report_unknown_args($metaclass, \@attrs, $instance, $args) }};
+            . sprintf q{{ %s->_report_unknown_args($metaclass, \@attrs, $args) }}, $method_class;
     }
 
     if($metaclass->is_anon_class){
@@ -204,7 +235,7 @@ sub _generate_BUILDALL {
 }
 
 sub _report_unknown_args {
-    my($metaclass, $attrs, $instance, $args) = @_;
+    my(undef, $metaclass, $attrs, $args) = @_;
 
     my @unknowns;
     my %init_args;
@@ -223,7 +254,7 @@ sub _report_unknown_args {
 
     $metaclass->throw_error( sprintf
         "Unknown attribute passed to the constructor of %s: %s",
-        ref($instance), join ', ', @unknowns
+        $metaclass->name, Mouse::Util::english_list(@unknowns),
     );
 }
 
@@ -236,7 +267,7 @@ Mouse::Meta::Method::Constructor - A Mouse method generator for constructors
 
 =head1 VERSION
 
-This document describes Mouse version 0.50_02
+This document describes Mouse version 0.50_05
 
 =head1 SEE ALSO