X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FPurePerl.pm;h=8285fa7f08d185b6b2e4d7e9777da4561893b8be;hb=51ca4f9f1b8d9f7a58641300be556c775af7b032;hp=d62be9141b797c1a440883159d7d382649c6a5f5;hpb=6e1e5b31f9ff0a46de1d7e396840da18c385962d;p=gitmo%2FMouse.git diff --git a/lib/Mouse/PurePerl.pm b/lib/Mouse/PurePerl.pm index d62be91..8285fa7 100644 --- a/lib/Mouse/PurePerl.pm +++ b/lib/Mouse/PurePerl.pm @@ -148,12 +148,7 @@ sub Value { defined($_[0]) && !ref($_[0]) } sub Num { looks_like_number($_[0]) } sub Int { my($value) = @_; - looks_like_number($value) && do{ - # work around RT #55048 - # This is for more than 32 bit int on 32 bit systems - require POSIX; - POSIX::fmod($value, 1) == 0; - }; + looks_like_number($value) && $value =~ /\A [+-]? [0-9]+ \z/xms; } sub Str { my($value) = @_; @@ -275,17 +270,40 @@ sub get_all_attributes { } sub new_object { - my $self = shift; + my $meta = shift; my %args = (@_ == 1 ? %{$_[0]} : @_); - my $object = bless {}, $self->name; + my $object = bless {}, $meta->name; + + $meta->_initialize_object($object, \%args); + # BUILDALL + if( $object->can('BUILD') ) { + for my $class (reverse $meta->linearized_isa) { + my $build = Mouse::Util::get_code_ref($class, 'BUILD') + || next; - $self->_initialize_object($object, \%args); + $object->$build(\%args); + } + } return $object; } +sub clone_object { + my $class = shift; + my $object = shift; + my $args = $object->Mouse::Object::BUILDARGS(@_); + + (blessed($object) && $object->isa($class->name)) + || $class->throw_error("You must pass an instance of the metaclass (" . $class->name . "), not ($object)"); + + my $cloned = bless { %$object }, ref $object; + $class->_initialize_object($cloned, $args, 1); + + return $cloned; +} + sub _initialize_object{ - my($self, $object, $args, $ignore_triggers) = @_; + my($self, $object, $args, $is_cloning) = @_; my @triggers_queue; @@ -305,7 +323,7 @@ sub _initialize_object{ } else { # no init arg if ($attribute->has_default || $attribute->has_builder) { - if (!$attribute->is_lazy) { + if (!$attribute->is_lazy && !exists $object->{$slot}) { my $default = $attribute->default; my $builder = $attribute->builder; my $value = $builder ? $object->$builder() @@ -318,13 +336,13 @@ sub _initialize_object{ if ref($object->{$slot}) && $attribute->is_weak_ref; } } - elsif($attribute->is_required) { + elsif(!$is_cloning && $attribute->is_required) { $self->throw_error("Attribute (".$attribute->name.") is required"); } } } - if(!$ignore_triggers){ + if(@triggers_queue){ foreach my $trigger_and_value(@triggers_queue){ my($trigger, $value) = @{$trigger_and_value}; $trigger->($object, $value); @@ -622,6 +640,12 @@ sub compile_type_constraint{ return; } +sub check { + my $self = shift; + return $self->_compiled_type_constraint->(@_); +} + + package Mouse::Object; sub BUILDARGS { @@ -646,19 +670,7 @@ sub new { my $args = $class->BUILDARGS(@_); my $meta = Mouse::Meta::Class->initialize($class); - my $self = $meta->new_object($args); - - # BUILDALL - if( $self->can('BUILD') ) { - for my $class (reverse $meta->linearized_isa) { - my $build = Mouse::Util::get_code_ref($class, 'BUILD') - || next; - - $self->$build($args); - } - } - - return $self; + return $meta->new_object($args); } sub DESTROY { @@ -719,7 +731,7 @@ Mouse::PurePerl - A Mouse guts in pure Perl =head1 VERSION -This document describes Mouse version 0.50_06 +This document describes Mouse version 0.61 =head1 SEE ALSO