use Carp 'confess';
use Scalar::Util 'blessed', 'weaken', 'looks_like_number';
-our $VERSION = '0.02';
+our $VERSION = '0.84';
+$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
-use base 'Class::MOP::Method::Generated';
+use base 'Class::MOP::Method::Inlined';
sub new {
my $class = shift;
my %options = @_;
-
- (exists $options{options} && ref $options{options} eq 'HASH')
- || confess "You must pass a hash of options";
-
- my $self = bless {
- # from our superclass
- '&!body' => undef,
- # specific to this subclass
- '%!options' => $options{options},
- '$!associated_metaclass' => $options{metaclass},
- '$!is_inline' => ($options{is_inline} || 0),
- } => $class;
- # we don't want this creating
- # a cycle in the code, if not
+ (blessed $options{metaclass} && $options{metaclass}->isa('Class::MOP::Class'))
+ || confess "You must pass a metaclass instance if you want to inline"
+ if $options{is_inline};
+
+ ($options{package_name} && $options{name})
+ || confess "You must supply the package_name and name parameters $Class::MOP::Method::UPGRADE_ERROR_TEXT";
+
+ my $self = $class->_new(\%options);
+
+ # we don't want this creating
+ # a cycle in the code, if not
# needed
- weaken($self->{'$!associated_metaclass'});
+ weaken($self->{'associated_metaclass'});
- $self->initialize_body;
+ $self->_initialize_body;
- return $self;
+ return $self;
}
-## accessors
+sub _new {
+ my $class = shift;
+ my $options = @_ == 1 ? $_[0] : {@_};
-sub options { (shift)->{'%!options'} }
-sub associated_metaclass { (shift)->{'$!associated_metaclass'} }
+ bless {
+ # from our superclass
+ 'body' => undef,
+ 'package_name' => $options->{package_name},
+ 'name' => $options->{name},
+ # specific to this subclass
+ 'options' => $options->{options} || {},
+ 'associated_metaclass' => $options->{metaclass},
+ 'is_inline' => ($options->{is_inline} || 0),
+ }, $class;
+}
+
+## accessors
+
+sub options { (shift)->{'options'} }
+sub associated_metaclass { (shift)->{'associated_metaclass'} }
## cached values ...
-sub meta_instance {
+sub meta_instance {
+ Carp::cluck('The meta_instance method has been made private.'
+ . " The public version is deprecated and will be removed in a future release.\n");
+ shift->_meta_instance;
+}
+
+sub _meta_instance {
my $self = shift;
- $self->{'$!meta_instance'} ||= $self->associated_metaclass->get_meta_instance;
+ $self->{'meta_instance'} ||= $self->associated_metaclass->get_meta_instance;
}
-sub attributes {
+sub attributes {
+ Carp::cluck('The attributes method has been made private.'
+ . " The public version is deprecated and will be removed in a future release.\n");
+
+ return shift->_attributes;
+}
+
+sub _attributes {
my $self = shift;
- $self->{'@!attributes'} ||= [ $self->associated_metaclass->compute_all_applicable_attributes ]
+ $self->{'attributes'} ||= [ $self->associated_metaclass->get_all_attributes ]
}
## method
sub initialize_body {
+ Carp::cluck('The initialize_body method has been made private.'
+ . " The public version is deprecated and will be removed in a future release.\n");
+ shift->_initialize_body;
+}
+
+sub _initialize_body {
my $self = shift;
- my $method_name = 'generate_constructor_method';
-
+ my $method_name = '_generate_constructor_method';
+
$method_name .= '_inline' if $self->is_inline;
-
- $self->{'&!body'} = $self->$method_name;
+
+ $self->{'body'} = $self->$method_name;
}
sub generate_constructor_method {
- return sub { (shift)->meta->new_object(@_) }
+ Carp::cluck('The generate_constructor_method method has been made private.'
+ . " The public version is deprecated and will be removed in a future release.\n");
+ shift->_generate_constructor_method;
+}
+
+sub _generate_constructor_method {
+ return sub { Class::MOP::Class->initialize(shift)->new_object(@_) }
}
sub generate_constructor_method_inline {
+ Carp::cluck('The generate_constructor_method_inline method has been made private.'
+ . " The public version is deprecated and will be removed in a future release.\n");
+ shift->_generate_constructor_method_inline;
+}
+
+sub _generate_constructor_method_inline {
my $self = shift;
+ my $close_over = {};
+
my $source = 'sub {';
- $source .= "\n" . 'my ($class, %params) = @_;';
-
- $source .= "\n" . 'return $class->meta->new_object(%params)';
- $source .= "\n" . ' if $class ne \'' . $self->associated_metaclass->name . '\';';
-
- $source .= "\n" . 'my $instance = ' . $self->meta_instance->inline_create_instance('$class');
- $source .= ";\n" . (join ";\n" => map {
- $self->_generate_slot_initializer($_)
- } 0 .. (@{$self->attributes} - 1));
+ $source .= "\n" . 'my $class = shift;';
+
+ $source .= "\n" . 'return Class::MOP::Class->initialize($class)->new_object(@_)';
+ $source .= "\n" . ' if $class ne \'' . $self->associated_metaclass->name . '\';';
+
+ $source .= "\n" . 'my $params = @_ == 1 ? $_[0] : {@_};';
+
+ $source .= "\n" . 'my $instance = ' . $self->_meta_instance->inline_create_instance('$class');
+ $source .= ";\n" . (join ";\n" => map {
+ $self->_generate_slot_initializer($_, $close_over)
+ } @{ $self->_attributes });
$source .= ";\n" . 'return $instance';
- $source .= ";\n" . '}';
- warn $source if $self->options->{debug};
-
- my $code;
- {
- # NOTE:
- # create the nessecary lexicals
- # to be picked up in the eval
- my $attrs = $self->attributes;
-
- $code = eval $source;
- confess "Could not eval the constructor :\n\n$source\n\nbecause :\n\n$@" if $@;
- }
+ $source .= ";\n" . '}';
+ warn $source if $self->options->{debug};
+
+ my $code = $self->_eval_closure(
+ $close_over,
+ $source
+ );
+ confess "Could not eval the constructor :\n\n$source\n\nbecause :\n\n$@" if $@;
+
return $code;
}
sub _generate_slot_initializer {
my $self = shift;
- my $index = shift;
-
- my $attr = $self->attributes->[$index];
-
+ my $attr = shift;
+ my $close = shift;
+
my $default;
if ($attr->has_default) {
# NOTE:
# default values can either be CODE refs
- # in which case we need to call them. Or
+ # in which case we need to call them. Or
# they can be scalars (strings/numbers)
# in which case we can just deal with them
# in the code we eval.
if ($attr->is_default_a_coderef) {
- $default = '$attrs->[' . $index . ']->default($instance)';
+ my $idx = @{$close->{'@defaults'}||=[]};
+ push(@{$close->{'@defaults'}}, $attr->default);
+ $default = '$defaults[' . $idx . ']->($instance)';
}
else {
$default = $attr->default;
$default = "'$default'";
}
}
+ } elsif( $attr->has_builder ) {
+ $default = '$instance->'.$attr->builder;
}
- $self->meta_instance->inline_set_slot_value(
- '$instance',
- ("'" . $attr->name . "'"),
- ('$params{\'' . $attr->init_arg . '\'}' . (defined $default ? (' || ' . $default) : ''))
- );
-}
-1;
+ if ( defined $attr->init_arg ) {
+ return (
+ 'if(exists $params->{\'' . $attr->init_arg . '\'}){' . "\n" .
+ $self->_meta_instance->inline_set_slot_value(
+ '$instance',
+ $attr->name,
+ '$params->{\'' . $attr->init_arg . '\'}' ) . "\n" .
+ '} ' . (!defined $default ? '' : 'else {' . "\n" .
+ $self->_meta_instance->inline_set_slot_value(
+ '$instance',
+ $attr->name,
+ $default ) . "\n" .
+ '}')
+ );
+ } elsif ( defined $default ) {
+ return (
+ $self->_meta_instance->inline_set_slot_value(
+ '$instance',
+ $attr->name,
+ $default ) . "\n"
+ );
+ } else { return '' }
+}
1;
=pod
-=head1 NAME
+=head1 NAME
Class::MOP::Method::Constructor - Method Meta Object for constructors
=head1 SYNOPSIS
use Class::MOP::Method::Constructor;
-
+
my $constructor = Class::MOP::Method::Constructor->new(
- metaclass => $metaclass,
+ metaclass => $metaclass,
options => {
debug => 1, # this is all for now
- },
+ },
);
-
+
# calling the constructor ...
- $constructor->body->($metaclass->name, %params);
-
+ $constructor->body->execute($metaclass->name, %params);
+
=head1 DESCRIPTION
-This is a subclass of C<Class::MOP::Method> which deals with
-class constructors.
+This is a subclass of C<Class::MOP::Method> which generates
+constructor methods.
=head1 METHODS
=over 4
-=item B<new (metaclass => $meta, options => \%options)>
-
-=item B<options>
+=item B<< Class::MOP::Method::Constructor->new(%options) >>
-This returns the options HASH which is passed into C<new>.
+This creates a new constructor object. It accepts a hash reference of
+options.
-=item B<associated_metaclass>
+=over 8
-This returns the metaclass which is passed into C<new>.
+=item * metaclass
-=item B<attributes>
+This should be a L<Class::MOP::Class> object. It is required.
-This returns the list of attributes which are associated with the
-metaclass which is passed into C<new>.
+=item * name
-=item B<meta_instance>
+The method name (without a package name). This is required.
-This returns the meta instance which is associated with the
-metaclass which is passed into C<new>.
+=item * package_name
-=item B<is_inline>
+The package name for the method. This is required.
-This returns a boolean, but since constructors are very rarely
-not inlined, this always returns true for now.
+=item * is_inline
-=item B<initialize_body>
-
-This creates the code reference for the constructor itself.
+This indicates whether or not the constructor should be inlined. This
+defaults to false.
=back
-=head2 Method Generators
+=item B<< $metamethod->is_inline >>
-=over 4
+Returns a boolean indicating whether or not the constructor is
+inlined.
-=item B<generate_constructor_method>
+=item B<< $metamethod->associated_metaclass >>
-=item B<generate_constructor_method_inline>
+This returns the L<Class::MOP::Class> object for the method.
=back
=head1 COPYRIGHT AND LICENSE
-Copyright 2006, 2007 by Infinity Interactive, Inc.
+Copyright 2006-2009 by Infinity Interactive, Inc.
L<http://www.iinteractive.com>
This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
+it under the same terms as Perl itself.
=cut
projects / gitmo/Class-MOP.git / blobdiff