use VarRef for derived bindings

[scpubgit/DKit.git] / lib / DX / Op / Prop.pm

diff --git a/lib/DX/Op/Prop.pm b/lib/DX/Op/Prop.pm
index bacdf7c..c2b494b 100644 (file)
--- a/lib/DX/Op/Prop.pm
+++ b/lib/DX/Op/Prop.pm
@@ -1,5 +1,6 @@
 package DX::Op::Prop;
 
+use DX::VarRef;
 use Moo;
 
 with 'DX::Role::Op';
@@ -14,10 +15,11 @@ sub run {
     $state, map +($_ => $self->$_), qw(of name value)
   );
   die "property name must be bound" unless $args{name}->is_bound;
-  my $name = $args{name}->bound_value;
+  my $name = $state->resolve_value($args{name});
   if ($args{of}->is_bound) {
     if ($args{value}->is_bound) {
-      if ($args{of}->bound_value->$name eq $args{value}->bound_value) {
+      if ($state->resolve_value($args{of})->$name
+          eq $state->resolve_value($args{value})) {
         return $state->add_dependencies(
                          $args{of}->id => $args{value}->id,
                          $args{value}->id => $args{of}->id,
@@ -26,11 +28,12 @@ sub run {
       }
       return $state->backtrack;
     }
-    my $value = $args{of}->bound_value;
+    my $value = $state->resolve_value($args{of});
     if ($value->can("has_${name}") and not $value->${\"has_${name}"}) {
       return $state->backtrack;
     }
-    return $state->bind_value($args{value}->id, $value->$name)
+    my $var_ref = DX::VarRef->new(var_id => $args{of}->id, derive => $name);
+    return $state->bind_value($args{value}->id, $var_ref)
                  ->add_dependencies($args{value}->id => $args{of}->id)
                  ->then($self->next);
   }