main: Factor out script uninitialization into a function for consistency

Tue, 11 Sep 2018 21:00:50 +0100

author
Matthew Wild <mwild1@gmail.com>
date
Tue, 11 Sep 2018 21:00:50 +0100
changeset 123
96b81f84809a
parent 122
709d5bb0acb4
child 124
168cc5aad639

main: Factor out script uninitialization into a function for consistency

main.lua file | annotate | diff | comparison | revisions
--- a/main.lua	Tue Sep 11 20:59:54 2018 +0100
+++ b/main.lua	Tue Sep 11 21:00:50 2018 +0100
@@ -110,9 +110,14 @@
 		o._validate(object);
 		c = c + 1;
 	end
+end
 
-	--print("Script defines "..c.." objects, and "..#script.actions.." actions");
-	return script;
+local function uninitialize_script(script)
+	for name, obj in pairs(script.objects) do
+		if obj.handler._finish then
+			obj.handler._finish(obj);
+		end
+	end
 end
 
 local function initialize_verse(errcb)
@@ -216,11 +221,7 @@
 		log_data("server", { lines = server_log_reader() });
 	end
 
-	for name, obj in pairs(script.objects) do
-		if obj.handler._finish then
-			obj.handler._finish(obj);
-		end
-	end
+	uninitialize_script(script);
 
 	return ok, err;
 end

mercurial