1 files changed, 5 insertions, 136 deletions
diff --git a/src/config.rs b/src/config.rs
index 300408b..53b3cfe 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,14 +1,9 @@
 use regex::Regex;
-use std::num::ParseIntError;
 use std::process;
 
-use crate::choice::Choice;
+use crate::choice::ChoiceKind;
 use crate::opt::Opt;
 
-lazy_static! {
-    static ref PARSE_CHOICE_RE: Regex = Regex::new(r"^(-?\d*):(-?\d*)$").unwrap();
-}
-
 pub struct Config {
     pub opt: Opt,
     pub separator: Regex,
@@ -17,8 +12,10 @@ pub struct Config {
 
 impl Config {
     pub fn new(mut opt: Opt) -> Self {
-        if opt.exclusive {
-            for mut choice in &mut opt.choice {
+        for mut choice in &mut opt.choices {
+            if (opt.exclusive && choice.kind == ChoiceKind::ColonRange)
+                || choice.kind == ChoiceKind::RustExclusiveRange
+            {
                 if choice.is_reverse_range() {
                     choice.start = choice.start - 1;
                 } else {
@@ -68,132 +65,4 @@ impl Config {
             output_separator,
         }
     }
-
-    pub fn parse_choice(src: &str) -> Result<Choice, ParseIntError> {
-        let cap = match PARSE_CHOICE_RE.captures_iter(src).next() {
-            Some(v) => v,
-            None => match src.parse() {
-                Ok(x) => return Ok(Choice::new(x, x)),
-                Err(e) => {
-                    eprintln!("failed to parse choice argument: {}", src);
-                    return Err(e);
-                }
-            },
-        };
-
-        let start = if cap[1].is_empty() {
-            0
-        } else {
-            match cap[1].parse() {
-                Ok(x) => x,
-                Err(e) => {
-                    eprintln!("failed to parse range start: {}", &cap[1]);
-                    return Err(e);
-                }
-            }
-        };
-
-        let end = if cap[2].is_empty() {
-            isize::max_value()
-        } else {
-            match cap[2].parse() {
-                Ok(x) => x,
-                Err(e) => {
-                    eprintln!("failed to parse range end: {}", &cap[2]);
-                    return Err(e);
-                }
-            }
-        };
-
-        return Ok(Choice::new(start, end));
-    }
-
-    pub fn parse_output_field_separator(src: &str) -> String {
-        String::from(src)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    mod parse_choice_tests {
-        use super::*;
-
-        #[test]
-        fn parse_single_choice_start() {
-            let result = Config::parse_choice("6").unwrap();
-            assert_eq!(6, result.start)
-        }
-
-        #[test]
-        fn parse_single_choice_end() {
-            let result = Config::parse_choice("6").unwrap();
-            assert_eq!(6, result.end)
-        }
-
-        #[test]
-        fn parse_none_started_range() {
-            let result = Config::parse_choice(":5").unwrap();
-            assert_eq!((0, 5), (result.start, result.end))
-        }
-
-        #[test]
-        fn parse_none_terminated_range() {
-            let result = Config::parse_choice("5:").unwrap();
-            assert_eq!((5, isize::max_value()), (result.start, result.end))
-        }
-
-        #[test]
-        fn parse_full_range_pos_pos() {
-            let result = Config::parse_choice("5:7").unwrap();
-            assert_eq!((5, 7), (result.start, result.end))
-        }
-
-        #[test]
-        fn parse_full_range_neg_neg() {
-            let result = Config::parse_choice("-3:-1").unwrap();
-            assert_eq!((-3, -1), (result.start, result.end))
-        }
-
-        #[test]
-        fn parse_neg_started_none_ended() {
-            let result = Config::parse_choice("-3:").unwrap();
-            assert_eq!((-3, isize::max_value()), (result.start, result.end))
-        }
-
-        #[test]
-        fn parse_none_started_neg_ended() {
-            let result = Config::parse_choice(":-1").unwrap();
-            assert_eq!((0, -1), (result.start, result.end))
-        }
-
-        #[test]
-        fn parse_full_range_pos_neg() {
-            let result = Config::parse_choice("5:-3").unwrap();
-            assert_eq!((5, -3), (result.start, result.end))
-        }
-
-        #[test]
-        fn parse_full_range_neg_pos() {
-            let result = Config::parse_choice("-3:5").unwrap();
-            assert_eq!((-3, 5), (result.start, result.end))
-        }
-
-        #[test]
-        fn parse_beginning_to_end_range() {
-            let result = Config::parse_choice(":").unwrap();
-            assert_eq!((0, isize::max_value()), (result.start, result.end))
-        }
-
-        #[test]
-        fn parse_bad_choice() {
-            assert!(Config::parse_choice("d").is_err());
-        }
-
-        #[test]
-        fn parse_bad_range() {
-            assert!(Config::parse_choice("d:i").is_err());
-        }
-    }
 }