From f93d6fab6b380516600a7ead6b33fa85521d31a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20Reuh=20Fildadut?= <fildadut@reuh.eu>
Date: Fri, 9 Apr 2021 18:12:11 +0200
Subject: [PATCH] =?UTF-8?q?Use=20love.filesystem=20instead=20of=20io.open?=
 =?UTF-8?q?=20to=20read=20files=20if=20running=20inside=20L=C3=B6ve?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also small improvement to error reporting
---
 anselme.lua                 | 26 +++++++++++++++++++-------
 interpreter/interpreter.lua |  2 +-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/anselme.lua b/anselme.lua
index bbb9dc8..400ae60 100644
--- a/anselme.lua
+++ b/anselme.lua
@@ -171,19 +171,23 @@ local vm_mt = {
 	--   * main file: string, name (without .ans extension) of a file that will be loaded into the root namespace
 	-- * main file, if defined in config.ans
 	-- * every other file in the path and subdirectories, using their path as namespace (i.e., contents of path/world1/john.ans will be defined in a function world1.john)
+	-- returns self in case of success
+	-- returns nil, err in case of error
 	loadgame = function(self, path)
 		-- get config
 		if is_file(path.."/config.ans") then
-			self:loadfile(path.."/config.ans", "config")
+			local s, e = self:loadfile(path.."/config.ans", "config")
+			if not s then return s, e end
 		end
 		local seen_alias = self:eval("config.alias 👁️")
 		local checkpoint_alias = self:eval("config.alias 🏁")
-		local main_file = assert(self:eval("config.main file"))
+		local main_file = self:eval("config.main file")
 		-- set aliases
 		self:setaliases(seen_alias, checkpoint_alias)
 		-- load main file
 		if main_file then
-			self:loadfile(path.."/"..main_file..".ans")
+			local s, e = self:loadfile(path.."/"..main_file..".ans")
+			if not s then return s, e end
 		end
 		-- load other files
 		for _, item in ipairs(list_directory(path)) do
@@ -212,10 +216,18 @@ local vm_mt = {
 		return self
 	end,
 	loadfile = function(self, path, name)
-		local f, e = io.open(path, "r")
-		if not f then return f, e end
-		local s, err = self:loadstring(f:read("*a"), name, path)
-		f:close()
+		local content
+		if love then
+			local e
+			content, e = love.filesystem.read(path)
+			if not content then return content, e end
+		else
+			local f, e = io.open(path, "r")
+			if not f then return f, e end
+			content = f:read("*a")
+			f:close()
+		end
+		local s, err = self:loadstring(content, name, path)
 		if not s then return s, err end
 		return self
 	end,
diff --git a/interpreter/interpreter.lua b/interpreter/interpreter.lua
index b0259d4..17ba30a 100644
--- a/interpreter/interpreter.lua
+++ b/interpreter/interpreter.lua
@@ -3,7 +3,7 @@ local truthy, flush_state, to_lua, eval_text
 
 local function write_event(state, type, data)
 	if state.interpreter.event_buffer and state.interpreter.event_type ~= type then
-		error("previous event has not been flushed")
+		error(("previous event of type %q has not been flushed, can't write new %q event"):format(state.interpreter.event_type, type))
 	end
 	if not state.interpreter.event_buffer then
 		state.interpreter.event_type = type