move ResolveProposition step over to rspace system

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

diff --git a/lib/DX/Types.pm b/lib/DX/Types.pm
index 8c2602a..3434bb2 100644 (file)
--- a/lib/DX/Types.pm
+++ b/lib/DX/Types.pm
@@ -7,12 +7,13 @@ use Type::Library
     (our @CLASSES = qw(
       Hypothesis Scope ResolvedPropositionSet Proposition DependencyMap
       PropositionSequence QueryState ShellState ShellSession SearchState
+      ResolutionSpace ResolutionStrategy Resolution
     )),
     (our @ROLES = qw(
       Step Action ActionPolicy Predicate Value
     )),
     qw(
-      DependencyType _DependencyTree DependecySpec
+      DependencyType _DependencyTree DependencySpec
       One DependencyGroupEntry DependencyGroup
     ),
   )
@@ -33,7 +34,9 @@ foreach my $role (our @ROLES) {
 
 class_type DictValue => { class => 'DX::Value::Dict' };
 
-declare AlternativeList => as ArrayRef[Tuple[Step, Hypothesis]];
+declare PropositionList => as ArrayRef[Proposition];
+
+declare AdjustmentList => as ArrayRef[Tuple[Step, SearchState]];
 
 declare DependencyType => where {
   foreach my $cand (EXISTENCE_OF, TYPE_OF, INDICES_OF, CONTENTS_OF) {
@@ -53,6 +56,8 @@ declare _DependencyTree => where { is_DependencyTree($_) };
 
 declare DependencySpec => as Tuple[DependencyType, slurpy ArrayRef[Str]];
 
+declare DependencyList => as ArrayRef[DependencySpec];
+
 declare One => where { !ref($_) and $_ eq 1 };
 
 declare DependencyTree => # [ \%subtree, \%existence_of, ... ]