Merge pull request #11 from kzoper/master

aligned outputs, separate thousands

2 files changed, 32 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index 97909ca..e4e93e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ Cargo.lock
 
 # ignore history used by rustyline
 history.txt
+./.idea
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
index 5219c6d..4f5b4fa 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -49,7 +49,7 @@ fn main() {
     if CONFIGURATION.input.len() > 0 {
         let evaled = eval_math_expression(&CONFIGURATION.input[..]);
         match evaled {
-            Ok(ans) => println!("{:.*}", CONFIGURATION.fix, ans),
+            Ok(ans) => pprint(ans),
             Err(e) => {
                 eprintln!("{}", handler(e));
                 std::process::exit(1);
@@ -74,7 +74,7 @@ fn main() {
                     rl.add_history_entry(line.as_ref());
                     let evaled = eval_math_expression(&line[..]);
                     match evaled {
-                        Ok(ans) => println!("{:.*}", CONFIGURATION.fix, ans),
+                        Ok(ans) => pprint(ans),
                         Err(e) => println!("{}", handler(e)),
                     };
                 },
@@ -96,6 +96,33 @@ fn main() {
     }
 }
 
+fn pprint(ans: f64) {
+    let ans_string = format!("{}",ans);
+
+    let ans_vector: Vec<&str> = ans_string.split(".").collect();
+    match ans_vector.len() {
+        1 => println!("{}",thousand_sep(ans_vector[0])),
+        2 => println!("{}.{}",thousand_sep(ans_vector[0]),ans_vector[1]),
+        _ => ()
+    }
+}
+
+fn thousand_sep(inp:&str) -> String{
+    let mut result_string = String::new();
+    for (i,c) in inp.to_string().chars().rev().enumerate(){
+        if i % 3 == 0 && i != 0 && c.to_string() != "-"{
+            result_string.push_str(",");
+        }
+        result_string.push(c)
+    }
+    let arrange:i16 = CONFIGURATION.fix as i16 - result_string.len() as i16;
+
+    if arrange > 0 {
+        result_string.push_str(" ".repeat(arrange as usize).as_str())
+    }
+    result_string.chars().rev().collect::<String>()
+}
+
 fn parse_arguments() -> Configuration {
     let config = App::new(env!("CARGO_PKG_NAME"))
         .version(env!("CARGO_PKG_VERSION"))
@@ -119,7 +146,7 @@ fn parse_arguments() -> Configuration {
     let mut input = String::new();
     if let Some(i) = config.value_of("INPUT") {
         input.push_str(i);
-    }; 
+    };
     Configuration {
         radian_mode: config.is_present("radian"),
         fix: config.value_of("fix")
@@ -166,7 +193,7 @@ fn eval_math_expression(input: &str) -> Result<f64, CalcError> {
     Ok(evaled)
 }
 
-#[cfg(test)] 
+#[cfg(test)]
 mod tests {
     use super::*;