X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FMethod%2FConstructor.pm;h=0c929a764471cbe6196615edacda92f86f9c77aa;hp=f95775031ace15ab4f7529855607e5c3e2753551;hb=e128626c409797822ffd8a4079f833eb3dc0fd37;hpb=8215d7254eb706c929b0cfa9efafb7a5e6db658b

diff --git a/lib/Mouse/Meta/Method/Constructor.pm b/lib/Mouse/Meta/Method/Constructor.pm
index f957750..0c929a7 100644
--- a/lib/Mouse/Meta/Method/Constructor.pm
+++ b/lib/Mouse/Meta/Method/Constructor.pm
@@ -1,78 +1,116 @@
 package Mouse::Meta::Method::Constructor;
-use strict;
-use warnings;
+use Mouse::Util qw(:meta); # enables strict and warnings
 
-sub generate_constructor_method_inline {
-    my ($class, $metaclass) = @_;
+sub _inline_slot{
+    my(undef, $self_var, $attr_name) = @_;
+    return sprintf '%s->{q{%s}}', $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 $buildargs     = $class->_generate_BUILDARGS($metaclass);
     my $processattrs  = $class->_generate_processattrs($metaclass, \@attrs);
 
-    my @compiled_constraints = map { $_ ? $_->_compiled_type_constraint : undef }
-                               map { $_->type_constraint } @attrs;
-
-    my $code = sprintf("#line %d %s\n", __LINE__, __FILE__).<<"...";
-    sub {
-        my \$class = shift;
-        return \$class->Mouse::Object::new(\@_)
-            if \$class ne q{$associated_metaclass_name};
-        $buildargs;
-        my \$instance = bless {}, \$class;
-        $processattrs;
-        $buildall;
-        return \$instance;
-    }
+    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};
+            # BUILDARGS
+            $buildargs;
+            my \$instance = bless {}, \$class;
+            # process attributes
+            $processattrs;
+            # BUILDALL
+            $buildall;
+            return \$instance;
+        }
 ...
