Remove p6 style attribute naming

[gitmo/Class-MOP.git] / lib / Class / MOP / Method / Constructor.pm

diff --git a/lib/Class/MOP/Method/Constructor.pm b/lib/Class/MOP/Method/Constructor.pm
index a05ebac..6f9d221 100644 (file)
--- a/lib/Class/MOP/Method/Constructor.pm
+++ b/lib/Class/MOP/Method/Constructor.pm
@@ -7,7 +7,7 @@ use warnings;
 use Carp         'confess';
 use Scalar::Util 'blessed', 'weaken', 'looks_like_number';
 
-our $VERSION   = '0.02';
+our $VERSION   = '0.65';
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Class::MOP::Method::Generated';
@@ -20,19 +20,24 @@ sub new {
         || 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 = bless {
         # from our superclass
-        '&!body'          => undef,
+        '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),
+        '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
     # needed
-    weaken($self->{'$!associated_metaclass'});
+    weaken($self->{'associated_metaclass'});
 
     $self->initialize_body;
 
@@ -41,19 +46,19 @@ sub new {
 
 ## accessors
 
-sub options              { (shift)->{'%!options'}              }
-sub associated_metaclass { (shift)->{'$!associated_metaclass'} }
+sub options              { (shift)->{'options'}              }
+sub associated_metaclass { (shift)->{'associated_metaclass'} }
 
 ## cached values ...
 
 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 {
     my $self = shift;
-    $self->{'@!attributes'} ||= [ $self->associated_metaclass->compute_all_applicable_attributes ]
+    $self->{'attributes'} ||= [ $self->associated_metaclass->compute_all_applicable_attributes ]
 }
 
 ## method
@@ -64,11 +69,11 @@ sub initialize_body {
 
     $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(@_) }
+    return sub { Class::MOP::Class->initialize(shift)->new_object(@_) }
 }
 
 sub generate_constructor_method_inline {
@@ -77,7 +82,7 @@ sub generate_constructor_method_inline {
     my $source = 'sub {';
     $source .= "\n" . 'my ($class, %params) = @_;';
 
-    $source .= "\n" . 'return $class->meta->new_object(%params)';
+    $source .= "\n" . 'return Class::MOP::Class->initialize($class)->new_object(%params)';
     $source .= "\n" . '    if $class ne \'' . $self->associated_metaclass->name . '\';';
 
     $source .= "\n" . 'my $instance = ' . $self->meta_instance->inline_create_instance('$class');
@@ -129,23 +134,32 @@ sub _generate_slot_initializer {
         $default = '$instance->'.$attr->builder;
     }
 
-  '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" .
-   '}');
+    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;
 
-1;
-
 __END__
 
 =pod
@@ -171,7 +185,8 @@ Class::MOP::Method::Constructor - Method Meta Object for constructors
 =head1 DESCRIPTION
 
 This is a subclass of C<Class::MOP::Method> which deals with
-class constructors.
+class constructors. This is used when making a class immutable
+to generate an optimized constructor.
 
 =head1 METHODS
 
@@ -208,7 +223,7 @@ This creates the code reference for the constructor itself.
 
 =back
 
-=head2 Method Generators
+=head2 Method Generators 
 
 =over 4