X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FPurePerl.pm;h=056d3d9be26e7c02ccf8db124ea31a0d5dcd68c6;hb=1d76ae62bb4a259c0c107f1937e9db9f49ce8e10;hp=5e136c9859cee867eecf9411e67d8accdc184132;hpb=43c1bb1ad8ebe5534248ddc761a9bbbc95044643;p=gitmo%2FMouse.git diff --git a/lib/Mouse/PurePerl.pm b/lib/Mouse/PurePerl.pm index 5e136c9..056d3d9 100644 --- a/lib/Mouse/PurePerl.pm +++ b/lib/Mouse/PurePerl.pm @@ -134,7 +134,7 @@ sub generate_can_predicate_for { package Mouse::Util::TypeConstraints; -use Scalar::Util qw(blessed looks_like_number openhandle); +use Scalar::Util (); sub Any { 1 } sub Item { 1 } @@ -143,20 +143,23 @@ sub Bool { $_[0] ? $_[0] eq '1' : 1 } sub Undef { !defined($_[0]) } sub Defined { defined($_[0]) } sub Value { defined($_[0]) && !ref($_[0]) } -sub Num { looks_like_number($_[0]) } -sub Int { - my($value) = @_; - looks_like_number($value) && $value =~ /\A [+-]? [0-9]+ \z/xms; -} +sub Num { Scalar::Util::looks_like_number($_[0]) } sub Str { + # We need to use a copy here to flatten MAGICs, for instance as in + # Str( substr($_, 0, 42) ). my($value) = @_; return defined($value) && ref(\$value) eq 'SCALAR'; } +sub Int { + # We need to use a copy here to save the original internal SV flags. + my($value) = @_; + return defined($value) && $value =~ /\A -? [0-9]+ \z/xms; +} sub Ref { ref($_[0]) } sub ScalarRef { my($value) = @_; - return ref($value) eq 'SCALAR' + return ref($value) eq 'SCALAR' || ref($value) eq 'REF'; } sub ArrayRef { ref($_[0]) eq 'ARRAY' } sub HashRef { ref($_[0]) eq 'HASH' } @@ -165,10 +168,12 @@ sub RegexpRef { ref($_[0]) eq 'Regexp' } sub GlobRef { ref($_[0]) eq 'GLOB' } sub FileHandle { - return openhandle($_[0]) || (blessed($_[0]) && $_[0]->isa("IO::Handle")) + my($value) = @_; + return Scalar::Util::openhandle($value) + || (Scalar::Util::blessed($value) && $value->isa("IO::Handle")) } -sub Object { blessed($_[0]) && blessed($_[0]) ne 'Regexp' } +sub Object { Scalar::Util::blessed($_[0]) && ref($_[0]) ne 'Regexp' } sub ClassName { Mouse::Util::is_class_loaded($_[0]) } sub RoleName { (Mouse::Util::class_of($_[0]) || return 0)->isa('Mouse::Meta::Role') } @@ -282,19 +287,13 @@ sub roles { $_[0]->{roles} } sub linearized_isa { @{ Mouse::Util::get_linear_isa($_[0]->{package}) } } -sub get_all_attributes { - my($self) = @_; - my %attrs = map { %{ $self->initialize($_)->{attributes} } } reverse $self->linearized_isa; - return values %attrs; -} - sub new_object { my $meta = shift; my %args = (@_ == 1 ? %{$_[0]} : @_); my $object = bless {}, $meta->name; - $meta->_initialize_object($object, \%args); + $meta->_initialize_object($object, \%args, 0); # BUILDALL if( $object->can('BUILD') ) { for my $class (reverse $meta->linearized_isa) { @@ -312,74 +311,28 @@ sub clone_object { my $object = shift; my $args = $object->Mouse::Object::BUILDARGS(@_); - (blessed($object) && $object->isa($class->name)) + (Scalar::Util::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, $is_cloning) = @_; + # The initializer, which is used everywhere, must be clear + # when an attribute is added. See Mouse::Meta::Class::add_attribute. + my $initializer = $self->{_mouse_cache}{_initialize_object} ||= + Mouse::Util::load_class($self->constructor_class) + ->_generate_initialize_object($self); + goto &{$initializer}; +} - my @triggers_queue; - - my $used = 0; - - foreach my $attribute ($self->get_all_attributes) { - my $init_arg = $attribute->init_arg; - my $slot = $attribute->name; - - if (defined($init_arg) && exists($args->{$init_arg})) { - $object->{$slot} = $attribute->_coerce_and_verify($args->{$init_arg}, $object); - - weaken($object->{$slot}) - if ref($object->{$slot}) && $attribute->is_weak_ref; - - if ($attribute->has_trigger) { - push @triggers_queue, [ $attribute->trigger, $object->{$slot} ]; - } - $used++; - } - else { # no init arg - if ($attribute->has_default || $attribute->has_builder) { - if (!$attribute->is_lazy && !exists $object->{$slot}) { - my $default = $attribute->default; - my $builder = $attribute->builder; - my $value = $builder ? $object->$builder() - : ref($default) eq 'CODE' ? $object->$default() - : $default; - - $object->{$slot} = $attribute->_coerce_and_verify($value, $object); - - weaken($object->{$slot}) - if ref($object->{$slot}) && $attribute->is_weak_ref; - } - } - elsif(!$is_cloning && $attribute->is_required) { - $self->throw_error("Attribute (".$attribute->name.") is required"); - } - } - } - - if($used < keys %{$args} && $self->strict_constructor) { - $self->_report_unknown_args([ $self->get_all_attributes ], $args); - } - - if(@triggers_queue){ - foreach my $trigger_and_value(@triggers_queue){ - my($trigger, $value) = @{$trigger_and_value}; - $trigger->($object, $value); - } - } - - if($self->is_anon_class){ - $object->{__METACLASS__} = $self; - } - - return; +sub get_all_attributes { + my($self) = @_; + return @{ $self->{_mouse_cache}{all_attributes} + ||= $self->_calculate_all_attributes }; } sub is_immutable { $_[0]->{is_immutable} } @@ -651,6 +604,8 @@ sub name { $_[0]->{name} } sub parent { $_[0]->{parent} } sub message { $_[0]->{message} } +sub _identity { Scalar::Util::refaddr($_[0]) } # overload 0+ + sub type_parameter { $_[0]->{type_parameter} } sub _compiled_type_constraint{ $_[0]->{compiled_type_constraint} } sub _compiled_type_coercion { $_[0]->{_compiled_type_coercion} } @@ -729,13 +684,8 @@ sub BUILDARGS { sub new { my $class = shift; - - $class->meta->throw_error('Cannot call new() on an instance') if ref $class; - - my $args = $class->BUILDARGS(@_); - - my $meta = Mouse::Meta::Class->initialize($class); - return $meta->new_object($args); + my $args = $class->BUILDARGS(@_); + return $class->meta->new_object($args); } sub DESTROY { @@ -743,9 +693,8 @@ sub DESTROY { return unless $self->can('DEMOLISH'); # short circuit - local $?; - my $e = do{ + local $?; local $@; eval{ # DEMOLISHALL @@ -796,7 +745,7 @@ Mouse::PurePerl - A Mouse guts in pure Perl =head1 VERSION -This document describes Mouse version 0.71 +This document describes Mouse version 0.73 =head1 SEE ALSO