Lua: timing

sys/apis/map.lua

@@ -6,6 +6,8 @@ local Map = { }
 -- TODO: refactor
 Map.merge = Util.merge
 Map.shallowCopy = Util.shallowCopy
+Map.find = Util.find
+Map.filter = Util.filter
 
 function Map.removeMatches(t, values)
 	local function matchAll(entry)

sys/apis/util.lua

@@ -77,6 +77,9 @@ function Util.tostring(pattern, ...)
 	end
 
 	if type(pattern) == 'string' then
+		if select('#', ...) == 0 then
+			return pattern
+		end
 		return _sformat(pattern, ...)
 	elseif type(pattern) == 'table' then
 		return serialize(pattern, term.current().getSize())

sys/apps/Lua.lua

@@ -294,6 +294,7 @@ end
 function page:rawExecute(s)
 	local fn, m
 	local wrapped
+	local t = os.clock()
 
 	fn = load('return (' ..s.. ')', 'lua', nil, sandboxEnv)
 
@@ -319,7 +320,7 @@ function page:rawExecute(s)
 			local bg, fg = term.getBackgroundColor(), term.getTextColor()
 			term.setTextColor(colors.cyan)
 			term.setBackgroundColor(colors.black)
-			term.write(string.format('out [%d]: ', counter))
+			term.write(string.format('out [%.2f]: ', os.clock() - t))
 			term.setBackgroundColor(bg)
 			term.setTextColor(fg)
 			Util.print(m or 'nil')