Fix wrong parsing of arguments after PFX in Args.

shinjitumala · shinjitumala · commit ad30cad24c66 · 2024-06-20T06:23:50.000+09:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fpr-cli"
-version = "0.1.5"
+version = "0.1.6"
 authors = ["Shinji Hoshino <funny.pig.run@gmail.com>"]
 description = "A library that allows one to write cli tools quickly."
 edition = "2021"
diff --git a/src/lib.rs b/src/lib.rs
@@ -146,6 +146,7 @@ pub trait Args<C>: Run<C> + Sized {
             .keys
             .iter()
             .filter(|k| !k.used)
+            .filter(|k| args.args[k.i] != PFX)
             .map(|k| args.args[k.i].to_owned())
             .collect::<Vec<_>>();
         if !u.is_empty() {
diff --git a/src/parse.rs b/src/parse.rs
@@ -190,6 +190,8 @@ impl<'b> ParsedArgs<'b> {
         let idx = k.i + 1;
         Some(if i == self.keys.len() - 1 {
             &self.args[idx..]
+        } else if self.args[self.keys[i + 1].i] == PFX {
+            &self.args[self.keys[i + 1].i + 1..]
         } else {
             &self.args[idx..self.keys[i + 1].i]
         })
@@ -209,12 +211,12 @@ impl<'b> ParsedArgs<'b> {
                 .enumerate()
                 .filter(|&(_, a)| {
                     if end {
-                        true
+                        false
                     } else {
                         let pfx = a.starts_with(PFX);
                         if pfx && a.len() == PFX.len() {
                             end = true;
-                            false
+                            true
                         } else {
                             pfx
                         }
