2 files changed, 91 insertions, 13 deletions

diff --git a/src/format/mod.rs b/src/format/mod.rs
index 4ac5612..baae301 100644
--- a/src/format/mod.rs
+++ b/src/format/mod.rs
@@ -35,7 +35,7 @@ fn radix_fmt(number: f64, obase: usize) -> Result<String, CalcError> {
     let table: Vec<char> = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ".chars().collect();
 
     // format integral part of float
-    let mut integral = number.trunc() as i64;
+    let mut integral = number.abs().trunc() as i64;
     let mut obase_int = String::new();
     while integral >= obase as i64 {
         obase_int.push(table[(integral % obase as i64) as usize]);
@@ -55,7 +55,7 @@ fn radix_fmt(number: f64, obase: usize) -> Result<String, CalcError> {
         fract *= obase as f64;
         obase_fract.push(table[fract.trunc() as usize]);
         i += 1;
-        if fract.fract() == 0. || i > 10 {
+        if fract.fract() == 0. || i >= CONFIGURATION.fix {
             break;
         }
         fract = fract.fract();
diff --git a/src/main.rs b/src/main.rs
index ddfa75b..d6883d5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,6 +6,7 @@
 
 // std
 use std::f64;
+use std::borrow::Cow::{self, Borrowed, Owned};
 
 // modules
 mod lex;
@@ -19,11 +20,81 @@ use crate::format::*;
 
 // extern crates
 use rustyline::error::ReadlineError;
-use rustyline::Editor;
-use rustyline::config::{ Builder, ColorMode, EditMode };
+use rustyline::{ Editor, Context, Helper };
+use rustyline::config::{ Builder, ColorMode, EditMode, CompletionType };
+use rustyline::hint::Hinter;
+use rustyline::completion::{ FilenameCompleter, Completer, Pair };
+use rustyline::highlight::{ Highlighter, MatchingBracketHighlighter };
+
 use clap::{Arg, App};
 use lazy_static::lazy_static;
 
+
+struct RLHelper {
+    completer: FilenameCompleter,
+    highlighter: LineHighlighter,
+    hinter: AnswerHinter,
+}
+
+struct AnswerHinter { }
+impl Hinter for AnswerHinter {
+    fn hint(&self, line: &str, _: usize, _: &Context) -> Option<String> {
+        let input = line.trim();
+        let input = input.replace(" ", "");
+        if input.len() == 0 {
+            return Some("".into())
+        }
+        let dry_run = eval_math_expression(&input);
+        match dry_run {
+            Ok(ans) =>  return Some(format!(" = {}", ans)),
+            Err(_) => return Some(format!(""))
+        };
+    }
+}
+
+struct LineHighlighter { }
+impl Highlighter for LineHighlighter {
+    fn highlight_hint<'h>(&self, hint: &'h str) -> Cow<'h, str> {
+        Owned(format!("\x1b[90m{}\x1b[0m", hint))
+    }
+    fn highlight<'l>(&self, line: &'l str, _: usize) -> Cow<'l, str> {
+        let op = eval_math_expression(line);
+        match op {
+            Ok(_) => Owned(line.into()),
+            Err(_) => Owned(format!("\x1b[31m{}\x1b[0m", line))
+        }
+    }
+}
+
+impl Highlighter for RLHelper { 
+    fn highlight_hint<'h>(&self, hint: &'h str) -> Cow<'h, str> {
+        self.highlighter.highlight_hint(hint)
+    }
+    fn highlight<'l>(&self, line: &'l str, pos: usize) -> Cow<'l, str> {
+        self.highlighter.highlight(line, pos)
+    }
+}
+
+impl Completer for RLHelper {
+    type Candidate = Pair;
+    fn complete(
+        &self,
+        line: &str,
+        pos: usize,
+        ctx: &Context<'_>,
+        ) -> Result<(usize, Vec<Pair>), ReadlineError> {
+        self.completer.complete(line, pos, ctx)
+    }
+}
+ 
+impl Hinter for RLHelper {
+    fn hint(&self, line: &str, a: usize, b: &Context) -> Option<String> {
+        self.hinter.hint(line, a, b)
+    }
+}
+
+impl Helper for RLHelper {}
+
 struct Configuration {
     radian_mode: bool,
     fix: usize,
@@ -50,12 +121,19 @@ fn main() {
         let config = config_builder.color_mode(ColorMode::Enabled)
             .edit_mode(EditMode::Emacs)
             .history_ignore_space(true)
+            .completion_type(CompletionType::Circular)
             .max_history_size(1000)
             .build();
-        let mut rl = Editor::<()>::with_config(config);
+        let mut rl = Editor::with_config(config);
+        let h = RLHelper {
+            completer: FilenameCompleter::new(),
+            highlighter: LineHighlighter {},
+            hinter: AnswerHinter {}
+        };
+        rl.set_helper(Some(h));
         if rl.load_history("history.txt").is_err() {
-            println!("No previous history.");
-        }
+            println!("No previous history.")
+        };
 
         loop {
             let readline = rl.readline("> ");
@@ -102,7 +180,7 @@ fn parse_arguments() -> Configuration {
              .long("base")
              .takes_value(true)
              .value_name("RADIX")
-             .help("set the radix of calculation output (2, 8, 10, 16 etc.)"))
+             .help("set the radix of calculation output (1 - 36)"))
         .arg(Arg::with_name("INPUT")
              .help("optional expression string to run eva in command mode")
              .index(1))
@@ -122,11 +200,11 @@ fn parse_arguments() -> Configuration {
             .unwrap_or("10")
             .parse()
             .unwrap(),
-        base: config.value_of("base")
-            .unwrap_or("10")
-            .parse()
-            .unwrap(),
-        input,
+            base: config.value_of("base")
+                .unwrap_or("10")
+                .parse()
+                .unwrap(),
+                input,
     }
 }