From e06a4a6c72a2da3cff9533f5f5a3d8750c125300 Mon Sep 17 00:00:00 2001
From: rhpidfyre <brandon@rhpidfyre.io>
Date: Sat, 4 Jan 2025 12:14:18 -0500
Subject: [PATCH] OUT.WRITE<T...>(T...), and some cleanup

---
 src/luau/shell.rs    |  7 +++----
 src/luau/terminal.rs | 42 ++++++++++++++++++++++++++++--------------
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/src/luau/shell.rs b/src/luau/shell.rs
index 66e78c8..4f2d2ef 100644
--- a/src/luau/shell.rs
+++ b/src/luau/shell.rs
@@ -1,4 +1,4 @@
-use mlua::{Result as lResult, Table};
+use mlua::{Result as lResult, Table, Value};
 use whoami::fallible;
 use crate::vm::LuauVm;
 
@@ -11,9 +11,8 @@ impl PsPrompt for LuauVm {
 	fn ps_prompt(&self) -> lResult<Table> {
 		let prompt_table = self.0.create_table()?;
 		let prompt_metatable = self.0.create_table()?;
-		prompt_metatable.set("__index", self.0.create_function(|_, (lua_self, index): (String, String)| -> lResult<()> {
-			println!("lua_self={} index={}", lua_self, index);
-			Ok(())
+		prompt_metatable.set("__index", self.0.create_function(|_, (table, index): (Table, Value)| -> lResult<String> {
+			table.raw_get::<String>(index)
 		})?)?;
 		prompt_metatable.set("__newindex", self.0.create_function(|_, _: String| -> lResult<String> {
 			Ok("placeholder".to_owned())
diff --git a/src/luau/terminal.rs b/src/luau/terminal.rs
index cf5bd45..f0eae64 100644
--- a/src/luau/terminal.rs
+++ b/src/luau/terminal.rs
@@ -25,13 +25,12 @@ macro_rules! background_styles_luau {
     };
 }
 
-pub trait TerminalColors {
+trait Colors {
 	fn background(&self, style_table: &Table) -> lResult<()>;
 	fn foreground(&self, style_table: &Table) -> lResult<()>;
-	fn styling(&self) -> lResult<Table>;
-	fn terminal(&self, luau_globals: &Table) -> lResult<()>;
+	fn styling(&self, term_out_table: &Table) -> lResult<()>;
 }
-impl TerminalColors for LuauVm {
+impl Colors for LuauVm {
 	fn background(&self, style_table: &Table) -> lResult<()> {
 		let foreground_table = self.0.create_table()?;
 		foreground_styles_luau!(self, foreground_table,
@@ -46,8 +45,7 @@ impl TerminalColors for LuauVm {
 			underline_blue        underline_magenta      underline_cyan       underline_white
 			bold
 		);
-		style_table.set("FOREGROUND", foreground_table)?;
-        Ok(())
+		style_table.set("FOREGROUND", foreground_table)
 	}
 
 	fn foreground(&self, style_table: &Table) -> lResult<()> {
@@ -60,21 +58,37 @@ impl TerminalColors for LuauVm {
 		    on_blue  on_magenta
 		    on_cyan  on_white
 		);
-		style_table.set("BACKGROUND", background_table)?;
-        Ok(())
+		style_table.set("BACKGROUND", background_table)
 	}
 
-	fn styling(&self) -> lResult<Table> {
+	fn styling(&self, term_out_table: &Table) -> lResult<()> {
 		let style_table = self.0.create_table()?;
 		self.foreground(&style_table)?;
 		self.background(&style_table)?;
-		Ok(style_table)
+		term_out_table.set("STYLE", style_table)
 	}
+}
 
-	fn terminal(&self, luau_globals: &Table) -> lResult<()> {
+trait Write {
+	fn write(&self, term_out_table: &Table) -> lResult<()>;
+}
+impl Write for LuauVm {
+	fn write(&self, term_out_table: &Table) -> lResult<()> {
+		term_out_table.set("WRITE", self.0.create_function(|_, s: String| -> lResult<()> {
+			print!("{s}");
+			Ok(())
+		})?)
+	}
+}
+
+pub trait Terminal {
+	fn global_terminal(&self, luau_globals: &Table) -> lResult<()>;
+}
+impl Terminal for LuauVm {
+	fn global_terminal(&self, luau_globals: &Table) -> lResult<()> {
 		let term_table = self.0.create_table()?;
-		term_table.set("OUT", self.styling()?)?;
-		luau_globals.set("TERMINAL", &term_table)?;
-		Ok(())
+		let term_out_table = self.0.create_table()?;
+		term_table.set("OUT", term_out_table)?;
+		luau_globals.set("TERMINAL", &term_table)
 	}
 }
\ No newline at end of file