Merge branch 'master'

inc/lua/luaconf.h

@@ -9,6 +9,7 @@
 #ifndef WINVER
 #define WINVER 0x0501
 #endif
+
 #include <limits.h>
 #include <stddef.h>
 

src/luainterp.cpp

@@ -5,6 +5,7 @@
 #include "lauxlib.h"
 #include "lua.h"
 #include <cstring>
+
 int bll_error_handler(lua_State *L) {
   lua_getfield(L, LUA_GLOBALSINDEX, "_bllua_on_error");
   if (!lua_isfunction(L, -1)) {

src/luainterp.hpp

@@ -3,6 +3,7 @@
 #define _H_LUAINTERP_SHARED
 
 #include "lua.h"
+
 #define BLL_ARG_COUNT 20
 #define BLL_ARG_MAX 8192
 

src/lualibts.cpp

@@ -8,6 +8,7 @@
 #include "lauxlib.h"
 #include "lua.h"
 #include "luainterp.hpp"
+
 int bll_TsCall(lua_State *L, const char *oname, const char *fname, int argc,
                int ofs) {
   ADDR obj = (ADDR)NULL;

src/tsliblua.cpp

@@ -4,6 +4,7 @@
 #include "BlFuncs.hpp"
 #include "BlHooks.hpp"
 #include "luainterp.hpp"
+
 bool bll_LuaCall(const char *fname, int argc, const char *argv[]) {
   lua_getglobal(gL, fname);
   for (int i = 0; i < argc; i++) {

src/util/libts-lua.lua

@@ -1,4 +1,3 @@
-
 -- This Lua code provides some built-in utilities for writing Lua add-ons
 -- It is eval'd automatically once BLLua3 has loaded the TS API and environment
 -- It only has access to the sandboxed lua environment, just like user code.
@@ -7,8 +6,11 @@ ts = _bllua_ts
 
 -- Provide limited OS functions
 os = os or {}
-function os.time() return math.floor(tonumber(_bllua_ts.call('getSimTime'))/1000) end
+---@diagnostic disable-next-line: duplicate-set-field
-function os.clock() return tonumber(_bllua_ts.call('getSimTime'))/1000 end
+function os.time() return math.floor(tonumber(_bllua_ts.call('getSimTime')) / 1000) end
+
+---@diagnostic disable-next-line: duplicate-set-field
+function os.clock() return tonumber(_bllua_ts.call('getSimTime')) / 1000 end
 
 -- Virtual file class, emulating a file object as returned by io.open
 -- Used to wrap io.open to allow reading from zips (using TS)
@@ -18,9 +20,9 @@ function os.clock() return tonumber(_bllua_ts.call('getSimTime'))/1000 end
 local file_meta = {
   read = function(file, mode)
     file:_init()
-		if not file or type(file)~='table' or not file._is_file then error('File:read: Not a file', 2) end
+    if not file or type(file) ~= 'table' or not file._is_file then error('File:read: Not a file', 2) end
     if file._is_open ~= true then error('File:read: File is closed', 2) end
-		if mode=='*n' then
+    if mode == '*n' then
       local ws, n = file.data:match('^([ \t\r\n]*)([0-9%.%-e]+)', file.pos)
       if n then
         file.pos = file.pos + #ws + #n
@@ -28,15 +30,15 @@ local file_meta = {
       else
         return nil
       end
-		elseif mode=='*a' then
+    elseif mode == '*a' then
       local d = file.data:sub(file.pos, #file.data)
       file.pos = #file.data + 1
       return d
-		elseif mode=='*l' then
+    elseif mode == '*l' then
       local l, ws = file.data:match('^([^\r\n]*)(\r?\n)', file.pos)
       if not l then
         l = file.data:match('^([^\r\n]*)$', file.pos); ws = '';
-				if l=='' then return nil end
+        if l == '' then return nil end
       end
       if l then
         file.pos = file.pos + #l + #ws
@@ -44,12 +46,12 @@ local file_meta = {
       else
         return nil
       end
-		elseif type(mode)=='number' then
+    elseif type(mode) == 'number' then
-			local d = file.data:sub(file.pos, file.pos+mode)
+      local d = file.data:sub(file.pos, file.pos + mode)
       file.pos = file.pos + #d
       return d
     else
-			error('File:read: Invalid mode \''..mode..'\'', 2)
+      error('File:read: Invalid mode \'' .. mode .. '\'', 2)
     end
   end,
   lines = function(file)
@@ -82,8 +84,10 @@ local function new_file_obj(fn)
   return file
 end
 
-local function tflip(t) local u = {}; for _, n in ipairs(t) do u[n] = true end; return u; end
+local function tflip(t)
-local allowed_zip_dirs = tflip{
+  local u = {}; for _, n in ipairs(t) do u[n] = true end; return u;
+end
+local allowed_zip_dirs = tflip {
   'add-ons', 'base', 'config', 'saves', 'screenshots', 'shaders'
 }
 local function io_open_absolute(fn, mode)
@@ -97,8 +101,9 @@ local function io_open_absolute(fn, mode)
   local exist = _bllua_ts.call('isFile', fn) == '1'
   if not exist then return nil, err end
 
-	if mode~=nil and mode~='r' and mode~='rb' then
+  if mode ~= nil and mode ~= 'r' and mode ~= 'rb' then
-		return nil, 'Files in zips can only be opened in read mode' end
+    return nil, 'Files in zips can only be opened in read mode'
+  end
 
   -- return a temp lua file object with the data
   local fi = new_file_obj(fn)
@@ -106,6 +111,7 @@ local function io_open_absolute(fn, mode)
 end
 
 io = io or {}
+---@diagnostic disable-next-line: duplicate-set-field
 function io.open(fn, mode, errn)
   errn = errn or 1
 
@@ -114,7 +120,7 @@ function io.open(fn, mode, errn)
   if curfn == '' then curfn = nil end
   if fn:find('^%.') then
     local relfn = curfn and fn:find('^%./') and
-			curfn:gsub('[^/]+$', '')..fn:gsub('^%./', '')
+        curfn:gsub('[^/]+$', '') .. fn:gsub('^%./', '')
     if relfn then
       local fi, err = io_open_absolute(relfn, mode)
       return fi, err, relfn
@@ -126,13 +132,19 @@ function io.open(fn, mode, errn)
     return fi, err, fn
   end
 end
+
+---@diagnostic disable-next-line: duplicate-set-field
 function io.lines(fn)
   local fi, err, fn2 = io.open(fn, nil, 2)
-	if not fi then error('Error opening file \''..fn2..'\': '..err, 2) end
+  if not fi then error('Error opening file \'' .. fn2 .. '\': ' .. err, 2) end
   return fi:lines()
 end
+
+---@diagnostic disable-next-line: duplicate-set-field
 function io.type(f)
-	if type(f)=='table' and f._is_file then
+---@diagnostic disable-next-line: undefined-field
+  if type(f) == 'table' and f._is_file then
+---@diagnostic disable-next-line: undefined-field
     return f._is_open and 'file' or 'closed file'
   else
     return _bllua_io_type(f)
@@ -143,13 +155,13 @@ end
 function dofile(fn, errn)
   errn = errn or 1
 
-	local fi, err, fn2 = io.open(fn, 'r', errn+1)
+  local fi, err, fn2 = io.open(fn, 'r', errn + 1)
-	if not fi then error('Error executing file \''..fn2..'\': '..err, errn+1) end
+  if not fi then error('Error executing file \'' .. fn2 .. '\': ' .. err, errn + 1) end
 
-	print('Executing '..fn2)
+  print('Executing ' .. fn2)
   local text = fi:read('*a')
   fi:close()
-	return assert(loadstring('--[['..fn2..']]'..text))()
+  return assert(loadstring('--[[' .. fn2 .. ']]' .. text))()
 end
 
 -- provide require (just a wrapper for dofile)
@@ -158,7 +170,7 @@ end
 --   blockland directory
 --   current add-on
 local function file_exists(fn, errn)
-	local fi, err, fn2 = io.open(fn, 'r', errn+1)
+  local fi, err, fn2 = io.open(fn, 'r', errn + 1)
   if fi then
     fi:close()
     return fn2
@@ -171,20 +183,20 @@ function require(mod)
   if require_memo[mod] then return unpack(require_memo[mod]) end
   local fp = mod:gsub('%.', '/')
   local fns = {
-		'./'..fp..'.lua',      -- local file
+    './' .. fp .. '.lua', -- local file
-		'./'..fp..'/init.lua', -- local library
+    './' .. fp .. '/init.lua', -- local library
-		fp..'.lua',            -- global file
+    fp .. '.lua',        -- global file
-		fp..'/init.lua',       -- global library
+    fp .. '/init.lua',   -- global library
   }
   if fp:lower():find('^add-ons/') then
-		local addonpath = fp:lower():match('^add-ons/[^/]+')..'/'
+    local addonpath = fp:lower():match('^add-ons/[^/]+') .. '/'
-		table.insert(fns, addonpath..fp..'.lua')      -- add-on file
+    table.insert(fns, addonpath .. fp .. '.lua') -- add-on file
-		table.insert(fns, addonpath..fp..'/init.lua') -- add-on library
+    table.insert(fns, addonpath .. fp .. '/init.lua') -- add-on library
   end
-	for _,fn in ipairs(fns) do
+  for _, fn in ipairs(fns) do
     local fne = file_exists(fn, 2)
     if fne then
-			local res = {dofile(fne, 2)}
+      local res = { dofile(fne, 2) }
       require_memo[mod] = res
       return unpack(res)
     end
@@ -193,13 +205,14 @@ function require(mod)
 end
 
 local function isValidCode(code)
-	local f,e = loadstring(code)
+  local f, e = loadstring(code)
-	return f~=nil
+  return f ~= nil
 end
 function _bllua_smarteval(code)
-	if (not code:find('^print%(')) and isValidCode('print('..code..')') then
+  if (not code:find('^print%(')) and isValidCode('print(' .. code .. ')') then
-		code = 'print('..code..')' end
+    code = 'print(' .. code .. ')'
-	local f,e = loadstring(code)
+  end
+  local f, e = loadstring(code)
   if f then
     return f()
   else

src/util/matrix.lua

@@ -1,4 +1,3 @@
-
 -- todo
 -- Matrix class with math operators
 

src/util/std.lua

@@ -1,263 +1,285 @@
-
 -- Basic functionality that should be standard in Lua
 
 
 -- Table / List
 -- Whether a table contains no keys
 function table.empty(t)
-	return next(t)~=nil
+  return next(t) ~= nil
 end
+
 -- Apply a function to each key in a table
 function table.map(f, ...)
-	local ts = {...}
+  local ts = { ... }
   local u = {}
-	for k,_ in pairs(ts[1]) do
+  for k, _ in pairs(ts[1]) do
     local args = {}
-		for j=1,#ts do args[j] = ts[j][i] end
+    for j = 1, #ts do args[j] = ts[j][i] end
     u[i] = f(unpack(args))
   end
   return u
 end
+
 function table.map_list(f, ...)
-	local ts = {...}
+  local ts = { ... }
   local u = {}
-	for i=1,#ts[1] do
+  for i = 1, #ts[1] do
     local args = {}
-		for j=1,#ts do args[j] = ts[j][i] end
+    for j = 1, #ts do args[j] = ts[j][i] end
     u[i] = f(unpack(args))
   end
   return u
 end
+
 -- Swap keys/values
 function table.swap(t)
   local u = {}
-	for k,v in pairs(t) do u[v] = k end
+  for k, v in pairs(t) do u[v] = k end
   return u
 end
+
 -- Reverse a list
 function table.reverse(l)
   local m = {}
-	for i=1,#l do m[#l-i+1] = l[i] end
+  for i = 1, #l do m[#l - i + 1] = l[i] end
   return m
 end
+
 -- Whether a table is a list/array (has only monotonic integer keys)
 function table.islist(t)
   local n = 0
-	for i,_ in pairs(t) do
+  for i, _ in pairs(t) do
-		if type(i)~='number' or i%1~=0 then return false end
+    if type(i) ~= 'number' or i % 1 ~= 0 then return false end
-		n = n+1
+    n = n + 1
   end
-	return n==#t
+  return n == #t
 end
+
 -- Append contents of other tables to first table
 function table.append(t, ...)
-	local a = {...}
+  local a = { ... }
-	for _,u in ipairs(a) do
+  for _, u in ipairs(a) do
-		for _,v in ipairs(u) do table.insert(t,v) end
+    for _, v in ipairs(u) do table.insert(t, v) end
   end
   return t
 end
+
 -- Create a new table containing all keys from any number of tables
 -- latter tables in the arg list override prior ones
 -- overlaps, NOT appends, integer keys
 function table.join(...)
-	local ts = {...}
+  local ts = { ... }
   local w = {}
-	for _,t in ipairs(ts) do
+  for _, t in ipairs(ts) do
-		for k,v in pairs(t) do w[k] = v end
+    for k, v in pairs(t) do w[k] = v end
   end
   return w
 end
+
 -- Whether a table contains a certain value in any key
-function table.contains(t,s)
+function table.contains(t, s)
-	for _,v in pairs(t) do
+  for _, v in pairs(t) do
-		if v==s then return true end
+    if v == s then return true end
   end
   return false
 end
-function table.contains_list(t,s)
+
-	for _,v in ipairs(t) do
+function table.contains_list(t, s)
-		if v==s then return true end
+  for _, v in ipairs(t) do
+    if v == s then return true end
   end
   return false
 end
+
 -- Copy a table to another table
 function table.copy(t)
   local u = {}
-	for k,v in pairs(t) do u[k] = v end
+  for k, v in pairs(t) do u[k] = v end
   return u
 end
+
 function table.copy_list(l)
   local m = {}
-	for i,v in ipairs(l) do m[i] = v end
+  for i, v in ipairs(l) do m[i] = v end
   return m
 end
+
 -- Sort a table in a new copy
 function table.sortcopy(t, f)
   local u = table.copy_list(t)
   table.sort(u, f)
   return u
 end
+
 -- Remove a value from a table
 function table.removevalue(t, r)
   local rem = {}
-	for k,v in pairs(t) do
+  for k, v in pairs(t) do
-		if v==r then table.insert(rem, k) end
+    if v == r then table.insert(rem, k) end
   end
-	for _,k in ipairs(rem) do t[k] = nil end
+  for _, k in ipairs(rem) do t[k] = nil end
 end
+
 function table.removevalue_list(t, r)
   for i = #t, 1, -1 do
-		if t[i]==r then
+    if t[i] == r then
       table.remove(t, i)
     end
   end
 end
+
 -- Export tables into formatted executable strings
 local function tabs(tabLevel)
   return ('  '):rep(tabLevel)
 end
 local valueToString
 local function tableToString(t, tabLevel, seen)
-	if type(t)~='table' or (getmetatable(t) and getmetatable(t).__tostring) then
+  if type(t) ~= 'table' or (getmetatable(t) and getmetatable(t).__tostring) then
     return tostring(t)
   elseif table.islist(t) then
-		if #t==0 then
+    if #t == 0 then
       return '{}'
     else
       local strs = {}
       local containsTables = false
-			for _,v in ipairs(t) do
+      for _, v in ipairs(t) do
-				if type(v)=='table' then containsTables = true end
+        if type(v) == 'table' then containsTables = true end
-				table.insert(strs, valueToString(v, tabLevel+1, seen)..',')
+        table.insert(strs, valueToString(v, tabLevel + 1, seen) .. ',')
       end
-			if containsTables or #t>3 then
+      if containsTables or #t > 3 then
-				return '{\n'..tabs(tabLevel+1)
+        return '{\n' .. tabs(tabLevel + 1)
-					..table.concat(strs, '\n'..tabs(tabLevel+1))
+            .. table.concat(strs, '\n' .. tabs(tabLevel + 1))
-					..'\n'..tabs(tabLevel)..'}'
+            .. '\n' .. tabs(tabLevel) .. '}'
       else
-				return '{ '..table.concat(strs, ' ')..' }'
+        return '{ ' .. table.concat(strs, ' ') .. ' }'
       end
     end
   else
     local containsNonStringKeys = false
-		for k,v in pairs(t) do
+    for k, v in pairs(t) do
-			if type(k)~='string' or k:find('[^a-zA-Z0-9_]') then
+      if type(k) ~= 'string' or k:find('[^a-zA-Z0-9_]') then
         containsNonStringKeys = true
-			elseif type(k)=='table' then
+      elseif type(k) == 'table' then
         error('table.tostring: table contains a table as key, cannot serialize')
       end
     end
     local strs = {}
     if containsNonStringKeys then
-			for k,v in pairs(t) do
+      for k, v in pairs(t) do
-				table.insert(strs, '\n'..tabs(tabLevel+1)
+        table.insert(strs, '\n' .. tabs(tabLevel + 1)
-					..'['..valueToString(k, tabLevel+1, seen)..'] = '
+          .. '[' .. valueToString(k, tabLevel + 1, seen) .. '] = '
-					..valueToString(v, tabLevel+1, seen)..',')
+          .. valueToString(v, tabLevel + 1, seen) .. ',')
       end
     else
-			for k,v in pairs(t) do
+      for k, v in pairs(t) do
-				table.insert(strs, '\n'..tabs(tabLevel+1)
+        table.insert(strs, '\n' .. tabs(tabLevel + 1)
-					..k..' = '..valueToString(v, tabLevel+1, seen)..',')
+          .. k .. ' = ' .. valueToString(v, tabLevel + 1, seen) .. ',')
       end
     end
-		return '{'..table.concat(strs)..'\n'..tabs(tabLevel)..'}'
+    return '{' .. table.concat(strs) .. '\n' .. tabs(tabLevel) .. '}'
   end
 end
 valueToString = function(v, tabLevel, seen)
   local t = type(v)
-	if t=='table' then
+  if t == 'table' then
     if seen[v] then
-			return 'nil --[[ already seen: '..tostring(v)..' ]]'
+      return 'nil --[[ already seen: ' .. tostring(v) .. ' ]]'
     else
       seen[v] = true
       return tableToString(v, tabLevel, seen)
     end
-	elseif t=='string' then
+  elseif t == 'string' then
-		return '\''..string.escape(v)..'\''
+    return '\'' .. string.escape(v) .. '\''
-	elseif t=='number' or t=='boolean' then
+  elseif t == 'number' or t == 'boolean' then
     return tostring(v)
   else
     --error('table.tostring: table contains a '..t..' value, cannot serialize')
-		return 'nil --[[ cannot serialize '..tostring(v)..' ]]'
+    return 'nil --[[ cannot serialize ' .. tostring(v) .. ' ]]'
   end
 end
 function table.tostring(t)
   return tableToString(t, 0, {})
 end
 
-
 -- String
 
 -- Split string into table by separator
 -- or by chars if no separator given
 -- if regex is not true, sep is treated as a regex pattern
 function string.split(str, sep, noregex)
-	if type(str)~='string' then
+  if type(str) ~= 'string' then
-		error('string.split: argument #1: expected string, got '..type(str), 2) end
+    error('string.split: argument #1: expected string, got ' .. type(str), 2)
-	if sep==nil or sep=='' then
+  end
+  if sep == nil or sep == '' then
     local t = {}
     local ns = #str
     for x = 1, ns do
       table.insert(t, str:sub(x, x))
     end
     return t
-	elseif type(sep)=='string' then
+  elseif type(sep) == 'string' then
     local t = {}
-		if #str>0 then
+    if #str > 0 then
       local first = 1
       while true do
         local last, newfirst = str:find(sep, first, noregex)
         if not last then break end
-				table.insert(t, str:sub(first, last-1))
+        table.insert(t, str:sub(first, last - 1))
-				first = newfirst+1
+        first = newfirst + 1
       end
       table.insert(t, str:sub(first, #str))
     end
     return t
   else
     error(
-			'string.split: argument #2: expected string or nil, got '..type(sep), 2)
+      'string.split: argument #2: expected string or nil, got ' .. type(sep), 2)
   end
 end
+
 -- Split string to a list of char bytes
 function string.bytes(s)
   local b = {}
-	for i=1,#s do
+  for i = 1, #s do
-		local c = s:sub(i,i)
+    local c = s:sub(i, i)
     table.insert(b, c:byte())
   end
   return b
 end
+
 -- Trim leading and trailing whitespace
 function string.trim(s, ws)
   ws = ws or ' \t\r\n'
-	return s:gsub('^['..ws..']+', ''):gsub('['..ws..']+$', '')..''
+  return s:gsub('^[' .. ws .. ']+', ''):gsub('[' .. ws .. ']+$', '') .. ''
 end
+
 -- String slicing and searching using [] operator
 local str_meta = getmetatable('')
-local str_meta_index_old= str_meta.__index
+local str_meta_index_old = str_meta.__index
-function str_meta.__index(s,k)
+function str_meta.__index(s, k)
-	if type(k)=='string' then
+  if type(k) == 'string' then
     return str_meta_index_old[k]
-	elseif type(k)=='number' then
+  elseif type(k) == 'number' then
-		if k<0 then k = #s+k+1 end
+    if k < 0 then k = #s + k + 1 end
-		return string.sub(s,k,k)
+    return string.sub(s, k, k)
-	elseif type(k)=='table' then
+  elseif type(k) == 'table' then
-		local a = k[1]<0 and (#s+k[1]+1) or k[1]
+    local a = k[1] < 0 and (#s + k[1] + 1) or k[1]
-		local b = k[2]<0 and (#s+k[2]+1) or k[2]
+    local b = k[2] < 0 and (#s + k[2] + 1) or k[2]
-		return string.sub(s,a,b)
+    return string.sub(s, a, b)
   end
 end
+
 -- String iterator
 function string.chars(s)
   local i = 0
   return function()
-		i = i+1
+    i = i + 1
-		if i<=#s then return s:sub(i,i)
+    if i <= #s then
-		else return nil end
+      return s:sub(i, i)
+    else
+      return nil
+    end
   end
 end
+
 -- Escape sequences
 local defaultEscapes = {
   ['\\'] = '\\\\',
@@ -271,12 +293,13 @@ local defaultEscapes = {
 function string.escape(s, escapes)
   escapes = escapes or defaultEscapes
   local t = {}
-	for i=1,#s do
+  for i = 1, #s do
-		local c = s:sub(i,i)
+    local c = s:sub(i, i)
     table.insert(t, escapes[c] or c)
   end
   return table.concat(t)
 end
+
 local defaultEscapeChar = '\\'
 local defaultUnescapes = {
   ['\\'] = '\\',
@@ -292,13 +315,13 @@ function string.unescape(s, escapeChar, unescapes)
   unescapes = unescapes or defaultUnescapes
   local t = {}
   local inEscape = false
-	for i=1,#s do
+  for i = 1, #s do
-		local c = s:sub(i,i)
+    local c = s:sub(i, i)
     if inEscape then
       table.insert(t, unescapes[c]
         or error('string.unescape: invalid escape sequence: \''
-					..escapeChar..c..'\''))
+          .. escapeChar .. c .. '\''))
-		elseif c==escapeChar then
+    elseif c == escapeChar then
       inEscape = true
     else
       table.insert(t, c)
@@ -307,44 +330,47 @@ function string.unescape(s, escapeChar, unescapes)
   return table.concat(t)
 end
 
-
 -- IO
 
 io = io or {}
 -- Read entire file at once, return nil,err if access failed
 function io.readall(filename)
-	local fi,err = io.open(filename, 'rb')
+  local fi, err = io.open(filename, 'rb')
-	if not fi then return nil,err end
+  if not fi then return nil, err end
   local s = fi:read("*a")
   fi:close()
   return s
 end
+
 -- Write data to file all at once, return true if success / false,err if failure
 function io.writeall(filename, data)
-	local fi,err = io.open(filename, 'wb')
+  local fi, err = io.open(filename, 'wb')
-	if not fi then return false,err end
+  if not fi then return false, err end
   fi:write(data)
   fi:close()
-	return true,nil
+  return true, nil
 end
 
-
 -- Math
 
 -- Round
 function math.round(x)
-	return math.floor(x+0.5)
+  return math.floor(x + 0.5)
 end
+
 -- Mod that accounts for floating point inaccuracy
-function math.mod(a,b)
+function math.mod(a, b)
-	local m = a%b
+  local m = a % b
-	if m==0 or math.abs(m)<1e-15 or math.abs(m-b)<1e-15 then return 0
+  if m == 0 or math.abs(m) < 1e-15 or math.abs(m - b) < 1e-15 then
-	else return m end
+    return 0
+  else
+    return m
+  end
 end
+
 -- Clamp value between min and max
 function math.clamp(v, n, x)
   return math.min(x, math.max(v, n))
 end
 
-
 print('  Executed std.lua')