Fix FAQ on require+attributes

[gitmo/Moose.git] / lib / Class / MOP / Instance.pm

diff --git a/lib/Class/MOP/Instance.pm b/lib/Class/MOP/Instance.pm
index 499cc25..e0e8194 100644 (file)
--- a/lib/Class/MOP/Instance.pm
+++ b/lib/Class/MOP/Instance.pm
@@ -4,7 +4,7 @@ package Class::MOP::Instance;
 use strict;
 use warnings;
 
-use Scalar::Util 'weaken', 'blessed';
+use Scalar::Util 'isweak', 'weaken', 'blessed';
 
 use base 'Class::MOP::Object';
 
@@ -76,7 +76,22 @@ sub create_instance {
 
 sub clone_instance {
     my ($self, $instance) = @_;
-    bless { %$instance }, $self->_class_name;
+
+    my $clone = $self->create_instance;
+    for my $attr ($self->get_all_attributes) {
+        next unless $attr->has_value($instance);
+        for my $slot ($attr->slots) {
+            my $val = $self->get_slot_value($instance, $slot);
+            $self->set_slot_value($clone, $slot, $val);
+            $self->weaken_slot_value($clone, $slot)
+                if $self->slot_value_is_weak($instance, $slot);
+        }
+    }
+
+    $self->_set_mop_slot($clone, $self->_get_mop_slot($instance))
+        if $self->_has_mop_slot($instance);
+
+    return $clone;
 }
 
 # operations on meta instance
@@ -142,6 +157,11 @@ sub weaken_slot_value {
     weaken $instance->{$slot_name};
 }
 
+sub slot_value_is_weak {
+    my ($self, $instance, $slot_name) = @_;
+    isweak $instance->{$slot_name};
+}
+
 sub strengthen_slot_value {
     my ($self, $instance, $slot_name) = @_;
     $self->set_slot_value($instance, $slot_name, $self->get_slot_value($instance, $slot_name));
@@ -164,6 +184,11 @@ sub _get_mop_slot {
     $self->get_slot_value($instance, $RESERVED_MOP_SLOT);
 }
 
+sub _has_mop_slot {
+    my ($self, $instance) = @_;
+    $self->is_slot_initialized($instance, $RESERVED_MOP_SLOT);
+}
+
 sub _set_mop_slot {
     my ($self, $instance, $value) = @_;
     $self->set_slot_value($instance, $RESERVED_MOP_SLOT, $value);
@@ -360,6 +385,8 @@ that the object instance be passed to the method.
 
 =item B<< $metainstance->weaken_slot_value($instance_structure, $slot_name) >>
 
+=item B<< $metainstance->slot_value_is_weak($instance_structure, $slot_name) >>
+
 =item B<< $metainstance->strengthen_slot_value($instance_structure, $slot_name) >>
 
 =item B<< $metainstance->rebless_instance_structure($instance_structure, $new_metaclass) >>