Added variable and constant listing

src/command/mod.rs

@@ -1,4 +1,6 @@
 use std::io::Write;
+use crate::context::Context;
+use crate::parser::Constant;
 
 use termion::{
 	raw::RawTerminal,
@@ -15,12 +17,13 @@ pub fn is_command(
 		"help" | "clear"
 		| "ops" | "operators"
 		| "fns" | "functions"
+		| "vars"
+		| "consts" | "constants"
 		=> true,
 		_ => false
 	}
 }
 
-
 #[inline(always)]
 fn draw_greeter(stdout: &mut RawTerminal<std::io::Stdout>) -> Result<(), std::io::Error> {
 	write!(
@@ -51,7 +54,8 @@ fn draw_greeter(stdout: &mut RawTerminal<std::io::Stdout>) -> Result<(), std::io
 #[inline(always)]
 pub fn do_command(
 	stdout: &mut RawTerminal<std::io::Stdout>,
-	s: &String
+	s: &String,
+	context: &mut Context
 ) -> Result<(), std::io::Error> {
 
 	match &s[..] {
@@ -73,16 +77,15 @@ pub fn do_command(
 					"      {c}clear{r}  Clear the terminal\r\n",
 					"      {c}quit{r}   Exit daisy\r\n",
 					//"      {c}units{r}  List available units\r\n",
-					//"      {c}const{r}  List available constants\r\n",
+					"      {c}consts{r} List built-in constants\r\n",
 					"      {c}ops{r}    List built-in operators\r\n",
 					"      {c}fns{r}    List built-in functions\r\n",
-					"\n",
+					"      {c}vars{r}   List user-defined variables\r\n",
+					"\n\n",
 				),
 
 				r = format!("{}{}", color::Fg(color::Reset), style::Reset),
-
 				c = format!("{}{}", color::Fg(color::LightBlack), style::Italic),
-
 				t = format!("{}{}", color::Fg(color::Magenta), style::Bold)
 			)?;
 		},
@@ -115,7 +118,7 @@ pub fn do_command(
 					"  unit conversion      {c}to{r}\r\n",
 					"  division (long)      {c}per{r}\r\n",
 					"  modulo (long)        {c}mod{r}\r\n",
-					"\n"
+					"\n\n"
 				),
 
 				r = format!("{}{}", color::Fg(color::Reset), style::Reset),
@@ -146,7 +149,7 @@ pub fn do_command(
 					"\n",
 					"  convert to base unit     {c}tobase{r}\r\n",
 					"  remove units             {c}nounit{r}\r\n",
-					"\n"
+					"\n\n"
 				),
 
 				r = format!("{}{}", color::Fg(color::Reset), style::Reset),
@@ -154,6 +157,85 @@ pub fn do_command(
 				t = format!("{}{}", color::Fg(color::Magenta), style::Bold)
 			)?;
 		},
+
+		"vars" => {
+			let v = context.get_variables();
+
+			if v.len() == 0 {
+				write!(stdout,
+					"You have not defined any variables.\r\n\n",
+				)?;
+				return Ok(());
+			}
+
+			write!(stdout,
+				"\r\n╞═══ {t}User-Defined Variables{r} ═══╡\r\n",
+				r = format!("{}{}", color::Fg(color::Reset), style::Reset),
+				t = format!("{}{}", color::Fg(color::Magenta), style::Bold)
+			)?;
+
+
+
+			let mut longest = 0;
+			for (key, _) in v {
+				if key.len() > longest {
+					longest = key.len();
+				}
+			}
+
+			for (key, value) in v {
+				let padding = " ".repeat(longest - key.len());
+
+				write!(stdout,
+					concat!(
+						"  {k}{p} = {c}{v}{r}\r\n",
+					),
+					k = key, v = value.to_string(),
+					p = padding,
+					r = format!("{}{}", color::Fg(color::Reset), style::Reset),
+					c = format!("{}{}", color::Fg(color::LightBlack), style::Italic),
+				)?;
+			}
+
+			write!(stdout,
+				"\r\n\n",
+			)?;
+		},
+
+		"consts" | "constants" => {
+			let a = Constant::all_consts();
+
+			write!(stdout,
+				"\r\n╞═══ {t}Built-in Constants{r} ═══╡\r\n",
+				r = format!("{}{}", color::Fg(color::Reset), style::Reset),
+				t = format!("{}{}", color::Fg(color::Magenta), style::Bold)
+			)?;
+
+			for c in a {
+				let Some(p) = c.pretty_name() else { continue };
+
+				// If you subtract with overflow here,
+				// your padding length is too short.
+				let padding = " ".repeat(25 - p.chars().count());
+
+				write!(stdout,
+					"  {n}{p}: {c}{s}{r}",
+					p = padding,
+					n = p,
+					s = c.source_strings().join(", "),
+
+					r = format!("{}{}", color::Fg(color::Reset), style::Reset),
+					c = format!("{}{}", color::Fg(color::LightBlack), style::Italic),
+				)?;
+
+				write!(stdout, "\r\n")?;
+			}
+
+			write!(stdout,
+				"\r\n\n",
+			)?;
+		},
+
 		_ => unreachable!("Bad command!")
 	};
 

src/context.rs

@@ -38,4 +38,8 @@ impl Context {
 		}
 	}
 
+	pub fn get_variables(&self) -> &HashMap<String, Expression> {
+		return &self.variables
+	}
+
 }

src/entry/unix/unix.rs

@@ -129,12 +129,14 @@ fn do_expression(
 #[inline(always)]
 pub fn main() -> Result<(), std::io::Error> {
 	let mut stdout = stdout().into_raw_mode().unwrap();
+	let mut pb: PromptBuffer = PromptBuffer::new(64);
+	let mut context: Context = Context::new();
 
-	let args: Vec<String> = env::args().collect();
 
 	// Handle command-line arguments
+	let args: Vec<String> = env::args().collect();
 	if args.iter().any(|s| s == "--help") {
-		command::do_command(&mut stdout, &String::from("help"))?;
+		command::do_command(&mut stdout, &String::from("help"), &mut context)?;
 		return Ok(());
 	} else if args.iter().any(|s| s == "--version") {
 		write!(stdout, "Daisy v{}\r\n", env!("CARGO_PKG_VERSION"))?;
@@ -145,8 +147,6 @@ pub fn main() -> Result<(), std::io::Error> {
 	//let size = termion::terminal_size().unwrap();
 	//write!(stdout, "{:?}", size).unwrap();
 
-	let mut pb: PromptBuffer = PromptBuffer::new(64);
-	let mut context: Context = Context::new();
 
 
 	'outer: loop {
@@ -165,7 +165,7 @@ pub fn main() -> Result<(), std::io::Error> {
 						if in_str.trim() == "quit" {
 							break 'outer;
 						} else if command::is_command(&in_str) {
-							command::do_command(&mut stdout, &in_str)?;
+							command::do_command(&mut stdout, &in_str, &mut context)?;
 						} else {
 							let r = do_expression(&mut stdout, &in_str, &mut context);
 							if let Ok(t) = r { context.push_hist(t); }