tweak the initializer args, document set_initial_value

[gitmo/Class-MOP.git] / lib / Class / MOP / Immutable.pm

diff --git a/lib/Class/MOP/Immutable.pm b/lib/Class/MOP/Immutable.pm
index 3f4a4b0..aabb62b 100644 (file)
--- a/lib/Class/MOP/Immutable.pm
+++ b/lib/Class/MOP/Immutable.pm
@@ -9,7 +9,7 @@ use Class::MOP::Method::Constructor;
 use Carp         'confess';
 use Scalar::Util 'blessed';
 
-our $VERSION   = '0.02';
+our $VERSION   = '0.04';
 our $AUTHORITY = 'cpan:STEVAN';
 
 sub new {
@@ -69,13 +69,19 @@ my %DEFAULT_METHODS = (
 # existing metaclass to an immutable
 # version of itself
 sub make_metaclass_immutable {
-    my ($self, $metaclass, %options) = @_;
+    my ($self, $metaclass, $options) = @_;
+
+    foreach my $pair (
+            [ inline_accessors   => 1     ],
+            [ inline_constructor => 1     ],
+            [ inline_destructor  => 0     ],
+            [ constructor_name   => 'new' ],
+            [ debug              => 0     ],
+        ) {
+        $options->{$pair->[0]} = $pair->[1] unless exists $options->{$pair->[0]};
+    }
 
-    $options{inline_accessors}   = 1     unless exists $options{inline_accessors};
-    $options{inline_constructor} = 1     unless exists $options{inline_constructor};
-    $options{inline_destructor}  = 0     unless exists $options{inline_destructor};
-    $options{constructor_name}   = 'new' unless exists $options{constructor_name};
-    $options{debug}              = 0     unless exists $options{debug};
+    my %options = %$options;
 
     if ($options{inline_accessors}) {
         foreach my $attr_name ($metaclass->get_attribute_list) {
@@ -92,6 +98,7 @@ sub make_metaclass_immutable {
             $constructor_class->new(
                 options   => \%options,
                 metaclass => $metaclass,
+                is_inline => 1,
             )
         ) unless $metaclass->has_method($options{constructor_name});
     }
@@ -140,7 +147,9 @@ sub make_metaclass_immutable {
 }
 
 sub make_metaclass_mutable {
-    my ($self, $immutable, %options) = @_;
+    my ($self, $immutable, $options) = @_;
+
+    my %options = %$options;
 
     my $original_class = $immutable->get_mutable_metaclass_name;
     delete $immutable->{'___original_class'} ;
@@ -179,7 +188,6 @@ sub make_metaclass_mutable {
     # 14:26 <@stevan> the only user of ::Method::Constructor is immutable
     # 14:27 <@stevan> if someone uses it outside of immutable,.. they are either: mst or groditi
     # 14:27 <@stevan> so I am not worried
-    $options{constructor_name} = 'new' unless exists $options{constructor_name};
     if ($options{inline_constructor}) {
         my $constructor_class = $options{constructor_class} || 'Class::MOP::Method::Constructor';
         $immutable->remove_method( $options{constructor_name}  )
@@ -226,6 +234,8 @@ sub create_methods_for_immutable_metaclass {
 
     $methods{get_mutable_metaclass_name} = sub { (shift)->{'___original_class'} };
 
+    $methods{immutable_transformer} = sub { $self };
+
     return \%methods;
 }
 
@@ -329,7 +339,7 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006, 2007 by Infinity Interactive, Inc.
+Copyright 2006-2008 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>