cut support

[scpubgit/DKit.git] / lib / DX / State.pm

diff --git a/lib/DX/State.pm b/lib/DX/State.pm
index 379b41f..83e8cc3 100644 (file)
--- a/lib/DX/State.pm
+++ b/lib/DX/State.pm
@@ -27,31 +27,38 @@ sub scope_var {
 }
 
 sub allocate_var {
-  my ($self, $name, $var) = @_;
-  my $id = join('_', $name, ++($self->id_gen->{$name}));
+  my ($self, $name, $var, $id_gen) = @_;
+  my $id = join('_', $name, ++($id_gen->{$name}||='000'));
   DX::Var->new(id => $id, %$var);
 }
 
-sub assign_vars {
+sub expand_vars {
   my ($self, %vars) = @_;
   my %by_id = %{$self->by_id};
-  my $state = $self->but(id_gen => { %{$self->id_gen} });
+  my %id_gen = %{$self->id_gen};
   foreach my $name (keys %vars) {
-warn "assign: ${name}";
     unless (blessed($vars{$name})) {
-      my $var = $vars{$name} = $state->allocate_var($name, $vars{$name});
+      my $var = $vars{$name} = $self->allocate_var(
+        $name, $vars{$name}, \%id_gen
+      );
       $by_id{$var->id} = $var;
     }
   }
+  $self->but(
+    by_id => \%by_id, id_gen => \%id_gen,
+  ), %vars;
+}
+
+sub assign_vars {
+  my ($self, %vars) = @_;
+  my ($state, %expanded) = $self->expand_vars(%vars);
   $state->but(
-    by_id => \%by_id,
-    scope => { %{$self->scope}, map +($_ => $vars{$_}->id), keys %vars }
+    scope => { %{$self->scope}, map +($_ => $expanded{$_}->id), keys %expanded }
   );
 }
 
 sub bind_var_then {
   my ($self, $var, $value, $then) = @_;
-  warn "Binding ".$var->id." to $value";
   my $bound = $var->with_value($value);
   $self->but(
     by_id => { %{$self->by_id}, $var->id => $bound },
@@ -61,7 +68,6 @@ sub bind_var_then {
 
 sub bind_stream_then {
   my ($self, $var, $stream, $then) = @_;
-  warn "Binding ".$var->id." to $stream";
   my $bound = $var->with_stream($stream);
   $self->but(
     by_id => { %{$self->by_id}, $var->id => $bound },
@@ -100,7 +106,6 @@ sub run {
     my ($return) = @_;
     local our $Nonlocal_Return = $return;
     while (my $op = $state->next_op) {
-#::Dwarn($op);
       $state = $op->run($state);
     }
     return $state;
@@ -120,13 +125,13 @@ sub pop_return_stack {
   my ($self) = @_;
   my @stack = @{$self->return_stack};
   my $top = pop @stack;
-  $self->but(return_stack => \@stack, next_op => $top);
+  $self->but(return_stack => \@stack, next_op => $top->[0]);
 }
 
 sub push_return_then {
   my ($self, $return, $then) = @_;
   $self->but(
-    return_stack => [ @{$self->return_stack}, $return ],
+    return_stack => [ @{$self->return_stack}, [ $return, $self ] ],
     next_op => $then
   );
 }