From 92742afc7724fd502d65f8056f245c2401d3ce07 Mon Sep 17 00:00:00 2001 From: Joel Klinghed Date: Wed, 24 Apr 2024 21:37:17 +0200 Subject: Detect arg parser to use Switch Parser trait to an object safe trait so guess_parser can return an boxed instance. --- src/main.rs | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index 347e144..4cfbcc7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,8 +1,18 @@ mod args; -use crate::args::Parser; use std::process::ExitCode; +fn guess_parser(args: &mut dyn Iterator) -> Box { + for arg in args { + if arg.len() > 2 && arg.starts_with("--") { + // --C.. can only be ShortAndLong + return Box::new(args::ShortAndLongParser::new()); + } + } + // TODO: Can we make more guesses? + Box::new(args::LongOnlyParser::new()) +} + fn parse_args() -> Result { let mut options = args::Options::new(); let help_idx = options.push( @@ -28,32 +38,25 @@ fn parse_args() -> Result { .build() .unwrap(), ); - let test_idx = options.push( - args::OptionBuilder::default() - .short('t') - .long("test") - .description("testing") - .value(args::ValueRequirement::Required("FILE")) - .build() - .unwrap(), - ); - let parser = args::ShortAndLongParser::new(); - let args = parser.run(&mut options, std::env::args())?; + let parser = guess_parser(&mut std::env::args()); + let maybe_args = parser.run(&mut options, &mut std::env::args()); + + // help is special, check for it even if parser#run returned error. let ref help = options[help_idx]; if help.is_set() { parser.print_help(&options); return Ok(true); } + + let args = maybe_args?; let ref version = options[version_idx]; if version.is_set() { println!("Version is 0.0.1"); return Ok(true); } let ref verbose = options[verbose_idx]; - let ref test = options[test_idx]; println!("verbose: {}", verbose.is_set()); - println!("test: {:?}", test.value()); println!("args: {:?}", args.args); Ok(false) } -- cgit v1.2.3-70-g09d2