use strict;
use warnings;
-use Scalar::Util 'blessed', 'weaken', 'looks_like_number';
+use Scalar::Util 'blessed', 'weaken', 'looks_like_number', 'refaddr';
-our $VERSION = '0.73';
+our $VERSION = '0.97';
our $AUTHORITY = 'cpan:STEVAN';
use base 'Moose::Meta::Method',
|| $class->throw_error("You must supply the package_name and name parameters $Class::MOP::Method::UPGRADE_ERROR_TEXT");
my $self = bless {
- 'body' => undef,
+ 'body' => undef,
'package_name' => $options{package_name},
'name' => $options{name},
'options' => $options{options},
'associated_metaclass' => $meta,
+ '_expected_method_class' => $options{_expected_method_class} || 'Moose::Object',
} => $class;
# we don't want this creating
return $self;
}
-sub can_be_inlined {
- my $self = shift;
- my $metaclass = $self->associated_metaclass;
-
- my $expected_class = $self->_expected_constructor_class;
-
- # If any of our parents have been made immutable, we are okay to
- # inline our own new method. The assumption is that an inlined new
- # method provided by a parent does not actually get used by
- # children anyway.
- for my $meta (
- grep { $_->is_immutable }
- map { ( ref $metaclass )->initialize($_) }
- grep { $_ ne $expected_class }
- $metaclass->linearized_isa
- ) {
- my $transformer = $meta->immutable_transformer;
-
- # This is actually a false positive if we're in a subclass of
- # this class, _and_ the expected class is not overridden (but
- # should be), and the real expected class is actually
- # immutable itself (see Fey::Object::Table for an example of
- # how this can happen). I'm not sure how to actually handle
- # that case, since it's effectively a bug in the subclass (for
- # not overriding _expected_constructor_class).
- return 1 if $transformer->inlined_constructor;
- }
-
- if ( my $constructor = $metaclass->find_method_by_name( $self->name ) ) {
- my $class = $self->associated_metaclass->name;
-
- if ( $constructor->body != $expected_class->can('new') ) {
- my $warning
- = "Not inlining a constructor for $class since it is not"
- . " inheriting the default $expected_class constructor\n"
- . "If you are certain you don't need to inline your"
- . " constructor, specify inline_constructor => 0 in your"
- . " call to $class->meta->make_immutable\n";
-
- $warning .= " (constructor has method modifiers which would be lost if it were inlined)\n"
- if $constructor->isa('Class::MOP::Method::Wrapped');
-
- warn $warning;
-
- return 0;
- }
- else {
- return 1;
- }
- }
-
- # This would be a rather weird case where we have no constructor
- # in the inheritance chain.
- return 1;
-}
-
-# This is here so can_be_inlined can be inherited by MooseX modules.
-sub _expected_constructor_class {
- return 'Moose::Object';
-}
-
## method
sub _initialize_body {
# requires some adaption on the part of
# the author, after all, nothing is free)
my $source = 'sub {';
- $source .= "\n" . 'my $class = shift;';
+ $source .= "\n" . 'my $_instance = shift;';
+
+ $source .= "\n" . 'my $class = Scalar::Util::blessed($_instance) || $_instance;';
$source .= "\n" . 'return $class->Moose::Object::new(@_)';
- $source .= "\n if \$class ne '" . $self->associated_metaclass->name
+ $source .= "\n if \$class ne '" . $self->associated_metaclass->name
. "';\n";
$source .= $self->_generate_params('$params', '$class');
defined $_ ? $_->_compiled_type_constraint : undef;
} @type_constraints;
- my $code = $self->_compile_code(
+ my ( $code, $e ) = $self->_compile_code(
code => $source,
environment => {
'$meta' => \$self,
'@type_constraints' => \@type_constraints,
'@type_constraint_bodies' => \@type_constraint_bodies,
},
- ) or $self->throw_error("Could not eval the constructor :\n\n$source\n\nbecause :\n\n$@", error => $@, data => $source );
-
+ );
+
+ $self->throw_error(
+ "Could not eval the constructor :\n\n$source\n\nbecause :\n\n$e",
+ error => $e, data => $source )
+ if $e;
+
$self->{'body'} = $code;
}
if ($is_moose && defined($attr->init_arg) && $attr->is_required && !$attr->has_default && !$attr->has_builder) {
push @source => ('(exists $params->{\'' . $attr->init_arg . '\'}) ' .
- '|| ' . $self->_inline_throw_error('"Attribute (' . $attr->name . ') is required"') .';');
+ '|| ' . $self->_inline_throw_error('"Attribute (' . quotemeta($attr->name) . ') is required"') .';');
}
if (($attr->has_default || $attr->has_builder) && !($is_moose && $attr->is_lazy)) {
my $default;
if ( $attr->has_default ) {
$default = $self->_generate_default_value($attr, $index);
- }
+ }
else {
my $builder = $attr->builder;
$default = '$instance->' . $builder;
}
-
+
push @source => '{'; # wrap this to avoid my $val overwrite warnings
push @source => ('my $val = ' . $default . ';');
push @source => $self->_generate_type_constraint_and_coercion($attr, $index)
- if $is_moose;
+ if $is_moose;
push @source => $self->_generate_slot_assignment($attr, '$val', $index);
- push @source => '}'; # close - wrap this to avoid my $val overrite warnings
+ push @source => '}'; # close - wrap this to avoid my $val overrite warnings
push @source => "}" if defined $attr->init_arg;
}
if ($is_moose && $attr->has_type_constraint) {
if ($attr->should_coerce && $attr->type_constraint->has_coercion) {
push @source => $self->_generate_type_coercion(
- $attr,
- '$type_constraints[' . $index . ']',
- '$val',
+ $attr,
+ '$type_constraints[' . $index . ']',
+ '$val',
'$val'
);
}
push @source => $self->_generate_type_constraint_check(
- $attr,
- '$type_constraint_bodies[' . $index . ']',
- '$type_constraints[' . $index . ']',
+ $attr,
+ '$type_constraint_bodies[' . $index . ']',
+ '$type_constraints[' . $index . ']',
'$val'
);
}
my ($self, $attr, $value, $index) = @_;
my $source;
-
+
if ($attr->has_initializer) {
$source = (
'$attrs->[' . $index . ']->set_initial_value($instance, ' . $value . ');'
- );
+ );
}
else {
$source = (
$attr->name,
$value
) . ';'
- );
+ );
}
-
- my $is_moose = $attr->isa('Moose::Meta::Attribute'); # XXX FIXME
+
+ my $is_moose = $attr->isa('Moose::Meta::Attribute'); # XXX FIXME
if ($is_moose && $attr->is_weak_ref) {
$source .= (
sub _generate_type_constraint_and_coercion {
my ($self, $attr, $index) = @_;
-
+
return unless $attr->has_type_constraint;
-
+
my @source;
if ($attr->should_coerce && $attr->type_constraint->has_coercion) {
push @source => $self->_generate_type_coercion(
push @source => $self->_generate_type_constraint_check(
$attr,
('$type_constraint_bodies[' . $index . ']'),
- ('$type_constraints[' . $index . ']'),
+ ('$type_constraints[' . $index . ']'),
'$val'
);
return @source;
my ($self, $attr, $type_constraint_cv, $type_constraint_obj, $value_name) = @_;
return (
$self->_inline_throw_error('"Attribute (' # FIXME add 'dad'
- . $attr->name
- . ') does not pass the type constraint because: " . '
+ . quotemeta( $attr->name )
+ . ') does not pass the type constraint because: " . '
. $type_constraint_obj . '->get_message(' . $value_name . ')')
. "\n\t unless " . $type_constraint_cv . '->(' . $value_name . ');'
);
C<Moose::Meta::Method::Constructor> is a subclass of
L<Moose::Meta::Method> I<and> L<Class::MOP::Method::Constructor>.
-=head1 METHODS
-
-=over 4
-
-=item B<< $metamethod->can_be_inlined >>
-
-This returns true if the method can inlined.
-
-First, it looks at all of the parents of the associated class. If any
-of them have an inlined constructor, then the constructor can be
-inlined.
-
-If none of them have been inlined, it checks to make sure that the
-pre-inlining constructor for the class matches the constructor from
-the expected class.
-
-By default, it expects this constructor come from L<Moose::Object>,
-but subclasses can change this expectation.
-
-If the constructor cannot be inlined it warns that this is the case.
+=head1 BUGS
-=back
+See L<Moose/BUGS> for details on reporting bugs.
=head1 AUTHORS
=head1 COPYRIGHT AND LICENSE
-Copyright 2006-2009 by Infinity Interactive, Inc.
+Copyright 2006-2010 by Infinity Interactive, Inc.
L<http://www.iinteractive.com>
projects / gitmo/Moose.git / blobdiff