use Carp 'confess';
use Scalar::Util 'blessed', 'weaken', 'looks_like_number';
-our $VERSION = '0.71';
+our $VERSION = '0.92';
$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
-use base 'Class::MOP::Method::Generated';
+use base 'Class::MOP::Method::Inlined';
sub new {
my $class = shift;
# needed
weaken($self->{'associated_metaclass'});
- $self->initialize_body;
+ $self->_initialize_body;
return $self;
}
sub _new {
my $class = shift;
- my $options = @_ == 1 ? $_[0] : {@_};
-
- 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),
+
+ return Class::MOP::Class->initialize($class)->new_object(@_)
+ if $class ne __PACKAGE__;
+
+ my $params = @_ == 1 ? $_[0] : {@_};
+
+ return bless {
+ # inherited from Class::MOP::Method
+ body => $params->{body},
+ # associated_metaclass => $params->{associated_metaclass}, # overriden
+ package_name => $params->{package_name},
+ name => $params->{name},
+ original_method => $params->{original_method},
+
+ # inherited from Class::MOP::Generated
+ is_inline => $params->{is_inline} || 0,
+ definition_context => $params->{definition_context},
+
+ # inherited from Class::MOP::Inlined
+ _expected_method_class => $params->{_expected_method_class},
+
+ # defined in this subclass
+ options => $params->{options} || {},
+ associated_metaclass => $params->{metaclass},
}, $class;
}
## cached values ...
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;
}
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;
}
sub generate_constructor_method {
+ 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 = shift;';
$source .= "\n" . 'my $params = @_ == 1 ? $_[0] : {@_};';
- $source .= "\n" . 'my $instance = ' . $self->meta_instance->inline_create_instance('$class');
+ $source .= "\n" . 'my $instance = ' . $self->_meta_instance->inline_create_instance('$class');
$source .= ";\n" . (join ";\n" => map {
- $self->_generate_slot_initializer($_)
- } 0 .. (@{$self->attributes} - 1));
+ $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;
+ my ( $code, $e ) = $self->_eval_closure(
+ $close_over,
+ $source
+ );
+ confess "Could not eval the constructor :\n\n$source\n\nbecause :\n\n$e" if $e;
- $code = eval $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) {
# 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 = '$instance->'.$attr->builder;
}
- if ( defined $attr->init_arg ) {
+ if ( defined(my $init_arg = $attr->init_arg) ) {
return (
- 'if(exists $params->{\'' . $attr->init_arg . '\'}){' . "\n" .
- $self->meta_instance->inline_set_slot_value(
+ 'if(exists $params->{\'' . $init_arg . '\'}){' . "\n" .
+ $self->_meta_instance->inline_set_slot_value(
'$instance',
- ("'" . $attr->name . "'"),
- '$params->{\'' . $attr->init_arg . '\'}' ) . "\n" .
+ $attr->name,
+ '$params->{\'' . $init_arg . '\'}' ) . "\n" .
'} ' . (!defined $default ? '' : 'else {' . "\n" .
- $self->meta_instance->inline_set_slot_value(
+ $self->_meta_instance->inline_set_slot_value(
'$instance',
- ("'" . $attr->name . "'"),
+ $attr->name,
$default ) . "\n" .
'}')
);
} elsif ( defined $default ) {
return (
- $self->meta_instance->inline_set_slot_value(
+ $self->_meta_instance->inline_set_slot_value(
'$instance',
- ("'" . $attr->name . "'"),
+ $attr->name,
$default ) . "\n"
);
} else { return '' }
=head1 DESCRIPTION
-This is a subclass of C<Class::MOP::Method> which deals with
-class constructors. This is used when making a class immutable
-to generate an optimized constructor.
+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<< Class::MOP::Method::Constructor->new(%options) >>
-=item B<options>
+This creates a new constructor object. It accepts a hash reference of
+options.
-This returns the options HASH which is passed into C<new>.
+=over 8
-=item B<associated_metaclass>
+=item * metaclass
-This returns the metaclass which is passed into C<new>.
+This should be a L<Class::MOP::Class> object. It is required.
-=item B<attributes>
+=item * name
-This returns the list of attributes which are associated with the
-metaclass which is passed into C<new>.
+The method name (without a package name). This is required.
-=item B<meta_instance>
+=item * package_name
-This returns the meta instance which is associated with the
-metaclass which is passed into C<new>.
+The package name for the method. This is required.
-=item B<is_inline>
+=item * is_inline
-This returns a boolean, but since constructors are very rarely
-not inlined, this always returns true for now.
-
-=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-2008 by Infinity Interactive, Inc.
+Copyright 2006-2009 by Infinity Interactive, Inc.
L<http://www.iinteractive.com>
projects / gitmo/Class-MOP.git / blobdiff