From 3ad2750c099a416a557b3e1c1ff851172d270a1e Mon Sep 17 00:00:00 2001
From: William Venner <william@venner.io>
Date: Tue, 2 Nov 2021 15:13:08 +0000
Subject: [PATCH] Add `pcall_ignore`

---
 gmod/Cargo.toml           |  2 +-
 gmod/src/lua/lua_state.rs | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/gmod/Cargo.toml b/gmod/Cargo.toml
index 6a65c09..fee3d01 100644
--- a/gmod/Cargo.toml
+++ b/gmod/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gmod"
-version = "9.0.0"
+version = "9.1.0"
 authors = ["William Venner <william@venner.io>"]
 edition = "2018"
 license = "MIT"
diff --git a/gmod/src/lua/lua_state.rs b/gmod/src/lua/lua_state.rs
index a37f228..37d93fb 100644
--- a/gmod/src/lua/lua_state.rs
+++ b/gmod/src/lua/lua_state.rs
@@ -155,6 +155,25 @@ impl LuaState {
 		(LUA_SHARED.lua_pcall)(*self, nargs, nresults, errfunc)
 	}
 
+	/// Same as pcall, but ignores any runtime error and calls `ErrorNoHaltWithStack` instead with the error message.
+	///
+	/// Returns whether the execution was successful.
+	pub unsafe fn pcall_ignore(&self, nargs: i32, nresults: i32) -> bool {
+		let res = self.pcall(nargs, nresults, 0);
+		if res == LUA_ERRRUN {
+			self.get_global(crate::lua_string!("ErrorNoHaltWithStack"));
+			if self.is_nil(-1) {
+				eprintln!("[ERROR] {:?}", self.get_string(-2));
+				return false;
+			}
+			self.push_value(-2);
+			self.call(1, 0);
+			self.pop();
+			return false;
+		}
+		true
+	}
+
 	pub unsafe fn load_string(&self, src: LuaString) -> Result<(), LuaError> {
 		let lua_error_code = (LUA_SHARED.lual_loadstring)(*self, src);
 		if lua_error_code == 0 {
@@ -259,6 +278,9 @@ impl LuaState {
 	}
 
 	#[inline(always)]
+	/// WARNING: Any Lua errors caused by calling the function will longjmp and prevent any further execution of your code.
+	///
+	/// To workaround this, use `pcall_ignore`, which will call `ErrorNoHaltWithStack` instead and allow your code to continue executing.
 	pub unsafe fn call(&self, nargs: i32, nresults: i32) {
 		(LUA_SHARED.lua_call)(*self, nargs, nresults)
 	}