X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FClass.pm;h=8183a969b634ea1c0b84467391ce0416fc4eee56;hp=5aab15e209f600e170148e0f232aaf3a815356be;hb=7efbc77d922079f81c55e2f1535f222979fe1d96;hpb=2b68f76d78d96325821e9a6360c3639f8c5637df diff --git a/lib/Mouse/Meta/Class.pm b/lib/Mouse/Meta/Class.pm index 5aab15e..8183a96 100644 --- a/lib/Mouse/Meta/Class.pm +++ b/lib/Mouse/Meta/Class.pm @@ -11,15 +11,15 @@ our @ISA = qw(Mouse::Meta::Module); sub method_metaclass() { 'Mouse::Meta::Method' } sub attribute_metaclass() { 'Mouse::Meta::Attribute' } -sub constructor_class() { 'Mouse::Meta::Method::Constructor' } +sub constructor_class(); # XS sub destructor_class() { 'Mouse::Meta::Method::Destructor' } sub _construct_meta { my($class, %args) = @_; - $args{attributes} ||= {}; - $args{methods} ||= {}; - $args{roles} ||= []; + $args{attributes} = {}; + $args{methods} = {}; + $args{roles} = []; $args{superclasses} = do { no strict 'refs'; @@ -56,7 +56,7 @@ sub superclasses { foreach my $super(@_){ Mouse::Util::load_class($super); my $meta = Mouse::Util::get_metaclass_by_name($super); - if(Mouse::Util::TypeConstraints::_is_a_metarole($meta)){ + if(Mouse::Util::is_a_metarole($meta)){ $self->throw_error("You cannot inherit from a Mouse Role ($super)"); } } @@ -154,23 +154,6 @@ sub compute_all_applicable_attributes { return shift->get_all_attributes(@_) } -sub get_all_attributes { - my $self = shift; - my (@attr, %seen); - - for my $class ($self->linearized_isa) { - my $meta = Mouse::Util::get_metaclass_by_name($class) - or next; - - for my $name ($meta->get_attribute_list) { - next if $seen{$name}++; - push @attr, $meta->get_attribute($name); - } - } - - return @attr; -} - sub linearized_isa; sub new_object { @@ -183,60 +166,6 @@ sub new_object { return $object; } -sub _initialize_object{ - my($self, $object, $args) = @_; - - my @triggers_queue; - - foreach my $attribute ($self->get_all_attributes) { - my $from = $attribute->init_arg; - my $key = $attribute->name; - - if (defined($from) && exists($args->{$from})) { - $object->{$key} = $attribute->_coerce_and_verify($args->{$from}, $object); - - weaken($object->{$key}) - if ref($object->{$key}) && $attribute->is_weak_ref; - - if ($attribute->has_trigger) { - push @triggers_queue, [ $attribute->trigger, $object->{$key} ]; - } - } - else { - if ($attribute->has_default || $attribute->has_builder) { - unless ($attribute->is_lazy) { - my $default = $attribute->default; - my $builder = $attribute->builder; - my $value = $builder ? $object->$builder() - : ref($default) eq 'CODE' ? $object->$default() - : $default; - - $object->{$key} = $attribute->_coerce_and_verify($value, $object); - - weaken($object->{$key}) - if ref($object->{$key}) && $attribute->is_weak_ref; - } - } - else { - if ($attribute->is_required) { - $self->throw_error("Attribute (".$attribute->name.") is required"); - } - } - } - } - - 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 $object; -} - sub clone_object { my $class = shift; my $object = shift; @@ -479,7 +408,7 @@ Mouse::Meta::Class - The Mouse class metaclass =head1 VERSION -This document describes Mouse version 0.40_03 +This document describes Mouse version 0.40_05 =head1 METHODS