format aperture in backtrack trace

[scpubgit/DX.git] / lib / DX / ResolutionSpace.pm

diff --git a/lib/DX/ResolutionSpace.pm b/lib/DX/ResolutionSpace.pm
index 8342640..a3e82b5 100644 (file)
--- a/lib/DX/ResolutionSpace.pm
+++ b/lib/DX/ResolutionSpace.pm
@@ -2,21 +2,41 @@ package DX::ResolutionSpace;
 
 use DX::Step::Backtrack;
 use DX::Step::ResolveProposition;
+use DX::Utils qw(compact_deps);
 use DX::Class;
 
-has proposition => (is => 'ro');
+has proposition => (is => 'ro', isa => Proposition);
 
-has geometry_depends_on => (is => 'ro', required => 1);
+has geometry_depends_on => (is => 'ro', required => 1, isa => DependencyList);
 
-has aperture => (is => 'ro', required => 1);
+has aperture => (is => 'ro', required => 1, isa => ApertureList);
 
-has members => (is => 'ro', required => 1);
+has members => (
+  is => 'ro', required => 1, isa => ArrayRef[ResolutionStrategy|Resolution]
+);
 
 sub for_deparse {
   my ($self) = @_;
   [ statement => [
-    [ symbol => 'rspace' ],
-    [ block => $self->members ],
+    [ symbol => 'resolution_space' ],
+    [ pairs => [
+      [ proposition => $self->proposition ],
+      [ geometry_depends_on => [ block => [
+        map [ statement => [
+          [ symbol => (split '::', ${$_->[0]})[-1] ],
+          [ value_path => [ @{$_}[1..$#$_] ] ],
+        ] ], @{$self->geometry_depends_on}
+      ] ] ],
+      (@{$self->aperture}
+        ? [ aperture => [ block => [
+            map [ statement => [
+              [ symbol => (split '::', ${$_->[0]})[-1] ],
+              [ value_path => [ @{$_}[1..$#$_] ] ],
+            ] ], @{$self->aperture}
+          ] ] ]
+        : ()),
+      [ members => [ block => [ @{$self->members} ] ] ]
+    ] ],
   ] ];
 }
 
@@ -34,8 +54,14 @@ sub remaining_resolution_space {
 
 sub next_step {
   my ($self) = @_;
-  return DX::Step::Backtrack->new unless @{$self->members};
-  return DX::Step::ResolveProposition->new(resolution_space => $self);
+  my $step_type = (@{$self->members} ? 'ResolveProposition' : 'Backtrack');
+  return "DX::Step::${step_type}"->new(resolution_space => $self);
+}
+
+sub with_geometry_dependencies {
+  my ($self, $deps) = @_;
+  my $new_deps = compact_deps([ @{$self->geometry_depends_on}, @$deps ]);
+  return $self->but(geometry_depends_on => $new_deps);
 }
 
 1;