[switch] fix -- processing;

partcl · Jul 3, 2010 · d6a32b8 · d6a32b8
1 parent 65f1889
commit d6a32b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Partcl/commands/main.pm b/src/Partcl/commands/main.pm
@@ -623,6 +623,7 @@ our sub switch(*@args) {
     if +@args < 3 {
         error('wrong # args: should be "switch ?switches? string pattern body ... ?default body?"');
     }
+
     my $regex := 0;
     my $glob := 0;
     my $nocase := 0;
@@ -632,6 +633,8 @@ our sub switch(*@args) {
         $glob := 1 if $opt eq '-glob';
         $nocase := 1 if $opt eq '-nocase';
     }
+    @args.shift if @args[0] eq '--';
+
     my $string := @args.shift();
     if +@args % 2 == 1 {
         error('extra switch pattern with no body');

diff --git a/t/cmd_switch.t b/t/cmd_switch.t
@@ -39,7 +39,7 @@ eval_is {
  set q 1
  switch -- -a -a {set q 2}
  set q
-} 2 {implied exact, --} {TODO NQPRX}
+} 2 {implied exact, --}
 
 eval_is {
  set q 1
@@ -49,7 +49,7 @@ eval_is {
    set q 3
  }
  set q
-} 3 {implied exact, --, two choices} {TODO NQPRX}
+} 3 {implied exact, --, two choices}
 
 eval_is {
   set q 1