util.format: Change formatting of nil values to avoid looking like XML
authorKim Alvefur <zash@zash.se>
Tue, 29 Jun 2021 16:18:31 +0200
changeset 11648 fc1b8fe94d04
parent 11647 f534eeee1552
child 11649 3be346c5b940
util.format: Change formatting of nil values to avoid looking like XML
spec/util_format_spec.lua
util/format.lua
--- a/spec/util_format_spec.lua	Tue Jun 29 16:07:57 2021 +0200
+++ b/spec/util_format_spec.lua	Tue Jun 29 16:18:31 2021 +0200
@@ -4,10 +4,10 @@
 	describe("#format()", function()
 		it("should work", function()
 			assert.equal("hello", format("%s", "hello"));
-			assert.equal("<nil>", format("%s"));
-			assert.equal("<nil>", format("%d"));
-			assert.equal("<nil>", format("%q"));
-			assert.equal(" [<nil>]", format("", nil));
+			assert.equal("(nil)", format("%s"));
+			assert.equal("(nil)", format("%d"));
+			assert.equal("(nil)", format("%q"));
+			assert.equal(" [(nil)]", format("", nil));
 			assert.equal("true", format("%s", true));
 			assert.equal("[true]", format("%d", true));
 			assert.equal("% [true]", format("%%", true));
--- a/util/format.lua	Tue Jun 29 16:07:57 2021 +0200
+++ b/util/format.lua	Tue Jun 29 16:18:31 2021 +0200
@@ -55,7 +55,7 @@
 			local option = spec:sub(-1);
 			if arg == nil then
 				args[i] = "nil";
-				spec = "<%s>";
+				spec = "(%s)";
 			elseif option == "q" then
 				args[i] = dump(arg);
 				spec = "%s";
@@ -77,7 +77,7 @@
 		i = i + 1;
 		local arg = args[i];
 		if arg == nil then
-			args[i] = "<nil>";
+			args[i] = "(nil)";
 		else
 			args[i] = tostring(arg);
 		end