TODO.md

@@ -14,7 +14,6 @@
  - Tuple operations
  - we don't need vectors as arguments to operators
  - Assignment tests
- - Color check is too slow
 
 ## Parser
  - Better error when `sin = 2`

src/context.rs

@@ -19,7 +19,7 @@ pub struct Config {
 	// with prettier unicode alternatives?
 	//
 	// Automatically disabled if enable_unicode is off.
-	pub enable_substituion: bool,
+	//pub enable_substituion: bool,
 
 	// Should we print simple powers
 	// as unicode superscript chars?
@@ -38,7 +38,7 @@ impl Config {
 	pub fn new() -> Config {
 		Config{
 			term_color_type: 2,
-			enable_substituion: true,
+			//enable_substituion: true,
 			//enable_unicode: true,
 			enable_super_powers: true,
 			enable_one_over_power: true

src/entrypoint/unix/promptbuffer.rs

@@ -1,12 +1,11 @@
 use std::collections::VecDeque;
 use std::io::Write;
 use termion::raw::RawTerminal;
-use crate::formattedtext;
+use termion::color;
+use termion::style;
 use crate::parser::substitute_cursor;
 use crate::context::Context;
 
-const PROMPT_STR: &str = "==> ";
-
 #[derive(Debug)]
 pub struct PromptBuffer {
 	// History
@@ -39,11 +38,30 @@ impl PromptBuffer {
 
 	// Same as write_primpt, but pretends there is no cursor
 	pub fn write_prompt_nocursor(&mut self, context: &Context, stdout: &mut RawTerminal<std::io::Stdout>) -> Result<(), std::io::Error> {
-		let tmp = self.cursor;
+		// Draw prettyprinted expression
-		self.cursor = 0;
+		let (_, s) = substitute_cursor(context, &self.get_contents(), self.buffer.chars().count());
-		let r = self.write_prompt(context, stdout);
+
-		self.cursor = tmp;
+		write!(
-		return r;
+			stdout, "\r{}{}==>{}{} {}",
+			style::Bold,
+			color::Fg(color::Blue),
+			color::Fg(color::Reset),
+			style::Reset,
+			s
+		)?;
+
+		// If this string is shorter, clear the remaining old one.
+		if s.chars().count() < self.last_print_len {
+			write!(
+				stdout, "{}{}",
+				" ".repeat(self.last_print_len - s.chars().count()),
+				termion::cursor::Left((self.last_print_len - s.chars().count()) as u16)
+			)?;
+		}
+
+		self.last_print_len = s.chars().count();
+		stdout.flush()?;
+		return Ok(());
 	}
 
 	pub fn write_prompt(&mut self, context: &Context, stdout: &mut RawTerminal<std::io::Stdout>) -> Result<(), std::io::Error> {
@@ -51,30 +69,38 @@ impl PromptBuffer {
 		let i = if l == 0 {0} else {l - self.cursor};
 
 		// Draw prettyprinted expression
-		let (display_c, s) = substitute_cursor(context, &self.get_contents(), i);
+		let (display_cursor, s) = substitute_cursor(context, &self.get_contents(), i);
 
 		write!(
-			stdout, "\r{}{PROMPT_STR}{}{}",
+			stdout, "\r{}{}==>{}{} {}",
-			formattedtext::format_map('p', context).unwrap(),
+			style::Bold,
-			formattedtext::format_map('n', context).unwrap(),
+			color::Fg(color::Blue),
+			color::Fg(color::Reset),
+			style::Reset,
 			s
 		)?;
 
 		// If this string is shorter, clear the remaining old one.
 		if s.chars().count() < self.last_print_len {
 			write!(
-				stdout, "{}",
+				stdout, "{}{}",
 				" ".repeat(self.last_print_len - s.chars().count()),
+				termion::cursor::Left((self.last_print_len - s.chars().count()) as u16)
 			)?;
 		}
 
+
+		// Move cursor to correct position
+		if display_cursor != 0 {
 			write!(
-			stdout, "\r{}",
+				stdout, "{}",
-			termion::cursor::Right((display_c + PROMPT_STR.chars().count()) as u16)
+				termion::cursor::Left(display_cursor as u16)
 			)?;
+			stdout.flush()?;
+		}
+		self.last_print_len = s.chars().count();
 
 		stdout.flush()?;
-		self.last_print_len = s.chars().count();
 
 		return Ok(());
 	}

src/entrypoint/unix/unix.rs

@@ -23,11 +23,11 @@ pub fn main() -> Result<(), std::io::Error> {
 	// Set color compatibilty
 	let term_colors = stdout.available_colors().unwrap_or(0);
 	if term_colors >= 256 {
-		context.config.term_color_type = 2;
+		context.config.term_color_type = 2
 	} else if term_colors >= 8 {
-		context.config.term_color_type = 1;
+		context.config.term_color_type = 1
 	} else {
-		context.config.term_color_type = 0;
+		context.config.term_color_type = 0
 	}
 
 	context.config.check();

src/evaluate/operator.rs

@@ -75,26 +75,12 @@ pub fn eval_operator(context: &mut Context, g: &Expression) -> Result<Option<Exp
 			if let Expression::Quantity(la, a) = a {
 				if let Expression::Quantity(lb, b) = b {
 					if !a.unit.compatible_with(&b.unit) {
-						let a = a.convert_to_base().unit;
-						let b = b.convert_to_base().unit;
-
-						let a_s: String;
-						let b_s: String;
-						if a.unitless() {
-							a_s = String::from("scalar");
-						} else {
-							a_s = a.display(context);
-						}
-
-						if b.unitless() {
-							b_s = String::from("scalar");
-						} else {
-							b_s = b.display(context);
-						}
-
 						return Err((
 							*la + *lb + *op_loc,
-							DaisyError::IncompatibleUnits(a_s, b_s)
+							DaisyError::IncompatibleUnits(
+								a.convert_to_base().unit.display(context),
+								b.convert_to_base().unit.display(context)
+							)
 						));
 					}
 					return Ok(Some(Expression::Quantity(*la + *lb + *op_loc, a.clone() + b.clone())));
@@ -112,24 +98,12 @@ pub fn eval_operator(context: &mut Context, g: &Expression) -> Result<Option<Exp
 			if let Expression::Quantity(la, a) = a {
 				if let Expression::Quantity(lb, b) = b {
 					if !a.unit.compatible_with(&b.unit) {
-
-						let a_s: String;
-						let b_s: String;
-						if a.unitless() {
-							a_s = String::from("scalar");
-						} else {
-							a_s = a.display(context);
-						}
-
-						if b.unitless() {
-							b_s = String::from("scalar");
-						} else {
-							b_s = b.display(context);
-						}
-
 						return Err((
 							*la + *lb + *op_loc,
-							DaisyError::IncompatibleUnits(a_s, b_s)
+							DaisyError::IncompatibleUnits(
+								a.convert_to_base().unit.display(context),
+								b.convert_to_base().unit.display(context)
+							)
 						));
 					}
 					return Ok(Some(Expression::Quantity(*la + *lb + *op_loc, a.clone() - b.clone())));
@@ -207,26 +181,12 @@ pub fn eval_operator(context: &mut Context, g: &Expression) -> Result<Option<Exp
 				if let Expression::Quantity(lb, vb) = b {
 					let n = va.clone().convert_to(vb.clone());
 					if n.is_none() {
-						let va = va.convert_to_base().unit;
-						let vb = vb.convert_to_base().unit;
-
-						let a_s: String;
-						let b_s: String;
-						if va.unitless() {
-							a_s = String::from("scalar");
-						} else {
-							a_s = a.display(context);
-						}
-
-						if vb.unitless() {
-							b_s = String::from("scalar");
-						} else {
-							b_s = b.display(context);
-						}
-
 						return Err((
 							*la + *lb + *op_loc,
-							DaisyError::IncompatibleUnits(a_s, b_s)
+							DaisyError::IncompatibleUnits(
+								va.convert_to_base().unit.display(context),
+								vb.convert_to_base().unit.display(context)
+							)
 						));
 					}
 					return Ok(Some(Expression::Quantity(*la + *lb + *op_loc, n.unwrap())));

src/formattedtext.rs

@@ -22,8 +22,7 @@ impl ToString for FormattedText {
 fn format_map_none(c: char) -> Option<String> {
 	Some(match c {
 		'n'|'i'|'t'|'a'|
-		'e'|'c'|'s'|'r'|
+		'e'|'c'|'s'|'r'
-		'p'
 		=> { "".to_string() },
 		_ => { return None }
 	})
@@ -38,27 +37,24 @@ fn format_map_ansi(c: char) -> Option<String> {
 		'i' => { // Normal italic text
 			format!("{}{}", color::Fg(color::Reset), color::Bg(color::Reset))
 		},
-		't' => { // Title text (should be cyan)
+		't' => { // Title text
 			format!("{}{}", color::Fg(color::AnsiValue(6)), color::Bg(color::Reset))
 		},
-		'a' => { // Colored text (should be pink)
+		'a' => { // Colored text
 			format!("{}{}", color::Fg(color::AnsiValue(5)), color::Bg(color::Reset))
 		},
-		'e' => { // Error titles (should be red)
+		'e' => { // Error titles
 			format!("{}{}", color::Fg(color::AnsiValue(1)), color::Bg(color::Reset))
 		},
-		'c' => { // Console text (inverted black on white)
+		'c' => { // Console text
 			format!("{}{}", color::Fg(color::AnsiValue(0)), color::Bg(color::AnsiValue(7)))
 		},
-		'p' => { // Input prompt (how ==> is styled) (should be blue)
+		's' => { // Repeat prompt (how => is styled)
-			format!("{}{}", color::Fg(color::AnsiValue(4)), color::Bg(color::Reset))
-		},
-		's' => { // Repeat prompt (how => is styled) (should be pink)
-			format!("{}{}", color::Fg(color::AnsiValue(5)), color::Bg(color::Reset))
-		},
-		'r' => { // Result prompt (how = is styled) (should be green)
 			format!("{}{}", color::Fg(color::AnsiValue(2)), color::Bg(color::Reset))
 		},
+		'r' => { // Result prompt (how = is styled)
+			format!("{}{}", color::Fg(color::AnsiValue(4)), color::Bg(color::Reset))
+		},
 
 		_ => { return None }
 	})
@@ -87,9 +83,6 @@ fn format_map_full(c: char) -> Option<String> {
 		'c' => { // Console text
 			format!("{}{}", color::Fg(color::LightBlack), style::Italic)
 		},
-		'p' => { // Input prompt (how ==> is styled)
-			format!("{}{}", color::Fg(color::Blue), style::Bold)
-		},
 		's' => { // Repeat prompt (how => is styled)
 			format!("{}{}", color::Fg(color::Magenta), style::Bold)
 		},
@@ -97,24 +90,17 @@ fn format_map_full(c: char) -> Option<String> {
 			format!("{}{}", color::Fg(color::Green), style::Bold)
 		},
 
-
 		_ => { return None }
 	})
 }
 
-pub fn format_map(c: char, context: &Context) -> Option<String> {
-	match context.config.term_color_type {
-		0 => format_map_none(c),
-		1 => format_map_ansi(c),
-		2 => format_map_full(c),
-		_ => unreachable!("Invalid term_color_type")
-	}
-}
-
 
 impl FormattedText {
 	pub fn newline(stdout: &mut RawTerminal<std::io::Stdout>) -> Result<(), std::io::Error> {
-		write!(stdout, "\n")?;
+		write!(
+			stdout,
+			"\r\n",
+		)?;
 		return Ok(());
 	}
 }
@@ -161,7 +147,12 @@ impl FormattedText {
 					match (a, b) {
 						(c, ']') => { // Normal text
 
-							let q = format_map(c, context);
+							let q = match context.config.term_color_type {
+								0 => format_map_none(c),
+								1 => format_map_ansi(c),
+								2 => format_map_full(c),
+								_ => unreachable!("Invalid term_color_type")
+							};
 
 							if q.is_some() {
 								s.push_str(&q.unwrap());
@@ -184,7 +175,7 @@ impl FormattedText {
 			}
 		}
 
-		write!(stdout, "\r{}", s)?;
+		write!(stdout, "{}", s)?;
 		return Ok(());
 	}
 }

src/parser/mod.rs

@@ -21,10 +21,8 @@ pub fn parse(
 	context: &Context, s: &String
 ) -> Result<Expression, (LineLocation, DaisyError)> {
 
-	let mut expressions = stage::tokenize(context, s);
+	let expressions = stage::tokenize(context, s);
-	if context.config.enable_substituion {
+	let (_, expressions) = stage::find_subs(expressions);
-		(_, expressions) = stage::find_subs(expressions);
-	}
 	let g = stage::groupify(context, expressions)?;
 	let g = stage::treeify(context, g)?;
 
@@ -36,7 +34,6 @@ pub fn parse_no_context(s: &String) -> Result<Expression, (LineLocation, DaisyEr
 }
 
 pub fn substitute(context: &Context, s: &String) -> String {
-	if !context.config.enable_substituion { return s.clone(); }
 	let (_, s) = substitute_cursor(context, s, s.chars().count());
 	return s;
 }
@@ -46,45 +43,34 @@ pub fn substitute_cursor(
 	s: &String, // The string to substitute
 	c: usize    // Location of the cursor right now
 ) -> (
-	usize,  // New cursor
+	usize,  // Location of cursor in substituted string
 	String  // String with substitutions
 ) {
-
-	if !context.config.enable_substituion { return (c, s.clone()); }
 	if s == "" { return (c, s.clone()) }
-	
-	
 	let mut new_s = s.clone();
 
+	let l = s.chars().count();
 	let expressions = stage::tokenize(context, s);
 	let (mut subs, _) = stage::find_subs(expressions);
-	let mut new_c = c.clone();
+	let mut new_c = l - c;
 
 	while subs.len() > 0 {
-		// Apply substitutions in reverse order
-		// r is the current substitution: (linelocation, string)
 		let r = subs.pop_back().unwrap();
+		// Apply substitutions in reverse order
 
 		if { // Don't substitute if our cursor is inside the substitution
 			c >= r.0.pos &&
 			c < r.0.pos+r.0.len
 		} { continue; }
 
-		// If this substitution is before our cursor,
+		if c < r.0.pos {
-		// we need to adjust our cursor's position.
+			let ct = r.1.chars().count();
-		if c > r.0.pos {
+			if ct >= r.0.len {
-			let c_o = r.0.len; // Old length 
+				if new_c >= ct - r.0.len {
-			let c_n = r.1.chars().count(); // New length
+					new_c += ct - r.0.len
-
+				}
-			if c_n > c_o {
+			} else {
-				// Move cursor right by difference
+				new_c -= r.0.len - ct
-				new_c += c_n - c_o;
-
-			} else if c_n < c_o {
-				// Move cursor left by difference
-				if new_c >= c_o - c_n {
-					new_c -= c_o - c_n;
-				} else { new_c = 0; }
 			}
 		}
 

src/parser/stage/find_subs.rs

@@ -6,64 +6,6 @@ use super::super::{
 };
 
 
-fn sub_string(s: &str) -> Option<&'static str> {
-	let r = match s {
-
-		/* Only found in operator tokens */
-
-		"*"    => "×",
-		"/"    => "÷",
-		"sqrt" => "√",
-		"rt"   => "√",
-
-
-
-		/* Only found in word tokens */
-
-		// Greek letters
-		"alpha"   => "α",
-		"beta"    => "β",
-		"gamma"   => "γ",
-		"delta"   => "δ",
-		"epsilon" => "ε",
-		"zeta"    => "ζ",
-		"eta"     => "η",
-		"theta"   => "θ",
-		//"iota"    => {Some("ι")}, // looks just like i
-		//"kappa"   => {Some("κ")}, // looks just like k
-		"lambda"  => "λ",
-		"mu"      => "μ",
-		//"nu"      => {Some("ν")}, // looks just like v
-		"xi"      => "ξ",
-		//"omicron" => {Some("ο")}, // looks exactly like o
-		"pi"      => "π",
-		"rho"     => "ρ",
-		"sigma"   => "σ",
-		"tau"     => "τ",
-		//"upsilon" => {Some("υ")}, // looks just like u
-		"phi"     => "φ",
-		"chi"     => "χ",
-		//"psi"     => {Some("ψ")},  Conflict with pound / square inch
-		"omega"   => "ω",
-
-		// Constants
-		"epsilon_zero" => "ε₀",
-		"eps_zero"     => "ε₀",
-		"g_zero"       => "g₀",
-		"mu_zero"      => "μ₀",
-		"h_bar"        => "ℏ",
-
-		// Misc
-		"deg" => "°",
-
-		_ => { return None; }
-	};
-	return Some(r);
-}
-
-
-
-
 pub fn find_subs(
 	mut g: VecDeque<Token>,
 ) -> (
@@ -82,19 +24,62 @@ pub fn find_subs(
 	while g.len() > 0 {
 		let mut t = g.pop_front().unwrap();
 
-
 		let target: Option<&str> = match &mut t {
 			Token::Operator(_, s) => {
-				let target = sub_string(s);
+				let target = match &s[..] {
+					"*" => {Some("×")},
+					"/" => {Some("÷")},
+					"sqrt"    => {Some("√")},
+					"rt"      => {Some("√")},
+					_ => {None}
+				};
 
 				// Update token contents too.
-				// This makes errors and printouts use the updated string.
+				// This makes sure that errors also contain the updated text.
 				if target.is_some() { *s = String::from(target.unwrap()); }
 				target
 			},
 
 			Token::Word(_, s) => {
-				let target = sub_string(s);
+				let target = match &s[..] {
+					// Greek letters
+					"alpha"   => {Some("α")},
+					"beta"    => {Some("β")},
+					"gamma"   => {Some("γ")},
+					"delta"   => {Some("δ")},
+					"epsilon" => {Some("ε")},
+					"zeta"    => {Some("ζ")},
+					"eta"     => {Some("η")},
+					"theta"   => {Some("θ")},
+					//"iota"    => {Some("ι")},
+					//"kappa"   => {Some("κ")},
+					"lambda"  => {Some("λ")},
+					"mu"      => {Some("μ")},
+					//"nu"      => {Some("ν")},
+					"xi"      => {Some("ξ")},
+					//"omicron" => {Some("ο")},
+					"pi"      => {Some("π")},
+					"rho"     => {Some("ρ")},
+					"sigma"   => {Some("σ")},
+					"tau"     => {Some("τ")},
+					//"upsilon" => {Some("υ")},
+					"phi"     => {Some("φ")},
+					"chi"     => {Some("χ")},
+					//"psi"     => {Some("ψ")},  Conflict with pound / square inch
+					"omega"   => {Some("ω")},
+
+					// Constants
+					"epsilon_zero" => {Some("ε₀")},
+					"eps_zero"     => {Some("ε₀")},
+					"g_zero"       => {Some("g₀")},
+					"mu_zero"      => {Some("μ₀")},
+					"h_bar"        => {Some("ℏ")},
+
+					// Misc
+					"deg" => {Some("°")}
+					_ => {None}
+				};
+
 				if target.is_some() { *s = String::from(target.unwrap()); }
 				target
 			},