-
-    local $@;
-    my $res = eval $code;
-    die $@ if $@;
-    $res;
+    #warn $source;
+    my $code;
+    my $e = do{
+        local $@;
+        $code = eval $source;
+        $@;
+    };
+    die $e if $e;
+    return $code;
 }
 
 sub _generate_processattrs {
-    my ($class, $metaclass, $attrs) = @_;
+    my ($method_class, $metaclass, $attrs) = @_;
     my @res;
 
     my $has_triggers;
+    my $strict_constructor = $metaclass->__strict_constructor;
+
+
+    if($strict_constructor){
+        push @res, 'my $used = 0;';
+    }
 
     for my $index (0 .. @$attrs - 1) {
+        my $code = '';
+
         my $attr = $attrs->[$index];
         my $key  = $attr->name;
-        my $code = '';
 
-        if (defined $attr->init_arg) {
-            my $from = $attr->init_arg;
+        my $init_arg        = $attr->init_arg;
+        my $type_constraint = $attr->type_constraint;
+        my $is_weak_ref     = $attr->is_weak_ref;
+        my $need_coercion;
 
-            $code .= "if (exists \$args->{q{$from}}) {\n";
+        my $instance_slot  = $method_class->_inline_slot('$instance', $key);
+        my $attr_var       = "\$attrs[$index]";
+        my $constraint_var;
 
-            my $value = "\$args->{q{$from}}";
-            if(my $type_constraint = $attr->type_constraint){
-                if($attr->should_coerce && $type_constraint->has_coercion){
-                    $code .= "my \$value = \$attrs[$index]->{type_constraint}->coerce(\$args->{q{$from}});\n";
-                    $value = '$value';
-                }
+        if(defined $type_constraint){
+             $constraint_var = "$attr_var\->{type_constraint}";
+             $need_coercion  = ($attr->should_coerce && $type_constraint->has_coercion);
+        }
 
-                $code .= "\$compiled_constraints[$index]->($value)\n";
-                $code .= "  or \$attrs[$index]->verify_type_constraint_error(q{$key}, $value, \$attrs[$index]->{type_constraint});\n";
-            }
+        $code .= "# initialize $key\n";
+
+        my $post_process = '';
+        if(defined $type_constraint){
+            $post_process .= "\$checks[$index]->($instance_slot)";
+            $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";
+        }
+
+        if (defined $init_arg) {
+            my $value = "\$args->{q{$init_arg}}";
 
-            $code .= "\$instance->{q{$key}} = $value;\n";
+            $code .= "if (exists $value) {\n";
 
-            if ($attr->is_weak_ref) {
-                $code .= "Scalar::Util::weaken( \$instance->{q{$key}} ) if ref($value);\n";
+            if($need_coercion){
+                $value = "$constraint_var->coerce($value)";
             }
 
+            $code .= "$instance_slot = $value;\n";
+            $code .= $post_process;
+
             if ($attr->has_trigger) {
                 $has_triggers++;
-                $code .= "push \@triggers, [\$attrs[$index]->{trigger}, $value];\n";
+                $code .= "push \@triggers, [$attr_var\->{trigger}, $instance_slot];\n";
+            }
+
+            if ($strict_constructor){
+                $code .= '$used++;' . "\n";
             }
 
-            $code .= "\n} else {\n";
+            $code .= "\n} else {\n"; # $value exists
         }
 
         if ($attr->has_default || $attr->has_builder) {
@@ -80,47 +118,27 @@ sub _generate_processattrs {
                 my $default = $attr->default;
                 my $builder = $attr->builder;
 
-                $code .= "my \$value = ";
-
-                if ($attr->should_coerce && $attr->type_constraint) {
-                    $code .= "\$attrs[$index]->_coerce_and_verify(";
-                }
-
-                if ($attr->has_builder) {
-                    $code .= "\$instance->$builder()";
+                my $value;
+                if (defined($builder)) {
+                    $value = "\$instance->$builder()";
                 }
                 elsif (ref($default) eq 'CODE') {
-                    $code .= "\$attrs[$index]->{default}->(\$instance)";
+                    $value = "$attr_var\->{default}->(\$instance)";
                 }
-                elsif (!defined($default)) {
-                    $code .= 'undef';
-                }
-                elsif ($default =~ /^\-?[0-9]+(?:\.[0-9]+)$/) {
-                    $code .= $default;
+                elsif (defined($default)) {
+                    $value = "$attr_var\->{default}";
                 }
                 else {
-                    $code .= "'$default'";
+                    $value = 'undef';
                 }
 
-                if ($attr->should_coerce) {
-                    $code .= ");\n";
-                }
-                else {
-                    $code .= ";\n";
+                if($need_coercion){
+                    $value = "$constraint_var->coerce($value)";
                 }
 
-                if ($attr->has_type_constraint) {
-                    $code .= "{
-                        unless (\$attrs[$index]->{type_constraint}->check(\$value)) {
-                            \$attrs[$index]->verify_type_constraint_error(q{$key}, \$value, \$attrs[$index]->type_constraint)
-                        }
-                    }";
-                }
-
-                $code .= "\$instance->{q{$key}} = \$value;\n";
-
-                if ($attr->is_weak_ref) {
-                    $code .= "Scalar::Util::weaken( \$instance->{q{$key}} ) if ref( \$value );\n";
+                $code .= "$instance_slot = $value;\n";
+                if($is_weak_ref){
+                    $code .= "Scalar::Util::weaken($instance_slot);\n";
                 }
             }
         }
@@ -128,27 +146,33 @@ sub _generate_processattrs {
             $code .= "Carp::confess('Attribute ($key) is required');";
         }
 
-        $code .= "}\n" if defined $attr->init_arg;
+        $code .= "}\n" if defined $init_arg;
 
         push @res, $code;
     }
 
+    if($strict_constructor){
+        push @res, q{if($used < keys %{$args})}
+            . q{{ Mouse::Meta::Method::Constructor::_report_unknown_args($metaclass, \@attrs, $instance, $args) }};
+    }
+
     if($metaclass->is_anon_class){
-        push @res, q{$instnace->{__METACLASS__} = $metaclass;};
+        push @res, q{$instance->{__METACLASS__} = $metaclass;};
     }
 
     if($has_triggers){
         unshift @res, q{my @triggers;};
-        push    @res,  q{$_->[0]->($instance, $_->[1]) for @triggers;};
+        push    @res, q{$_->[0]->($instance, $_->[1]) for @triggers;};
     }
 
     return join "\n", @res;
 }
 
 sub _generate_BUILDARGS {
-    my($self, $metaclass) = @_;
+    my(undef, $metaclass) = @_;
 
-    if ($metaclass->name->can('BUILDARGS') && $metaclass->name->can('BUILDARGS') != \&Mouse::Object::BUILDARGS) {
+    my $class = $metaclass->name;
+    if ( $class->can('BUILDARGS') && $class->can('BUILDARGS') != \&Mouse::Object::BUILDARGS ) {
         return 'my $args = $class->BUILDARGS(@_)';
     }
 
@@ -166,20 +190,56 @@ sub _generate_BUILDARGS {
 }
 
 sub _generate_BUILDALL {
-    my ($class, $metaclass) = @_;
+    my (undef, $metaclass) = @_;
 
     return '' unless $metaclass->name->can('BUILD');
 
     my @code;
     for my $class ($metaclass->linearized_isa) {
-        no strict 'refs';
-        no warnings 'once';
-
-        if (*{ $class . '::BUILD' }{CODE}) {
+        if (Mouse::Util::get_code_ref($class, 'BUILD')) {
             unshift  @code, qq{${class}::BUILD(\$instance, \$args);};
         }
     }
     return join "\n", @code;
 }
 
+sub _report_unknown_args {
+    my($metaclass, $attrs, $instance, $args) = @_;
+
+    my @unknowns;
+    my %init_args;
+    foreach my $attr(@{$attrs}){
+        my $init_arg = $attr->init_arg;
+        if(defined $init_arg){
+            $init_args{$init_arg}++;
+        }
+    }
+
+    while(my $key = each %{$args}){
+        if(!exists $init_args{$key}){
+            push @unknowns, $key;
+        }
+    }
+
+    $metaclass->throw_error( sprintf
+        "Unknown attribute passed to the constructor of %s: %s",
+        ref($instance), join ', ', @unknowns
+    );
+}
+
 1;
+__END__
+
+=head1 NAME
+
+Mouse::Meta::Method::Constructor - A Mouse method generator for constructors
+
+=head1 VERSION
+
+This document describes Mouse version 0.50_01
+
+=head1 SEE ALSO
+
+L<Moose::Meta::Method::Constructor>
+
+=cut