changeset 13878:9ec961173b1c

teal: Remove trailing semicolons after return Apparently illegal syntax now, the nothing after the semicolon counts as a statement, which is not allowed after return?
author Kim Alvefur <zash@zash.se>
date Fri, 09 May 2025 00:30:32 +0200
parents 4e109e917f89
children 88a5cb5a1ab5
files teal-src/prosody/plugins/mod_cron.tl teal-src/prosody/util/datamapper.tl teal-src/prosody/util/queue.d.tl teal-src/prosody/util/smqueue.tl teal-src/prosody/util/xtemplate.tl
diffstat 5 files changed, 33 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/teal-src/prosody/plugins/mod_cron.tl	Mon May 19 18:41:55 2025 +0200
+++ b/teal-src/prosody/plugins/mod_cron.tl	Fri May 09 00:30:32 2025 +0200
@@ -63,13 +63,13 @@
 		task.restore = restore_task;
 		task.save = save_task;
 		module:log("debug", "%s task %s added", task.when, task.id);
-		return true;
+		return true
 	end
 
 	local function task_removed(event : task_event) : boolean
 		local task = event.item;
 		host_module:log("debug", "Task %s removed", task.id);
-		return true;
+		return true
 	end
 
 	host_module:handle_items("task", task_added, task_removed, true);
@@ -80,13 +80,13 @@
 end
 
 local function should_run(task : task_spec, last : integer) : boolean
-	return not last or last + task.period * 0.995 <= os.time();
+	return not last or last + task.period * 0.995 <= os.time()
 end
 
 local function run_task(task : task_spec)
 	task:restore();
 	if not should_run(task, task.last) then
-		return;
+		return
 	end
 	local started_at = os.time();
 	task:run(started_at);
@@ -95,7 +95,7 @@
 end
 
 local function spread(t : number, factor : number) : number
-	return t * (1 - factor + 2*factor*math.random());
+	return t * (1 - factor + 2*factor*math.random())
 end
 
 local task_runner : async.runner_t<task_spec> = async.runner(run_task);
@@ -109,7 +109,7 @@
 		end
 	end
 	module:log("debug", "Wait %gs", delay);
-	return delay;
+	return delay
 end);
 
 -- TODO measure load, pick a good time to do stuff
--- a/teal-src/prosody/util/datamapper.tl	Mon May 19 18:41:55 2025 +0200
+++ b/teal-src/prosody/util/datamapper.tl	Fri May 09 00:30:32 2025 +0200
@@ -42,7 +42,7 @@
 local function totype(t : json_type_name, s : string) : any
 	if not s then return nil end
 	if t == "string" then
-		return s;
+		return s
 	elseif t == "boolean" then
 		return toboolean(s)
 	elseif t == "number" or t == "integer" then
@@ -63,10 +63,10 @@
 local function resolve_schema(schema  : schema_t, root : json_schema_object) : schema_t
 	if schema is json_schema_object then
 		if schema["$ref"] and schema["$ref"]:sub(1, 1) == "#" then
-			return pointer.resolve(root as table, schema["$ref"]:sub(2)) as schema_t;
+			return pointer.resolve(root as table, schema["$ref"]:sub(2)) as schema_t
 		end
 	end
-	return schema;
+	return schema
 end
 
 local function guess_schema_type(schema : json_schema_object) : json_type_name
@@ -158,7 +158,7 @@
 			c = s:get_child(nil, namespace);
 		end
 		if c then
-			return c.name;
+			return c.name
 		end
 	elseif value_where == "in_attribute" then
 		local attr = name
@@ -250,7 +250,7 @@
 			table.insert(out, totype(proptype, value));
 		end
 	end
-	return out;
+	return out
 end
 
 local function parse (schema : json_schema_object, s : st.stanza_t) : table
@@ -361,7 +361,7 @@
 				unparse_property(out, v, proptype, propschema, value_where, name, namespace, current_ns, prefix, single_attribute, root)
 			end
 		end
