X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FMethod%2FConstructor.pm;h=2867d718db80c3d09928eac5d260c316aada41a3;hb=713a2a052a1918450652b3ef5093eeb6640c9e7b;hp=c386e3d400702c8e95999390f9b00729451554aa;hpb=8a7f2a8a33880aeb024e9fa21703e49fac9ef6a5;p=gitmo%2FMouse.git diff --git a/lib/Mouse/Meta/Method/Constructor.pm b/lib/Mouse/Meta/Method/Constructor.pm index c386e3d..2867d71 100644 --- a/lib/Mouse/Meta/Method/Constructor.pm +++ b/lib/Mouse/Meta/Method/Constructor.pm @@ -77,15 +77,20 @@ sub _generate_processattrs { if ($attr->should_coerce) { push @code, "\$attrs[$index]->coerce_constraint("; } - if ($attr->has_builder) { push @code, "\$instance->$builder"; } elsif (ref($default) eq 'CODE') { push @code, "\$attrs[$index]->default()->()"; } + elsif (!defined($default)) { + push @code, 'undef'; + } + elsif ($default =~ /^\-?[0-9]+(?:\.[0-9]+)$/) { + push @code, $default; + } else { - push @code, "\$attrs[$index]->default()"; + push @code, "'$default'"; } if ($attr->should_coerce) { @@ -119,8 +124,14 @@ sub _generate_processattrs { { if (exists(\$args->{'$from'})) { $set_value; +... + if ($make_default_value) { + $code .= <<"..."; } else { $make_default_value; +... + } + $code .= <<"..."; } } ...