types and deparsing and recalculation part working

[scpubgit/DX.git] / lib / DX / Step / Normal.pm

diff --git a/lib/DX/Step/Normal.pm b/lib/DX/Step/Normal.pm
index 6a1e589..11890ca 100644 (file)
--- a/lib/DX/Step/Normal.pm
+++ b/lib/DX/Step/Normal.pm
@@ -1,12 +1,15 @@
 package DX::Step::Normal;
 
+use Types::Standard qw(ArrayRef);
 use DX::Class;
 
-has actions => (is => 'ro', required => 1);
+with 'DX::Role::Step';
 
-has depends_on => (is => 'ro', required => 1);
+has actions => (is => 'ro', isa => ArrayRef[Action], required => 1);
 
-has alternative_step => (is => 'ro');
+has depends_on => (is => 'ro', isa => DependencyGroupList, required => 1);
+
+has alternative_step => (is => 'ro', isa => Step);
 
 sub but_with_dependencies_on {
   my ($self, @deps) = @_;
@@ -20,6 +23,7 @@ sub but_with_alternative_step {
 
 sub apply_to {
   my ($self, $old_hyp) = @_;
+#::Dwarn($self->depends_on);
   return ($self->_apply_to_hyp($old_hyp), $self->alternative_step);
 }