-		return out;
+		return out
 
 	elseif s_type == "array" then
 		local itemschema = resolve_schema(schema.items, root)
@@ -369,7 +369,7 @@
 		for _, item in ipairs(t as { string }) do
 			unparse_property(out, item, proptype, itemschema, value_where, name, namespace, current_ns, prefix, single_attribute, root)
 		end
-		return out;
+		return out
 	end
 end
 
--- a/teal-src/prosody/util/queue.d.tl	Mon May 19 18:41:55 2025 +0200
+++ b/teal-src/prosody/util/queue.d.tl	Fri May 09 00:30:32 2025 +0200
@@ -18,4 +18,4 @@
 
 	new : function<T> (size:integer, allow_wrapping:boolean) : queue<T>
 end
-return lib;
+return lib
--- a/teal-src/prosody/util/smqueue.tl	Mon May 19 18:41:55 2025 +0200
+++ b/teal-src/prosody/util/smqueue.tl	Fri May 09 00:30:32 2025 +0200
@@ -33,9 +33,9 @@
 
 function smqueue:ack(h : integer) : { T }, smqueue.ack_errors
 	if h < self._tail then
-		return nil, "tail";
+		return nil, "tail"
 	elseif h > self._head then
-		return nil, "head";
+		return nil, "head"
 	end
 	-- TODO optimize? cache table fields
 	local acked = {};
@@ -43,26 +43,28 @@
 	local expect = self._head - self._tail;
 	while expect < self._queue:count() do
 		local v = self._queue:pop();
-		if not v then return nil, "pop"; end
+		if not v then
+			return nil, "pop"
+		end
 		table.insert(acked, v);
 	end
-	return acked;
+	return acked
 end
 
 function smqueue:count_unacked() : integer
-	return self._head - self._tail;
+	return self._head - self._tail
 end
 
 function smqueue:count_acked() : integer
-	return self._tail;
+	return self._tail
 end
 
 function smqueue:resumable() : boolean
-	return self._queue:count() >= (self._head - self._tail);
+	return self._queue:count() >= (self._head - self._tail)
 end
 
 function smqueue:resume() : queue.queue.iterator, any, integer
-	return self._queue:items();
+	return self._queue:items()
 end
 
 function smqueue:consume() : (function() : T)
@@ -75,7 +77,7 @@
 	for i, v in self:resume() do
 		t[i] = v;
 	end
-	return t;
+	return t
 end
 
 local function freeze(q : smqueue<any>) : { string:integer }
@@ -92,7 +94,7 @@
 
 function lib.new<T>(size : integer) : smqueue<T>
 	assert(size>0);
-	return setmetatable({ _head = 0; _tail = 0; _queue = queue.new(size, true) }, queue_mt);
+	return setmetatable({ _head = 0; _tail = 0; _queue = queue.new(size, true) }, queue_mt)
 end
 
-return lib;
+return lib
--- a/teal-src/prosody/util/xtemplate.tl	Mon May 19 18:41:55 2025 +0200
+++ b/teal-src/prosody/util/xtemplate.tl	Fri May 09 00:30:32 2025 +0200
@@ -56,7 +56,7 @@
 
 			if func == "each" and tmpl then
 				if not st.is_stanza(value) then
-					return pre_blank..post_blank;
+					return pre_blank..post_blank
 				end
 				if not args then value, args = root, path; end
 				local ns, name = s_match(args, "^(%b{})(.*)$");
@@ -94,15 +94,15 @@
 
 		if value is string then
 			if not is_escaped then value = escape(value); end
-			return pre_blank .. value .. post_blank;
+			return pre_blank .. value .. post_blank
 		elseif st.is_stanza(value) then
 			value = value:get_text();
 			if value then
-				return pre_blank .. escape(value) .. post_blank;
+				return pre_blank .. escape(value) .. post_blank
 			end
 		end
-		return pre_blank .. post_blank;
-	end));
+		return pre_blank .. post_blank
+	end))
 end
 
-return { render = render };
+return { render = render }