1 files changed, 13 insertions, 7 deletions

diff --git a/lib/Getopt/Dakkar/Role/Command.pm b/lib/Getopt/Dakkar/Role/Command.pm
index 8fa491b..444a9a4 100644
--- a/lib/Getopt/Dakkar/Role/Command.pm
+++ b/lib/Getopt/Dakkar/Role/Command.pm
@@ -8,14 +8,15 @@ has options => ( is => 'ro', isa => ArrayRef, default => sub { [] } );
 has parameters => ( is => 'ro', isa => ArrayRef, default => sub { [] } );
 has subcommands => ( is => 'ro', isa => ArrayRef, default => sub { [] } );
 
-sub parse($self,$args=undef) {
-    my $stash = $self->_parse($args);
+sub parse($self,$args,$stash) {
+    my $stash = $self->_parse($args,$stash);
     if (my $op = $self->op) {
-        $stash->$op();
+        return $stash->$op();
     }
+    return $stash;
 }
 
-sub _parse($self,$args,$stash=undef) {
+sub _parse($self,$args,$stash) {
     my $argpack = Getopt::Dakkar::ArgPack->new({getopt=>$self});
     while ($args->@*) {
         my $this = $args->[0];
@@ -26,7 +27,7 @@ sub _parse($self,$args,$stash=undef) {
                 # ->parse will remove $this (or parts of
                 # it, if it's a bundle) and shift its own arguments
                 # out of $args
-                my $option = $match->parse($args,$self);
+                my $option = $match->parse($args,$stash);
                 $argpack->options->{$match->name} = $option;
             }
             else {
@@ -40,13 +41,13 @@ sub _parse($self,$args,$stash=undef) {
             $stash //= $self->_make_stash($argpack);
             my $op = $self->op;
             $stash->$op($argpack);
-            $match->_parse($args,$stash);
+            $match->parse($args,$stash);
         }
         else {
             shift $args->@* if $self->_is_terminator($this);
             for my $parameter ($self->parameters->@*) {
                 # ->parse will remove the argument(s) from $args
-                my $argument = $parameter->parse($args,$self);
+                my $argument = $parameter->parse($args,$stash);
                 $argpack->arguments->{$argument->name} = $argument;
             }
 
@@ -57,6 +58,7 @@ sub _parse($self,$args,$stash=undef) {
                     args => $args,
                 });
             }
+            # hmmm. what about 'ls foo -l' ?
         }
     }
     return $stash;
@@ -76,3 +78,7 @@ sub _match_subcommand($self,$arg) {
     }
     return undef;
 }
+
+sub match($self,$arg) {
+    return !! grep { $_ eq $arg } $self->matching_strings->@*;
+}