Merge branch 'master'

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

.gitignore

@@ -1,2 +1 @@
-.*
+build/
-!.gitignore

.vscode/settings.json

@@ -0,0 +1,12 @@
+{
+  "Lua.diagnostics.globals": [
+    "_bllua_ts",
+    "_bllua_requiresecure",
+    "_bllua_on_unload"
+  ],
+  "Lua.runtime.version": "Lua 5.1",
+  "Lua.diagnostics.disable": [
+    "lowercase-global",
+    "undefined-global"
+  ]
+}

compile.bat

@@ -0,0 +1,13 @@
+@echo off
+cd /d %~dp0
+
+set "PATH=C:\msys64\mingw32\bin;%PATH%"
+
+if not exist build mkdir build
+
+set buildargs=-Wall -Werror -m32 -shared -Isrc -Iinc/tsfuncs -Iinc/lua -lpsapi -L. -llua5.1 -static-libgcc -static-libstdc++
+
+echo on
+g++ src/bllua4.cpp %buildargs% -o build\BlockLua.dll
+g++ -DBLLUA_UNSAFE src/bllua4.cpp %buildargs% -o build\BlockLua-Unsafe.dll
+@echo off

compiling.md

@@ -0,0 +1,52 @@
+## Compiling on Windows with MSYS2 (32-bit)
+
+Follow these steps to build `BlockLua.dll` for 32-bit Windows using MSYS2's MinGW-w64 i686 toolchain.
+
+### 1) Install MSYS2
+
+- Download and install MSYS2 from `https://www.msys2.org/`.
+- After installing, open the "MSYS2 MSYS" terminal once and update the package database if prompted.
+
+### 2) Install required packages (i686 / 32-bit)
+
+Run this in the "MSYS2 MSYS" or "MSYS2 MinGW 32-bit" terminal:
+
+```bash
+pacman -Sy --needed mingw-w64-i686-toolchain mingw-w64-i686-binutils mingw-w64-i686-lua51
+```
+
+What these packages are for:
+
+- mingw-w64-i686-toolchain: 32-bit C/C++ compiler suite (g++, libstdc++, runtime libs) to build Windows binaries.
+- mingw-w64-i686-binutils: Linker and binary utilities (ld, as, objdump) used by the compiler and for optional inspection.
+- mingw-w64-i686-lua51: Lua 5.1 development files for 32-bit (import library). We use its import library to link; at runtime you can use the provided `lua5.1.dll`.
+
+### 3) Build (PowerShell, recommended)
+
+- Open PowerShell in the repo root.
+- Run the script:
+
+```powershell
+compile.bat
+```
+
+What the script does:
+
+- Temporarily prepends `C:\\msys64\\mingw32\\bin` to PATH so the 32-bit toolchain is used.
+- Compiles the project with `-m32` and links against `lua5.1`.
+- Produces `build\BlockLua.dll` and `build\BlockLua-Unsafe.dll`.
+
+### 4) Optional: Verify 32-bit output
+
+If you installed binutils, you can check the architecture:
+
+```powershell
+objdump -f build\BlockLua.dll | Select-String i386
+```
+
+You should see `architecture: i386` in the output.
+
+### Notes
+
+- Ensure you installed the i686 (32-bit) variants of the packages; x86_64 packages won’t work for a 32-bit build.
+- If the linker cannot find `-llua5.1`, confirm `mingw-w64-i686-lua51` is installed and you are using the `mingw32` toolchain (not `x86_64`).

readme.md

@@ -14,10 +14,10 @@ Lua scripting for Blockland
 ### From TorqueScript
 `'print('hello world')` - Execute Lua in the console by prepending a `'` (single quote)  
 `luaeval("code");` - Execute Lua code  
-`luacall("funcName", %args...);` - Call a Lua function (supports indexing tables and object methods)  
+`luacall("funcName", %args...);` - Call a Lua global function  
-`luaexec("fileName");` - Execute a Lua file. Path rules are the same as when executing .cs files, relative paths are allowed.  
+`luaexec("fileName");` - Execute a Lua file. Path rules are the same as executing .cs files.  
-`luaget("varName");` - Read a Lua global variable (supports indexing tables)  
+`luaget("varName");` - Read a Lua global variable  
-`luaset("varName", %value);` - Write a Lua global variable (supports indexing tables)  
+`luaset("varName", %value);` - Write a Lua global variable  
 
 ### From Lua
 `bl.eval('code')` - Eval TorqueScript code  
@@ -35,9 +35,7 @@ Lua scripting for Blockland
 `object.key = value` - Associate Lua data with a Torque object  
 `object:method(args)` - Call a Torque object method  
 `object[index]` - Access a member of a Torque set or group  
-`for child in object:members() do` - Iterate objects within of a Torque set or group. Indices start at 0 like in Torque.
+`for childIndex, child in object:members() do` - Iterate objects within of a Torque set or group. Indices start at 0 like in Torque.
-`bl.isObject(object, objectID, or 'objectName')` - Check if an object exists  
-`object:exists()` - Check if an object exists  
 
 ### Timing/Schedules
 `sched = bl.schedule(timeMs, function, args...)` - Schedule a Lua function to be called later, similar to schedule in Torque  
@@ -48,25 +46,15 @@ Lua scripting for Blockland
 `for object in bl.boxSearch(vector{centerX,y,z}, vector{sizeX,y,z}, 'objtype'/{'objtypes',...}) do` - Find all objects in the world of the specified type(s) whose bounding box overlaps with the specified box. See the Types section for a list of valid object types.  
 `for object in bl.radiusSearch(vector{centerX,y,z}, radius, 'objtype'/{'objtypes',...}) do` - Find all objects of the specified type(s) whose bounding box overlaps with the specified sphere. See the Types section for a list of valid object types.  
 
-### List of Object Classes (for raycasts and searches)
-`'all'` - Any object  
-`'player'` - Players or bots  
-`'item'` - Items  
-`'vehicle'` - Vehicles  
-`'projectile'` - Projectiles  
-`'brick'` - Bricks with raycasting enabled  
-`'brickalways'` - All bricks including those with raycasting disabled  
-Other types: `'static'`, `'environment'`, `'terrain'`, `'water'`, `'trigger'`, `'marker'`, `'gamebase'`, `'shapebase'`, `'camera'`, `'staticshape'`, `'vehicleblocker'`, `'explosion'`, `'corpse'`, `'debris'`, `'physicalzone'`, `'staticts'`, `'staticrendered'`, `'damagableitem'`  
-
 ### Server-Client Communication
-`bl.addServerCmd('commandName', function(client, args...) ... end)` - Register a /command on the server  
+`bl.addServerCmd('commandName', function(client, args...) yourCode end)` - Register a /command on the server  
-`bl.addClientCmd('commandName', function(args...) ... end)` - Register a client command on the client  
+`bl.addClientCmd('commandName', function(args...) yourCode end)` - Register a client command on the client  
-`bl.commandToServer('commandName', args...)` - As a client, execute a server command  
+`bl.commandToServer('commandName', args...)` - Execute a server command as a client  
-`bl.commandToClient(client, 'commandName', args...)` - As the server, execute a client command on a specific client  
+`bl.commandToClient('commandName', args...)` - As the server, execute a client command on a specific client  
 `bl.commandToAll('commandName', args...)` - As the server, execute a client command on all clients  
 
 ### Packages/Hooks
-`bl.hook('packageName', 'functionName', 'before'/'after', function(args) ... end)` - Hook a Torque function with a Lua function.  
+`bl.hook('packageName', 'functionName', 'before'/'after', function(args) yourCode end)` - Hook a Torque function with a Lua function.  
 `args` is an array containing the arguments provided to the function. If the hook is `before`, these can be modified before being passed to the parent function.  
 If `args._return` is set to anything other than nil by a `before` hook, the parent function will not be called, and the function will simply return that value. Also in this case, any `after` hook will not be executed.  
 In an `after` hook, `args._return` is set to the value returned by the parent function, and can be modified.  
@@ -113,11 +101,10 @@ When reading from outside ZIPs, binary files are fully supported.
 `bl.type('className::funcName', 'type')` - Register the return type of a Torque object method.  
 `bl.class('className')` - Register an existing Torque class to be used from Lua. Already done for all built-in classes.  
 `bl.class('className', 'parentClassName')` - Same as above, with inheritance  
-`bl.boolean(arg)` - Manually convert a Torque boolean (0 or 1) into a Lua boolean.  
+`bl.boolean(thing)` - Manually convert a Torque boolean (0 or 1) into a Lua boolean.  
-`bl.object(arg)` - Manually convert a Torque object reference (object ID or name) into a Lua object.  
+`bl.object(thing)` - Manually convert a Torque object reference (object ID or name) into a Lua object.
-`bl.string(arg)` - Manually convert any automatically-converted Torque value back into a string. This is not as reliable as using `bl.type` to specify the type as a string beforehand.  
 
-### Vector
+### Vectors
 `vec = vector{x,y,z}` - Create a vector. Can have any number of elements  
 `vec1 + vec2` - Add  
 `vec1 - vec2` - Subtract  
@@ -142,20 +129,15 @@ When reading from outside ZIPs, binary files are fully supported.
 `vec1:distance(vec2)` - Distance between two points  
 `vec2 = vec:copy()` - Clone a vector so its elements can be modified without affecting the original. Usually not needed - the builtin vector functions never modify vectors in-place.
 
-### Matrix
-WIP
-
 ### Extended Standard Lua Library
-`str[index]`  
+`string[index]`  
-`str[{start,stop}]`  
+`string[{start,stop}]`  
 `string.split(str, separator='' (splits into chars), noregex=false)`  
 `string.bytes(str)`  
 `string.trim(str, charsToTrim=' \t\r\n')`  
 `table.empty`  
 `table.map(func, ...)`  
-`table.mapk(func, ...)`  
 `table.map_list(func, ...)`  
-`table.mapi_list(func, ...)`  
 `table.swap(tbl)`  
 `table.reverse(list)`  
 `table.islist(list)`  
@@ -181,39 +163,41 @@ WIP
 ## Type Conversion
 When a TorqueScript function is called from Lua or vice-versa, the arguments and return value must be converted between the two languages' type systems.  
 TorqueScript stores no type information; all values in TorqueScript are strings. So it's necessary to make some inferences when converting values between the two languages.  
-
+### From TorqueScript to Lua
+- Any numeric value becomes a Lua `number`, except as specified with `bl.type`, which may convert a value into a `boolean` or a Torque object container.  
+- The empty string "" becomes `nil`  
+- A string containing three numbers separated by spaces becomes a `vector`  
+- A string containing six numbers separated by spaces becomes a table of two vectors  
+- Any other string is passed directly as a `string`
 ### From Lua to TorqueScript
 - `nil` becomes the empty string ""  
 - `true` and `false` become "1" and "0" respectively  
-- A Torque object container becomes its object ID  
+- Torque containers become their object ID  
 - A `vector` becomes a string containing three numbers separated by spaces  
-- A table of two `vector`s becomes a string containing six numbers separated by spaces  
+- A table of two vectors becomes a string containing six numbers separated by spaces  
-- (WIP) A `matrix` is converted into an axis-angle (a "transform"), a string containing seven numbers separated by spaces  
 - Any `string` is passed directly as a string  
 - Tables cannot be passed and will throw an error  
 
-### From TorqueScript to Lua
-- The empty string "" becomes `nil`  
-- Any numeric value becomes a Lua `number`, except as specified with `bl.type`, which may convert a value into a `boolean` or a Torque object container.  
-- A string containing two or three numbers separated by single spaces becomes a `vector`  
-- A string containing six numbers separated by single spaces becomes a table of two vectors, usually defining the corners a bounding box  
-- (WIP) A string containing seven numbers separated by single spaces is treated as an axis-angle (a "transform"), and is converted into a `matrix` representing the translation and rotation  
-- Any other string is passed directly as a `string`  
-  
-For scenarios where the automatic TorqueScript->Lua conversion rules are insufficient or incorrect, use `bl.type`.  
-To convert things by hand, use `bl.object`, `bl.boolean`, or `bl.string`.
-
 ## I/O and Safety
 All Lua code is sandboxed, and file access is confined to the default directories in the same way TorqueScript is.  
 BlockLua also has access to any C libraries installed in the `modules/lualib` folder, so be careful throwing things in there.  
 ### Unsafe Mode
 BlockLua can be built in Unsafe Mode by specifying the `-DBLLUA_UNSAFE` compiler flag. This removes the sandboxing of Lua code, allowing it to access any file and use any library, including ffi.  
-A more limited option is `-DBLLUA_ALLOWFFI`, which allows the use of the `ffi` library. This can still be exploited to grant all the same access as full unsafe mode.  
+Please do not publish add-ons that require unsafe mode.  
-Please do not publish add-ons that require either of these.  
+
+### List of Object Types
+`'all'` - Any object  
+`'player'` - Players or bots  
+`'item'` - Items  
+`'vehicle'` - Vehicles  
+`'projectile'` - Projectiles  
+`'brick'` - Bricks with raycasting enabled  
+`'brickalways'` - All bricks including those with raycasting disabled  
+Other types: `'static'`, `'environment'`, `'terrain'`, `'water'`, `'trigger'`, `'marker'`, `'gamebase'`, `'shapebase'`, `'camera'`, `'staticshape'`, `'vehicleblocker'`, `'explosion'`, `'corpse'`, `'debris'`, `'physicalzone'`, `'staticts'`, `'staticrendered'`, `'damagableitem'`  
 
 ## Compiling
 
 With any *32-bit* variant of GCC installed (such as MinGW or MSYS2), run the following command in the repo directory:  
-`g++ src/bllua4.cpp -o BlockLua.dll -m32 -shared -static-libgcc -Isrc -Iinc/tsfuncs -Iinc/lua -lpsapi -L. -llua5.1`  
+`g++ src/bllua4.cpp -o BlockLua.dll -m32 -shared -static-libgcc -Isrc -Iinc/tsfuncs -Iinc/lua -lpsapi -L. -llua5.1 src/bllua`  
 
 LuaJIT (lua5.1.dll) can be obtained from https://luajit.org/  

src/bllua4.cpp

@@ -1,4 +1,4 @@
-// BlockLua (bllua4): Advanced Lua interface for TorqueScript
+// BlockLua (bllua4): Simple Lua interface for TorqueScript
 
 // Includes
 
@@ -28,7 +28,6 @@ INCLUDE_BIN(bll_fileLuaEnv    , "lua-env.lua");
 INCLUDE_BIN(bll_fileTsEnv     , "ts-env.cs" );
 INCLUDE_BIN(bll_fileLuaStd        , "util/std.lua");
 INCLUDE_BIN(bll_fileLuaVector     , "util/vector.lua");
-INCLUDE_BIN(bll_fileLuaMatrix     , "util/matrix.lua");
 INCLUDE_BIN(bll_fileLuaLibts      , "util/libts-lua.lua");
 INCLUDE_BIN(bll_fileTsLibts       , "util/libts-ts.cs");
 INCLUDE_BIN(bll_fileLuaLibbl      , "util/libbl.lua" );
@@ -57,26 +56,21 @@ bool init() {
 	
 	// Set up Lua environment
 	BLL_LOAD_LUA(gL, bll_fileLuaEnv);
-	#ifdef BLLUA_ALLOWFFI
-		lua_pushboolean(gL, true);
-		lua_setglobal(gL, "_bllua_allowffi");
-	#endif
 	#ifndef BLLUA_UNSAFE
 		BLL_LOAD_LUA(gL, bll_fileLuaEnvSafe);
 	#endif
 	
-	// Load utilities in Lua
-	BLL_LOAD_LUA(gL, bll_fileLuaStd);
-	BLL_LOAD_LUA(gL, bll_fileLuaVector);
-	BLL_LOAD_LUA(gL, bll_fileLuaMatrix);
-	BLL_LOAD_LUA(gL, bll_fileLuaLibts);
-	BLL_LOAD_LUA(gL, bll_fileLuaLibbl);
-	BLL_LOAD_LUA(gL, bll_fileLuaLibblTypes);
-	
 	// Expose Lua API to TS
 	BlAddFunction(NULL, NULL, "_bllua_luacall", bll_ts_luacall, "LuaCall(name, ...) - Call Lua function and return result", 2, 20);
 	BlEval(bll_fileTsEnv);
+	
+	// Load utilities
+	BLL_LOAD_LUA(gL, bll_fileLuaStd);
+	BLL_LOAD_LUA(gL, bll_fileLuaVector);
+	BLL_LOAD_LUA(gL, bll_fileLuaLibts);
 	BlEval(bll_fileTsLibts);
+	BLL_LOAD_LUA(gL, bll_fileLuaLibbl);
+	BLL_LOAD_LUA(gL, bll_fileLuaLibblTypes);
 	BlEval(bll_fileTsLibblSupport);
 	BlEval(bll_fileLoadaddons);
 	
@@ -89,7 +83,8 @@ bool init() {
 bool deinit() {
 	BlPrintf("BlockLua: Unloading");
 	
-	BlEval("$_bllua_active=0;deactivatePackage(_bllua_main);");
+	BlEval("deactivatePackage(_bllua_main);");
+	BlEval("$_bllua_active = 0;");
 	bll_LuaEval(gL, "for _,f in pairs(_bllua_on_unload) do f() end");
 	
 	lua_close(gL);

src/lua-env-safe.lua

@@ -4,7 +4,9 @@
 
 
 -- Utility: Convert a list of strings into a map of string->true
-local function tmap(t) local u = {}; for _, n in ipairs(t) do u[n] = true end; return u; end
+local function tmap(t)
+  local u = {}; for _, n in ipairs(t) do u[n] = true end; return u;
+end
 
 -- Save banned global variables for wrapping with safe functions
 local old_io = io
@@ -12,100 +14,102 @@ local old_require = require
 local old_os = os
 local old_debug = debug
 local old_package = package
-local old_allowffi = _bllua_allowffi
 
 -- Remove all global variables except a whitelist
 local ok_names = tmap {
-	'_G', '_bllua_ts', '_bllua_on_unload', '_bllua_on_error',
+  '_G', '_bllua_ts', '_bllua_on_unload', '_bllua_on_error',
-	'string', 'table', 'math', 'coroutine', 'bit',
+  'string', 'table', 'math', 'coroutine', 'bit',
-	'pairs', 'ipairs', 'next', 'unpack', 'select',
+  'pairs', 'ipairs', 'next', 'unpack', 'select',
-	'error', 'assert', 'pcall', 'xpcall',
+  'error', 'assert', 'pcall', 'xpcall',
-	'type', 'tostring', 'tonumber',
+  'type', 'tostring', 'tonumber',
-	'loadstring',
+  'loadstring',
-	'getmetatable', 'setmetatable',
+  'getmetatable', 'setmetatable',
-	'rawget', 'rawset', 'rawequal', 'rawlen',
+  'rawget', 'rawset', 'rawequal', 'rawlen',
-	'module', '_VERSION',
+  'module', '_VERSION',
 }
 local not_ok_names = {}
 for n, _ in pairs(_G) do
-	if not ok_names[n] then
+  if not ok_names[n] then
-		table.insert(not_ok_names, n)
+    table.insert(not_ok_names, n)
-	end
+  end
 end
 for _, n in ipairs(not_ok_names) do
-	_G[n] = nil
+  _G[n] = nil
 end
 
 -- Sanitize file paths to point only to allowed files within the game directory
 -- List of allowed directories for reading/writing
--- modules/lualib is also allowed as read-only
 local allowed_dirs = tmap {
-	'add-ons', 'base', 'config', 'saves', 'screenshots', 'shaders'
+  'add-ons', 'base', 'config', 'saves', 'screenshots', 'shaders'
+}
+-- List of allowed directories for reading only
+local allowed_dirs_readonly = tmap {
+  'lualib'
 }
 -- List of disallowed file extensions - basically executable file extensions
 -- Note that even without this protection, exploiting would still require somehow
 --   getting a file within the allowed directories to autorun,
 --   so this is just a precaution.
 local disallowed_exts = tmap {
-	-- windows
+  -- windows
-	'bat','bin','cab','cmd','com','cpl','ex_','exe','gadget','inf','ins','inx','isu',
+  'bat', 'bin', 'cab', 'cmd', 'com', 'cpl', 'ex_', 'exe', 'gadget', 'inf', 'ins', 'inx', 'isu',
-	'job','jse','lnk','msc','msi','msp','mst','paf','pif','ps1','reg','rgs','scr',
+  'job', 'jse', 'lnk', 'msc', 'msi', 'msp', 'mst', 'paf', 'pif', 'ps1', 'reg', 'rgs', 'scr',
-	'sct','shb','shs','u3p','vb','vbe','vbs','vbscript','ws','wsf','wsh',
+  'sct', 'shb', 'shs', 'u3p', 'vb', 'vbe', 'vbs', 'vbscript', 'ws', 'wsf', 'wsh',
-	-- linux
+  -- linux
-	'csh','ksh','out','run','sh',
+  'csh', 'ksh', 'out', 'run', 'sh',
-	-- mac/other
+  -- mac/other
-	'action','apk','app','command','ipa','osx','prg','workflow',
+  'action', 'apk', 'app', 'command', 'ipa', 'osx', 'prg', 'workflow',
 }
 -- Arguments: file name (relative to game directory), boolean true if only reading
 -- Return: clean file path if allowed (or nil if disallowed),
 --         error string (or nil if allowed)
 local function safe_path(fn, readonly)
-	fn = fn:gsub('\\', '/')
+  fn = fn:gsub('\\', '/')
-	fn = fn:gsub('^ +', '')
+  fn = fn:gsub('^ +', '')
-	fn = fn:gsub(' +$', '')
+  fn = fn:gsub(' +$', '')
-	-- whitelist characters
+  -- whitelist characters
-	local ic = fn:find('[^a-zA-Z0-9_%-/ %.]')
+  local ic = fn:find('[^a-zA-Z0-9_%-/ %.]')
-	if ic then
+  if ic then
-		return nil, 'Filename \''..fn..'\' contains invalid character \''..
+    return nil, 'Filename \'' .. fn .. '\' contains invalid character \'' ..
-			fn:sub(ic, ic)..'\' at position '..ic
+        fn:sub(ic, ic) .. '\' at position ' .. ic
-	end
+  end
-	-- disallow up-dirs, absolute paths, and relative paths
+  -- disallow up-dirs, absolute paths, and relative paths
-	-- './' and '../' are possible in scripts, because they're processed into
+  -- './' and '../' are possible in scripts, because they're processed into
-	-- absolute paths in util.lua before reaching here
+  -- absolute paths in util.lua before reaching here
-	if fn:find('^%.') or fn:find('%.%.') or fn:find(':') or fn:find('^/') then
+  if fn:find('^%.') or fn:find('%.%.') or fn:find(':') or fn:find('^/') then
-		return nil, 'Filename \''..fn..'\' contains invalid sequence'
+    return nil, 'Filename \'' .. fn .. '\' contains invalid sequence'
-	end
+  end
-	-- allow only whitelisted dirs
+  -- allow only whitelisted dirs
-	local dir = fn:match('^([^/]+)/')
+  local dir = fn:match('^([^/]+)/')
-	if not (dir and (
+  if (not dir) or (
-		allowed_dirs[dir:lower()] or
+        (not allowed_dirs[dir:lower()]) and
-		( readonly and fn:find('^modules/lualib/') ) ))
+        ((not readonly) or (not allowed_dirs_readonly[dir:lower()]))) then
-	then
+    return nil, 'filename is in disallowed directory ' .. (dir or 'nil')
-		return nil, 'File is in disallowed directory '..(dir or 'nil')
+  end
-	end
+  -- disallow blacklisted extensions or no extension
-	-- disallow blacklisted extensions
+  local ext = fn:match('%.([^/%.]+)$')
-	local ext = fn:match('%.([^/%.]+)$')
+  if (not ext) or (disallowed_exts[ext:lower()]) then
-	if ext and disallowed_exts[ext:lower()] then
+    return nil, 'Filename \'' .. fn .. '\' has disallowed extension \'' ..
-		return nil, 'Filename \''..fn..'\' has disallowed extension \''..
+        (ext or '') .. '\''
-			(ext or '')..'\''
+  end
-	end
+  return fn, nil
-	return fn, nil
 end
 
 -- Wrap io.open with path sanitization
 function _bllua_io_open(fn, md)
-	md = md or 'r'
+  md = md or 'r'
-	local readonly = md=='r' or md=='rb'
+  local readonly = md == 'r' or md == 'rb'
-	local fns, err = safe_path(fn, readonly)
+  local fns, err = safe_path(fn, readonly)
-	if fns then
+  if fns then
-		return old_io.open(fns, md)
+    return old_io.open(fns, md)
-	else
+  else
-		return nil, err
+    return nil, err
-	end
+  end
 end
+
 -- Allow io.type (works on file handles returned by io.open)
 function _bllua_io_type(f)
-	return old_io.type(f)
+  return old_io.type(f)
 end
 
 -- Wrap require with a blacklist for unsafe built-in modules
@@ -113,31 +117,30 @@ end
 -- Note that util.lua wraps this and provides 'require',
 --   only falling back here if the package is not found in user files
 local disallowed_packages = tmap {
-	'ffi', 'debug', 'package', 'io', 'os',
+  'ffi', 'debug', 'package', 'io', 'os',
-	'_bllua_ts',
+  '_bllua_ts',
 }
-if old_allowffi then disallowed_packages['ffi'] = nil end
 function _bllua_requiresecure(name)
-	if name:find('[^a-zA-Z0-9_%-%.]') or name:find('%.%.') or
+  if name:find('[^a-zA-Z0-9_%-%.]') or name:find('%.%.') or
-		name:find('^%.') or name:find('%.$') then
+      name:find('^%.') or name:find('%.$') then
-		error('require: package name contains invalid character', 3)
+    error('require: package name contains invalid character', 3)
-	elseif disallowed_packages[name] then
+  elseif disallowed_packages[name] then
-		error('require: attempt to require disallowed module \''..name..'\'', 3)
+    error('require: attempt to require disallowed module \'' .. name .. '\'', 3)
-	else
+  else
-		-- todo: reimplement require to not use package.* stuff?
+    -- todo: reimplement require to not use package.* stuff?
-		return old_require(name)
+    return old_require(name)
-	end
+  end
 end
+
 package = {
-	seeall = old_package.seeall,
+  seeall = old_package.seeall,
 }
 
 -- Provide limited debug
 debug = {
-	traceback = old_debug.traceback,
+  traceback = old_debug.traceback,
-	getinfo = old_debug.getinfo,
+  getinfo = old_debug.getinfo,
-	getfilename = old_debug.getfilename, -- defined in lua.env.lua
+  getfilename = old_debug.getfilename, -- defined in lua.env.lua
 }
 
-print = _bllua_ts.echo
+_bllua_ts.echo('  Executed bllua-env-safe.lua')
-print('  Executed bllua-env-safe.lua')

src/lua-env.lua

@@ -9,37 +9,32 @@ _bllua_on_unload = {}
 
 -- Utility for getting the current filename
 function debug.getfilename(level)
-	if type(level) == 'number' then level = level+1 end
+  if type(level) == 'number' then level = level + 1 end
-	local info = debug.getinfo(level)
+  local info = debug.getinfo(level)
-	if not info then return nil end
+  if not info then return nil end
-	local filename = info.source:match('^%-%-%[%[([^%]]+)%]%]')
+  local filename = info.source:match('^%-%-%[%[([^%]]+)%]%]')
-	return filename
+  return filename
 end
 
 -- Called when pcall fails on a ts->lua call, used to print detailed error info
 function _bllua_on_error(err)
-	err = err:match(': (.+)$') or err
+  err = err:match(': (.+)$') or err
-	local tracelines = {err}
+  local tracelines = { err }
-	local level = 2
+  local level = 2
-	while true do
+  while true do
-		local info = debug.getinfo(level)
+    local info = debug.getinfo(level)
-		if not info then break end
+    if not info then break end
-		local filename = debug.getfilename(level) or info.short_src
+    local filename = debug.getfilename(level) or info.short_src
-		local funcname = info.name
+    local funcname = info.name
-		if funcname=='dofile' then break end
+    if funcname == 'dofile' then break end
-		table.insert(tracelines, string.format('%s:%s in function \'%s\'',
+    table.insert(tracelines, string.format('%s:%s in function \'%s\'',
-			filename,
+      filename,
-			info.currentline==-1 and '' or info.currentline..':',
+      info.currentline == -1 and '' or info.currentline .. ':',
-			funcname
+      funcname
-		))
+    ))
-		level = level+1
+    level = level + 1
-	end
+  end
-	return table.concat(tracelines, '\n')
+  return table.concat(tracelines, '\n')
 end
 
--- overridden in lua-env-safe.lua (executed if not BLLUA_UNSAFE)
+_bllua_ts.echo('  Executed bllua-env.lua')
-_bllua_io_open = io.open
-_bllua_requiresecure = require
-
-print = _bllua_ts.echo
-print('  Executed bllua-env.lua')

src/util/libbl-support.cs

@@ -42,26 +42,4 @@ package _bllua_objectDeletionHook {
 };
 activatePackage(_bllua_objectDeletionHook);
 
-// Public Lua library for TS
-function luacall(%func, %a,%b,%c,%d,%e,%f,%g,%h,%i,%j,%k,%l,%m,%n,%o,%p) {
-	if($_bllua_active)
-		return _bllua_luacall("_bllua_call", %func, %a,%b,%c,%d,%e,%f,%g,%h,%i,%j,%k,%l,%m,%n,%o,%p);
-}
-function luaexec(%fn) {
-	if($_bllua_active)
-		return _bllua_luacall("_bllua_exec", %fn);
-}
-function luaeval(%code) {
-	if($_bllua_active)
-		return _bllua_luacall("_bllua_eval", %code);
-}
-function luaget(%name) {
-	if($_bllua_active)
-		return _bllua_luacall("_bllua_getvar", %name);
-}
-function luaset(%name, %val) {
-	if($_bllua_active)
-		_bllua_luacall("_bllua_setvar", %name, %val);
-}
-
 echo("  Executed libbl-support.cs");

src/util/libbl-types.lua

@@ -4,129 +4,129 @@
 
 -- Class hierarchy, adapted from https://notabug.org/Queuenard/blockland-DLL-tools/src/master/class_hierarchy
 bl.class('SimObject')
-	bl.class('ScriptObject', 'SimObject')
+bl.class('ScriptObject', 'SimObject')
-	bl.class('SimSet', 'SimObject')
+bl.class('SimSet', 'SimObject')
-		bl.class('SimGroup', 'SimSet')
+bl.class('SimGroup', 'SimSet')
-			bl.class('GuiControl', 'SimGroup')
+bl.class('GuiControl', 'SimGroup')
-				bl.class('GuiTextCtrl'         , 'GuiControl')
+bl.class('GuiTextCtrl', 'GuiControl')
-				bl.class('GuiSwatchCtrl'       , 'GuiControl')
+bl.class('GuiSwatchCtrl', 'GuiControl')
-				bl.class('GuiButtonBaseCtrl'   , 'GuiControl')
+bl.class('GuiButtonBaseCtrl', 'GuiControl')
-				bl.class('GuiArrayCtrl'        , 'GuiControl')
+bl.class('GuiArrayCtrl', 'GuiControl')
-				bl.class('GuiScrollCtrl'       , 'GuiControl')
+bl.class('GuiScrollCtrl', 'GuiControl')
-				bl.class('GuiMouseEventCtrl'   , 'GuiControl')
+bl.class('GuiMouseEventCtrl', 'GuiControl')
-				bl.class('GuiProgressCtrl'     , 'GuiControl')
+bl.class('GuiProgressCtrl', 'GuiControl')
-				bl.class('GuiSliderCtrl'       , 'GuiControl')
+bl.class('GuiSliderCtrl', 'GuiControl')
-				bl.class('GuiConsoleTextCtrl'  , 'GuiControl')
+bl.class('GuiConsoleTextCtrl', 'GuiControl')
-				bl.class('GuiTSCtrl'           , 'GuiControl')
+bl.class('GuiTSCtrl', 'GuiControl')
-					bl.class('GuiObjectView', 'GuiTSCtrl')
+bl.class('GuiObjectView', 'GuiTSCtrl')
-					bl.class('GameTSCtrl'   , 'GuiTSCtrl')
+bl.class('GameTSCtrl', 'GuiTSCtrl')
-					bl.class('EditTSCtrl'   , 'GuiTSCtrl')
+bl.class('EditTSCtrl', 'GuiTSCtrl')
-					bl.class('GuiPlayerView', 'GuiTSCtrl')
+bl.class('GuiPlayerView', 'GuiTSCtrl')
-				bl.class('GuiShapeNameHud'     , 'GuiControl')
+bl.class('GuiShapeNameHud', 'GuiControl')
-				bl.class('GuiHealthBarHud'     , 'GuiControl')
+bl.class('GuiHealthBarHud', 'GuiControl')
-				bl.class('GuiGraphCtrl'        , 'GuiControl')
+bl.class('GuiGraphCtrl', 'GuiControl')
-				bl.class('GuiInspector'        , 'GuiControl')
+bl.class('GuiInspector', 'GuiControl')
-				bl.class('GuiChunkedBitmapCtrl', 'GuiControl')
+bl.class('GuiChunkedBitmapCtrl', 'GuiControl')
-				bl.class('GuiInputCtrl'        , 'GuiControl')
+bl.class('GuiInputCtrl', 'GuiControl')
-				bl.class('GuiNoMouseCtrl'      , 'GuiControl')
+bl.class('GuiNoMouseCtrl', 'GuiControl')
-				bl.class('GuiBitmapBorderCtrl' , 'GuiControl')
+bl.class('GuiBitmapBorderCtrl', 'GuiControl')
-				bl.class('GuiBackgroundCtrl'   , 'GuiControl')
+bl.class('GuiBackgroundCtrl', 'GuiControl')
-				bl.class('GuiEditorRuler'      , 'GuiControl')
+bl.class('GuiEditorRuler', 'GuiControl')
-				bl.class('GuiClockHud'         , 'GuiControl')
+bl.class('GuiClockHud', 'GuiControl')
-				bl.class('GuiEditCtrl'         , 'GuiControl')
+bl.class('GuiEditCtrl', 'GuiControl')
-				bl.class('GuiFilterCtrl'       , 'GuiControl')
+bl.class('GuiFilterCtrl', 'GuiControl')
-				bl.class('GuiFrameSetCtrl'     , 'GuiControl')
+bl.class('GuiFrameSetCtrl', 'GuiControl')
-				bl.class('GuiMenuBar'          , 'GuiControl')
+bl.class('GuiMenuBar', 'GuiControl')
-				bl.class('GuiMessageVectorCtrl', 'GuiControl')
+bl.class('GuiMessageVectorCtrl', 'GuiControl')
-				bl.class('GuiBitmapCtrl'       , 'GuiControl')
+bl.class('GuiBitmapCtrl', 'GuiControl')
-					bl.class('GuiCrossHairHud', 'GuiBitmapCtrl')
+bl.class('GuiCrossHairHud', 'GuiBitmapCtrl')
-			bl.class('ScriptGroup', 'SimGroup')
+bl.class('ScriptGroup', 'SimGroup')
-			bl.class('NetConnection', 'SimGroup')
+bl.class('NetConnection', 'SimGroup')
-				bl.class('GameConnection', 'NetConnection')
+bl.class('GameConnection', 'NetConnection')
-			bl.class('Path', 'SimGroup')
+bl.class('Path', 'SimGroup')
-	bl.class('TCPObject', 'SimObject')
+bl.class('TCPObject', 'SimObject')
-		bl.class('SOCKObject', 'TCPObject')
+bl.class('SOCKObject', 'TCPObject')
-		bl.class('HTTPObject', 'TCPObject')
+bl.class('HTTPObject', 'TCPObject')
-	bl.class('SimDataBlock', 'SimObject')
+bl.class('SimDataBlock', 'SimObject')
-		bl.class('AudioEnvironment'      , 'SimDataBlock')
+bl.class('AudioEnvironment', 'SimDataBlock')
-		bl.class('AudioSampleEnvironment', 'SimDataBlock')
+bl.class('AudioSampleEnvironment', 'SimDataBlock')
-		bl.class('AudioDescription'      , 'SimDataBlock')
+bl.class('AudioDescription', 'SimDataBlock')
-		bl.class('GameBaseData'          , 'SimDataBlock')
+bl.class('GameBaseData', 'SimDataBlock')
-			bl.class('ShapeBaseData'          , 'GameBaseData')
+bl.class('ShapeBaseData', 'GameBaseData')
-				bl.class('CameraData'       , 'ShapeBaseData')
+bl.class('CameraData', 'ShapeBaseData')
-				bl.class('ItemData'         , 'ShapeBaseData')
+bl.class('ItemData', 'ShapeBaseData')
-				bl.class('MissionMarkerData', 'ShapeBaseData')
+bl.class('MissionMarkerData', 'ShapeBaseData')
-				bl.class('PathCameraData'   , 'ShapeBaseData')
+bl.class('PathCameraData', 'ShapeBaseData')
-				bl.class('PlayerData'       , 'ShapeBaseData')
+bl.class('PlayerData', 'ShapeBaseData')
-				bl.class('StaticShapeData'  , 'ShapeBaseData')
+bl.class('StaticShapeData', 'ShapeBaseData')
-				bl.class('VehicleData'      , 'ShapeBaseData')
+bl.class('VehicleData', 'ShapeBaseData')
-					bl.class('FlyingVehicleData' , 'VehicleData')
+bl.class('FlyingVehicleData', 'VehicleData')
-					bl.class('WheeledVehicleData', 'VehicleData')
+bl.class('WheeledVehicleData', 'VehicleData')
-			bl.class('DebrisData'             , 'GameBaseData')
+bl.class('DebrisData', 'GameBaseData')
-			bl.class('ProjectileData'         , 'GameBaseData')
+bl.class('ProjectileData', 'GameBaseData')
-			bl.class('ShapeBaseImageData'     , 'GameBaseData')
+bl.class('ShapeBaseImageData', 'GameBaseData')
-			bl.class('TriggerData'            , 'GameBaseData')
+bl.class('TriggerData', 'GameBaseData')
-			bl.class('ExplosionData'          , 'GameBaseData')
+bl.class('ExplosionData', 'GameBaseData')
-			bl.class('fxLightData'            , 'GameBaseData')
+bl.class('fxLightData', 'GameBaseData')
-			bl.class('LightningData'          , 'GameBaseData')
+bl.class('LightningData', 'GameBaseData')
-			bl.class('ParticleEmitterNodeData', 'GameBaseData')
+bl.class('ParticleEmitterNodeData', 'GameBaseData')
-			bl.class('SplashData'             , 'GameBaseData')
+bl.class('SplashData', 'GameBaseData')
-			bl.class('fxDTSBrickData'         , 'GameBaseData')
+bl.class('fxDTSBrickData', 'GameBaseData')
-			bl.class('ParticleEmitterData'    , 'GameBaseData')
+bl.class('ParticleEmitterData', 'GameBaseData')
-		bl.class('WheeledVehicleTire'    , 'SimDataBlock')
+bl.class('WheeledVehicleTire', 'SimDataBlock')
-		bl.class('WheeledVehicleSpring'  , 'SimDataBlock')
+bl.class('WheeledVehicleSpring', 'SimDataBlock')
-		bl.class('TSShapeConstructor'    , 'SimDataBlock')
+bl.class('TSShapeConstructor', 'SimDataBlock')
-		bl.class('AudioProfile'          , 'SimDataBlock')
+bl.class('AudioProfile', 'SimDataBlock')
-		bl.class('ParticleData'          , 'SimDataBlock')
+bl.class('ParticleData', 'SimDataBlock')
-	bl.class('MaterialPropertyMap', 'SimObject')
+bl.class('MaterialPropertyMap', 'SimObject')
-	bl.class('NetObject', 'SimObject')
+bl.class('NetObject', 'SimObject')
-		bl.class('SceneObject', 'NetObject')
+bl.class('SceneObject', 'NetObject')
-			bl.class('GameBase', 'SceneObject')
+bl.class('GameBase', 'SceneObject')
-				bl.class('ShapeBase', 'GameBase')
+bl.class('ShapeBase', 'GameBase')
-					bl.class('MissionMarker', 'ShapeBase')
+bl.class('MissionMarker', 'ShapeBase')
-						bl.class('SpawnSphere'       , 'MissionMarker')
+bl.class('SpawnSphere', 'MissionMarker')
-						bl.class('VehicleSpawnMarker', 'MissionMarker')
+bl.class('VehicleSpawnMarker', 'MissionMarker')
-						bl.class('Waypoint'          , 'MissionMarker')
+bl.class('Waypoint', 'MissionMarker')
-					bl.class('StaticShape'  , 'ShapeBase')
+bl.class('StaticShape', 'ShapeBase')
-						bl.class('ScopeAlwaysShape', 'StaticShape')
+bl.class('ScopeAlwaysShape', 'StaticShape')
-					bl.class('Player'       , 'ShapeBase')
+bl.class('Player', 'ShapeBase')
-						bl.class('AIPlayer', 'Player')
+bl.class('AIPlayer', 'Player')
-					bl.class('Camera'       , 'ShapeBase')
+bl.class('Camera', 'ShapeBase')
-					bl.class('Item'         , 'ShapeBase')
+bl.class('Item', 'ShapeBase')
-					bl.class('PathCamera'   , 'ShapeBase')
+bl.class('PathCamera', 'ShapeBase')
-					bl.class('Vehicle'      , 'ShapeBase')
+bl.class('Vehicle', 'ShapeBase')
-						bl.class('FlyingVehicle' , 'Vehicle')
+bl.class('FlyingVehicle', 'Vehicle')
-						bl.class('WheeledVehicle', 'Vehicle')
+bl.class('WheeledVehicle', 'Vehicle')
-				bl.class('Explosion'          , 'GameBase')
+bl.class('Explosion', 'GameBase')
-				bl.class('Splash'             , 'GameBase')
+bl.class('Splash', 'GameBase')
-				bl.class('Debris'             , 'GameBase')
+bl.class('Debris', 'GameBase')
-				bl.class('Projectile'         , 'GameBase')
+bl.class('Projectile', 'GameBase')
-				bl.class('Trigger'            , 'GameBase')
+bl.class('Trigger', 'GameBase')
-				bl.class('fxLight'            , 'GameBase')
+bl.class('fxLight', 'GameBase')
-				bl.class('Lightning'          , 'GameBase')
+bl.class('Lightning', 'GameBase')
-				bl.class('ParticleEmitterNode', 'GameBase')
+bl.class('ParticleEmitterNode', 'GameBase')
-				bl.class('ParticleEmitter'    , 'GameBase')
+bl.class('ParticleEmitter', 'GameBase')
-				bl.class('Precipitation'      , 'GameBase')
+bl.class('Precipitation', 'GameBase')
-			bl.class('TSStatic'      , 'SceneObject')
+bl.class('TSStatic', 'SceneObject')
-			bl.class('VehicleBlocker', 'SceneObject')
+bl.class('VehicleBlocker', 'SceneObject')
-			bl.class('Marker'        , 'SceneObject')
+bl.class('Marker', 'SceneObject')
-			bl.class('AudioEmitter'  , 'SceneObject')
+bl.class('AudioEmitter', 'SceneObject')
-			bl.class('PhysicalZone'  , 'SceneObject')
+bl.class('PhysicalZone', 'SceneObject')
-			bl.class('fxDayCycle'    , 'SceneObject')
+bl.class('fxDayCycle', 'SceneObject')
-			bl.class('fxDTSBrick'    , 'SceneObject')
+bl.class('fxDTSBrick', 'SceneObject')
-			bl.class('fxPlane'       , 'SceneObject')
+bl.class('fxPlane', 'SceneObject')
-			bl.class('fxSunLight'    , 'SceneObject')
+bl.class('fxSunLight', 'SceneObject')
-			bl.class('Sky'           , 'SceneObject')
+bl.class('Sky', 'SceneObject')
-			bl.class('SceneRoot'     , 'SceneObject')
+bl.class('SceneRoot', 'SceneObject')
-		bl.class('Sun', 'NetObject')
+bl.class('Sun', 'NetObject')
-	bl.class('GuiCursor', 'SimObject')
+bl.class('GuiCursor', 'SimObject')
-	bl.class('ConsoleLogger'    , 'SimObject')
+bl.class('ConsoleLogger', 'SimObject')
-	bl.class('QuotaObject'      , 'SimObject')
+bl.class('QuotaObject', 'SimObject')
-	bl.class('FileObject'       , 'SimObject')
+bl.class('FileObject', 'SimObject')
-	bl.class('BanList'          , 'SimObject')
+bl.class('BanList', 'SimObject')
-	bl.class('GuiControlProfile', 'SimObject')
+bl.class('GuiControlProfile', 'SimObject')
-	bl.class('MessageVector'    , 'SimObject')
+bl.class('MessageVector', 'SimObject')
-	bl.class('ActionMap'        , 'SimObject')
+bl.class('ActionMap', 'SimObject')
 
 -- Auto-generated from game scripts
 bl.type('ActionMap::blockBind:1', 'object')

src/util/libbl.lua

@@ -2,36 +2,23 @@
 -- Main lua-side functionality of bllua,
 -- provided through the global table 'bl.'
 
+-- todo: set
+
 local _bllua_ts = ts
 
 bl = bl or {}
 
--- Config
-local tsMaxArgs = 16
-local tsArgsLocal = '%a,%b,%c,%d,%e,%f,%g,%h,%i,%j,%k,%l,%m,%n,%o,%p'
-local tsArgsGlobal = 
-	'$_bllua_hook_arg1,$_bllua_hook_arg2,$_bllua_hook_arg3,$_bllua_hook_arg4,'..
-	'$_bllua_hook_arg5,$_bllua_hook_arg6,$_bllua_hook_arg7,$_bllua_hook_arg8,'..
-	'$_bllua_hook_arg9,$_bllua_hook_arg10,$_bllua_hook_arg11,$_bllua_hook_arg12,'..
-	'$_bllua_hook_arg13,$_bllua_hook_arg14,$_bllua_hook_arg15,$_bllua_hook_arg16'
-
 -- Misc
-local function ipairsNilable(t)
+-- Apply a function to each element in a list, building a new list from the returns
-	local maxk = 0
+local function map(t,f)
-	for k,_ in pairs(t) do
+	local u = {}
-		if k>maxk then maxk = k end
+	for i,v in ipairs(t) do
-	end
+		u[i] = f(v)
-	local i = 0
-	return function()
-		i = i+1
-		if i>maxk then return nil
-		else return i, t[i] end
 	end
+	return u
 end
-
--- Validation
 local function isValidFuncName(name)
-	return type(name)=='string' and name:find('^[a-zA-Z_][a-zA-Z0-9_]*$')
+	return type(name)=='string' and name:find('^[a-zA-Z0-9_]+$')
 end
 local function isValidFuncNameNs(name)
 	return type(name)=='string' and (
@@ -89,7 +76,7 @@ for k,v in pairs(tsTypesByName) do
 	tsTypesByNum[v] = k
 end
 
--- Type conversion from Lua to TS
+-- Type conversion
 local toTsObject
 -- Convert a string from TS into a boolean
 -- Note: Nonempty nonnumeric strings evaluate to 1, unlike in TS
@@ -113,77 +100,35 @@ local function valToTs(val)
 			-- box - > 6 numbers
 			return table.concat(val[1], ' ')..' '..table.concat(val[2], ' ')
 		else
-			error('valToTs: cannot pass Lua tables to TorqueScript.', 3)
+			error('valToTs: could not convert table', 3)
 		end
 	else
-		error('valToTs: could not convert value to TorqueScript: '..tostring(val), 3)
+		error('valToTs: could not convert '..type(val), 3)
 	end
 end
-
--- Type conversion from TS to Lua
 local fromTsForceTypes = {
-	['boolean'] = function(val) return tsBool(val) end,
+	['boolean'] = tsBool,
-	['object'] = function(val) return toTsObject(val) end, -- wrap because toTsObject not defined yet
+	['object'] = function(val) toTsObject(val) end, -- toTsObject not defined yet
-	['string'] = function(val) return val end,
+	['string'] = tostring,
 }
-local function forceValFromTs(val, typ)
+local function convertValFromTs(val, typ)
-	local func = fromTsForceTypes[typ]
+	return fromTsForceTypes[typ](val) or
-	if not func then error('valFromTs: invalid force type \''..typ..'\'', 4) end
+		error('valFromTs: invalid force type '..typ, 4)
-	return func(val)
-end
-local function vectorFromTs(val)
-	local xS,yS,zS = val:match('^(%-?[0-9%.e]+) (%-?[0-9%.e]+) (%-?[0-9%.e]+)$')
-	if xS then return vector{tonumber(xS),tonumber(yS),tonumber(zS)}
-	else return nil end
-end
-local function boxFromTs(val)
-	local x1S,y1S,z1S,x2S,y2S,z2S = val:match(
-		'^(%-?[0-9%.e]+) (%-?[0-9%.e]+) (%-?[0-9%.e]+) '..
-		'(%-?[0-9%.e]+) (%-?[0-9%.e]+) (%-?[0-9%.e]+)$')
-	if x1S then return {
-		vector{tonumber(x1S),tonumber(y1S),tonumber(z1S)},
-		vector{tonumber(x2S),tonumber(y2S),tonumber(z2S)} }
-	else return nil end
-end
-local function multinumericFromTs(val)
-	local tsNumPat = '%-?[0-9]+%.?[0-9]*e?[0-9]*'
-	if val:find('^'..tsNumPat) then
-		local nums = {}
-		for _,part in ipairs(val:split(' ')) do
-			if part:find('^'..tsNumPat..'$') then
-				table.insert(nums, tonumber(part))
-			else
-				return nil
-			end
-		end
-		if #nums==2 or #nums==3 then
-			return vector(nums)
-		elseif #nums==6 then -- box
-			return {
-				vector{nums[1], nums[2], nums[3]},
-				vector{nums[4], nums[5], nums[6]} }
-		elseif #nums==7 then -- axis
-			return nil --return matrix(nums)
-		else
-			return nil
-		end
-	end
 end
 bl._forceType = bl._forceType or {}
--- todo: ensure name and name2 are already lowercase
+local function valFromTs(val, name, name2) -- todo: ensure name and name2 are already lowercase
-local function valFromTs(val, name, name2)
 	if type(val)~='string' then
 		error('valFromTs: expected string, got '..type(val), 3) end
 	if name then
 		name = name:lower()
 		if bl._forceType[name] then
-			return forceValFromTs(val, bl._forceType[name])
+			return convertValFromTs(val, bl._forceType[name])
 		end
 	end
 	if name2 then
 		name2 = name2:lower()
 		if bl._forceType[name2] then
-			return forceValFromTs(val, bl._forceType[name2])
+			return convertValFromTs(val, bl._forceType[name2])
 		end
 	end
 	-- '' -> nil
@@ -191,29 +136,28 @@ local function valFromTs(val, name, name2)
 	-- number
 	local num = tonumber(val)
 	if num then return num end
-	-- vector, box, or axis->matrix
+	-- vector
-	local vec = multinumericFromTs(val)
+	local xS,yS,zS = val:match('^(%-?[0-9%.e]+) (%-?[0-9%.e]+) (%-?[0-9%.e]+)$')
-	if vec then return vec end
+	if xS then return vector{tonumber(xS),tonumber(yS),tonumber(zS)} end
-	-- net string
+	local x1S,y1S,z1S,x2S,y2S,z2S = val:match(
-	if val:sub(1,1)=='\x01' then
+		'^(%-?[0-9%.e]+) (%-?[0-9%.e]+) (%-?[0-9%.e]+) '..
-		return _bllua_ts.call('getTaggedString', val)
+		'(%-?[0-9%.e]+) (%-?[0-9%.e]+) (%-?[0-9%.e]+)$')
-	end
+	-- box (2 vectors)
+	if x1S then return {
+		vector{tonumber(x1S),tonumber(y1S),tonumber(z1S)},
+		vector{tonumber(x2S),tonumber(y2S),tonumber(z2S)} } end
 	-- string
 	return val
 end
 local function arglistFromTs(name, argsS)
 	local args = {}
-	for i,arg in ipairsNilable(argsS) do
+	for i,arg in ipairs(argsS) do
 		args[i] = valFromTs(arg, name..':'..i)
 	end
 	return args
 end
 local function arglistToTs(args)
-	local argsS = {}
+	return map(args, valToTs)
-	for i,v in ipairsNilable(args) do
-		table.insert(argsS, valToTs(v))
-	end
-	return argsS
 end
 local function classFromForceTypeStr(name)
 	local class, rest = name:match('^([a-zA-Z0-9_]+)(::.+)$')
@@ -245,33 +189,13 @@ setForceType = function(ftname, typ)
 end
 bl.type = setForceType
 
--- Type conversion TS->Lua backwards, convert back to string
-local function numFromTsTostring(val)
-	-- todo: as-good-as-possible scientific notation for numbers
-	return tostring(val)
-end
-local function valFromTsTostring(val)
-	if type(val)=='string' then
-		return val
-	elseif type(val)=='number' then
-		return numFromTsTostring(val)
-	elseif type(val)=='table' then
-		if val.__is_vector then
-			local strs = {}
-			for i=1,#val do strs[i] = numFromTsTostring(val[i]) end
-			return table.concat(strs, ' ')
-		elseif val.__is_matrix then
-			-- todo: matrix back to axis-angle string
-			error('bl.string: matrix not yet supported', 3)
-		end
-	end
-	error('bl.string: cannot convert \''..type(val)..'\'', 3)
-end
 
--- Getting info from TS about functions and objects
+-- Value detection
+
 local function isTsObject(t)
 	return type(t)=='table' and t._tsObjectId~=nil
 end
+
 local function tsIsObject(name) return tsBool(_bllua_ts.call('isObject', name)) end
 local function tsIsFunction(name) return tsBool(_bllua_ts.call('isFunction', name)) end
 local function tsIsFunctionNs(ns, name) return tsBool(_bllua_ts.call('isFunction', ns, name)) end
@@ -280,31 +204,27 @@ local function tsIsFunctionNsname(nsname)
 	if ns then return tsIsFunctionNs(ns, name)
 	else return tsIsFunction(nsname) end
 end
--- sanity check to make sure objects that don't isObject are always marked as ._deleted
+
--- can be removed later
-local function assertTsObjectExists(obj)
-	local is = tsIsObject(obj._tsObjectId)
-	if not is then
-		print('Warning: TS object :exists or isobject from lua but no longer exists') end
-	return is
-end
 function bl.isObject(obj)
-	if type(obj)=='number' then -- object id
+	if isTsObject(obj) then
-		return tsIsObject(tostring(obj))
+		obj = obj._tsObjectId
-	elseif type(obj)=='string' then -- object name
+	elseif type(obj)=='number' then
-		return tsIsObject(obj)
+		obj = tostring(obj)
-	elseif isTsObject(obj) then -- lua object
+	elseif type(obj)~='string' then
-		if obj._deleted then
-			return false
-		else
-			return assertTsObjectExists(obj)
-		end
-	else
 		error('bl.isObject: argument #1: expected torque object, number, or string', 2)
 	end
+	return tsIsObject(obj)
 end
-function bl.isFunction(name)
+function bl.isFunction(a1, a2)
-	return tsIsFunctionNsname(name)
+	if type(a1)~='string' then
+		error('bl.isFunction: argument #1: expected string', 2) end
+	if a2 then
+		if type(a2)~='string' then
+			error('bl.isFunction: argument #2: expected string', 2) end
+		return tsIsFunctionNs(a1, a2)
+	else
+		return tsIsFunction(a1)
+	end
 end
 
 -- Torque object pseudo-class
@@ -387,19 +307,17 @@ local tsObjectMeta = {
 				tsIsFunctionNs(rawget(t,'_tsNamespace'), name) or
 				tsIsFunctionNs(rawget(t,'_tsName'), name)
 			then
-				return function(t2, ...)
+				return function(t, ...)
-					if t2==nil or type(t2)~='table' or not t2._tsObjectId then
+					local args = {...}
-						error('ts object method: be sure to use :func() not .func()', 2) end
+					local argsS = arglistToTs(args)
-					local argsS = arglistToTs({...})
+					return valFromTs(
-					local res =
+						_bllua_ts.callobj(rawget(t,'_tsObjectId'), name, unpack(argsS)),
-						_bllua_ts.callobj(t2._tsObjectId, name, unpack(argsS))
+						rawget(t,'_tsName') and rawget(t,'_tsName')..'::'..name,
-					return valFromTs(res,
+						rawget(t,'_tsNamespace')..'::'..name)
-						t2._tsName and t2._tsName..'::'..name,
-						t2._tsNamespace..'::'..name)
 				end
 			else
-				local res = _bllua_ts.getfield(rawget(t,'_tsObjectId'), name)
+				return valFromTs(
-				return valFromTs(res,
+					_bllua_ts.getfield(rawget(t,'_tsObjectId'), name),
 					rawget(t,'_tsName') and rawget(t,'_tsName')..'.'..name,
 					rawget(t,'_tsNamespace')..'.'..name)
 			end
@@ -432,8 +350,7 @@ local tsObjectMeta = {
 	-- Display a nice info string
 	__tostring = function(t)
 		return 'torque:'..t._tsNamespace..':'..t._tsObjectId..
-			(t._tsName~='' and ('('..t._tsName..')') or '')..
+			(t._tsName~='' and ('('..t._tsName..')') or '')
-			(t._deleted and '(deleted)' or '')
 	end,
 	-- #object
 	-- If the object has a getCount method, return its count
@@ -464,8 +381,7 @@ local tsObjectMeta = {
 				local obj = toTsObject(_bllua_ts.callobj(t._tsObjectId,
 					'getObject', tostring(idx)))
 				idx = idx+1
-				--return idx-1, obj
+				return idx-1, obj
-				return obj
 			else
 				return nil
 			end
@@ -514,10 +430,8 @@ local tsObjectMeta = {
 		if t==nil then
 			error('ts object method: be sure to use :func() not .func()', 2) end
 		if t._deleted then
-			return false
+			return false end
-		else
+		return tsIsObject(t._tsObjectId)
-			return assertTsObjectExists(t)
-		end
 	end,
 }
 -- Weak-values table for caching Torque object references
@@ -550,7 +464,7 @@ toTsObject = function(idiS)
 	idiS = idiS:lower()
 	if bl._objectsWeak[idiS] then return bl._objectsWeak[idiS] end
 	
-	if not tsIsObject(idiS) then
+	if not tsBool(_bllua_ts.call('isObject', idiS)) then
 		--error('toTsObject: object \''..idiS..'\' does not exist', 2) end
 		return nil end
 	
@@ -572,13 +486,14 @@ end
 local function safeNamespaceName(name)
 	return tostring(name:gsub(':', '_'))
 end
+local nscallArgStr = '%a,%b,%c,%d,%e,%f,%g,%h'
 bl._cachedNamespaceCalls = {}
 local function tsNamespacedCallTfname(name)
 	local tfname = bl._cachedNamespaceCalls[name]
 	if not tfname then
 		tfname = '_bllua_nscall_'..safeNamespaceName(name)
-		local tfcode = 'function '..tfname..'('..tsArgsLocal..'){'..
+		local tfcode = 'function '..tfname..'('..nscallArgStr..'){'..
-			name..'('..tsArgsLocal..');}'
+			name..'('..nscallArgStr..');}'
 		_bllua_ts.eval(tfcode)
 		bl._cachedNamespaceCalls[name] = tfname
 	end
@@ -586,9 +501,9 @@ local function tsNamespacedCallTfname(name)
 end
 local function tsCallGen(name)
 	return function(...)
-		local argsS = arglistToTs({...})
+		local args = {...}
-		local res = _bllua_ts.call(name, unpack(argsS))
+		local argsS = arglistToTs(args)
-		return valFromTs(res, name)
+		return valFromTs(_bllua_ts.call(name, unpack(argsS)), name)
 	end
 end
 
@@ -614,16 +529,14 @@ local tsMeta = {
 				if not rest:find('::') and tsIsFunctionNs(ns, rest) then
 					return tsCallGen(tsNamespacedCallTfname(name))
 				else
-					local res = _bllua_ts.getvar(name)
+					return valFromTs(_bllua_ts.getvar(name), name)
-					return valFromTs(res, name)
 				end
 			elseif tsIsFunction(name) then
 				return tsCallGen(name)
 			elseif tsIsObject(name) then
 				return toTsObject(name)
 			else
-				local res = _bllua_ts.getvar(name)
+				return valFromTs(_bllua_ts.getvar(name), name)
-				return valFromTs(res, name)
 			end
 		end
 	end,
@@ -642,16 +555,10 @@ function bl.call(func, ...)
 	return _bllua_ts.call(func, unpack(argsS))
 end
 function bl.eval(code)
-	local res = _bllua_ts.eval(code)
+	return valFromTs(_bllua_ts.eval(code))
-	return valFromTs(res)
 end
 function bl.exec(file)
-	local res = _bllua_ts.call('exec', file)
+	return valFromTs(_bllua_ts.call('exec', file))
-	return valFromTs(res)
-end
-function bl.array(name, ...)
-	local rest = {...}
-	return name..table.concat(rest, '_')
 end
 function bl.boolean(val)
 	return val~=nil and
@@ -669,63 +576,18 @@ function bl.object(id)
 		error('bl.object: id must be a ts object, number, or string', 2)
 	end
 end
-function bl.string(val)
+function bl.array(name, ...)
-	return valFromTsTostring(val)
+	local rest = {...}
+	return name..table.concat(rest, '_')
 end
-
+function _bllua_call(fnameS, ...)
--- Lua calling from TS
+	local args = arglistFromTs('lua:'..fnameS:lower(), {...}) -- todo: allow this though bl.type
-local luaLookup
+	if not _G[fnameS] then
-luaLookup = function(tbl, name, set, val)
+		error('luacall: no global lua function named \''..fnameS..'\'') end
-	if name:find('%.') then
+	-- todo: library fields and object methods
-		local first, rest = name:match('^([^%.:]+)%.(.+)$')
+	local res = _G[fnameS](unpack(args))
-		if not isValidFuncName(first) then
-			error('luaLookup: invalid name \''..tostring(first)..'\'', 3) end
-		if tbl[first]==nil then
-			if set then tbl[first] = {}
-			else return nil end
-		end
-		return luaLookup(tbl[first], rest, set, val)
-	elseif name:find(':') then
-		local first, rest = name:match('^([^%.:]+):(.*)$')
-		if rest:find('[%.:]') then
-			error('luacall: cannot have : or . after :', 3) end
-		if not isValidFuncName(first) then
-			error('luacall: invalid name \''..tostring(first)..'\'', 3) end
-		if not isValidFuncName(rest) then
-			error('luacall: invalid method name \''..tostring(first)..'\'', 3) end
-		if not tbl[first] then
-			error('luacall: no object named \''..rest..'\'', 3) end
-		if tbl[first][rest]==nil then
-			error('luacall: no method named \''..rest..'\'', 3) end
-		return function(...)
-			tbl[first][rest](tbl[first], ...)
-		end
-	else
-		if set then
-			tbl[name] = val
-		else
-			return tbl[name]
-		end
-	end
-end
--- Todo: similar deep access for luaget and luaset
-function _bllua_call(fname, ...)
-	local args = arglistFromTs(fname:lower(), {...}) -- todo: separate lua from ts func names?
-	local func = luaLookup(_G, fname)
-	if not func then
-		error('luacall: no global in lua named \''..fname..'\'', 2) end
-	local res = func(unpack(args))
 	return valToTs(res)
 end
-function _bllua_getvar(vname)
-	return valToTs(luaLookup(_G, vname))
-end
-function _bllua_setvar(vname, valS)
-	return valToTs(luaLookup(_G, vname, true, valFromTs(valS, vname))) -- todo: separate lua from ts var names?
-end
-function _bllua_eval(code) return loadstring(code)() end
-function _bllua_exec(fn) return dofile(fn, 2) end
-
 
 -- bl.schedule: Use TS's schedule function to schedule lua calls
 -- bl.schedule(time, function, args...)
@@ -775,8 +637,9 @@ local function addCmd(cmd, func)
 	if not isValidFuncName(cmd) then
 		error('addCmd: invalid function name \''..tostring(cmd)..'\'') end
 	bl._cmds[cmd] = func
-	_bllua_ts.eval('function '..cmd..'('..tsArgsLocal..'){'..
+	local arglist = '%a,%b,%c,%d,%e,%f,%g,%h,%i,%j,%k,%l,%m,%n,%o,%p'
-		'_bllua_luacall(_bllua_process_cmd,"'..cmd..'",'..tsArgsLocal..');}')
+	_bllua_ts.eval('function '..cmd..'('..arglist..'){'..
+		'_bllua_luacall(_bllua_process_cmd,"'..cmd..'",'..arglist..');}')
 end
 function bl.addServerCmd(name, func)
 	name = name:lower()
@@ -794,9 +657,8 @@ function bl.commandToServer(cmd, ...)
 		_bllua_ts.call('addTaggedString', cmd),
 		unpack(arglistToTs({...})))
 end
-function bl.commandToClient(client, cmd, ...)
+function bl.commandToClient(cmd, ...)
 	_bllua_ts.call('commandToClient',
-		valToTs(client),
 		_bllua_ts.call('addTaggedString', cmd),
 		unpack(arglistToTs({...})))
 end
@@ -825,6 +687,9 @@ local function deactivatePackage(pkg)
 		_bllua_ts.call('deactivatePackage', pkg)
 	end
 end
+local hookNargs = 8
+local hookArglistLocal = '%a,%b,%c,%d,%e,%f,%g,%h'
+local hookArglistGlobal = '$_bllua_hook_arg1,$_bllua_hook_arg2,$_bllua_hook_arg3,$_bllua_hook_arg4,$_bllua_hook_arg5,$_bllua_hook_arg6,$_bllua_hook_arg7,$_bllua_hook_arg8'
 bl._hooks = bl._hooks or {}
 function _bllua_process_hook_before(pkgS, nameS, ...)
 	local args = arglistFromTs(nameS, {...})
@@ -838,7 +703,7 @@ function _bllua_process_hook_before(pkgS, nameS, ...)
 		_bllua_ts.setvar('_bllua_hook_abort', '1')
 		_bllua_ts.setvar('_bllua_hook_return', valToTs(args._return))
 	end
-	for i=1,tsMaxArgs do
+	for i=1,hookNargs do
 		_bllua_ts.setvar('_bllua_hook_arg'..i, valToTs(args[i]))
 	end
 end
@@ -855,13 +720,13 @@ function _bllua_process_hook_after(pkgS, nameS, resultS, ...)
 end
 local function updateHook(pkg, name, hk)
 	local beforeCode = hk.before and
-		('_bllua_luacall("_bllua_process_hook_before","'..pkg..'","'..name..
+		('_bllua_luacall("_bllua_process_hook_before", "'..pkg..'","'..name..
-			'",'..tsArgsLocal..');') or ''
+			'",'..hookArglistLocal..');') or ''
-	local arglist = (hk.before and tsArgsGlobal or tsArgsLocal)
+	local arglist = (hk.before and hookArglistGlobal or hookArglistLocal)
 	local parentCode =
 		tsIsFunctionNsname(name) and -- only call parent if it exists
 			(hk.before and
-				'if($_bllua_hook_abort)return $_bllua_hook_return;else ' or '')..
+				'if($_bllua_hook_abort)return $_bllua_hook_return; else ' or '')..
 			((hk.after and '%result=' or 'return ')..
 				'parent::'..name:match('[^:]+$')..
 				'('..arglist..');') or ''
@@ -870,11 +735,10 @@ local function updateHook(pkg, name, hk)
 			arglist..');') or ''
 	local code =
 		'package '..pkg..'{'..
-			'function '..name..'('..tsArgsLocal..'){'..
+			'function '..name..'('..hookArglistLocal..'){'..
 				beforeCode..parentCode..afterCode..
 			'}'..
 		'};'
-	print('bl.hook eval output: [['..code..']]')
 	_bllua_ts.eval(code)
 end
 function bl.hook(pkg, name, time, func)
@@ -900,9 +764,9 @@ end
 function bl.unhook(pkg, name, time)
 	if not isValidFuncName(pkg) then
 		error('bl.unhook: argument #1: invalid package name \''..tostring(pkg)..'\'', 2) end
-	if name and not isValidFuncNameNs(name) then
+	if not isValidFuncNameNs(name) then
 		error('bl.unhook: argument #2: invalid function name \''..tostring(name)..'\'', 2) end
-	if time and time~='before' and time~='after' then
+	if time~='before' and time~='after' then
 		error('bl.unhook: argument #3: time must be \'before\' or \'after\'', 2) end
 	
 	if not name then
@@ -929,13 +793,10 @@ function bl.unhook(pkg, name, time)
 				if time~='before' and time~='after' then
 					error('bl.unhook: argument #3: time must be nil, \'before\', or \'after\'', 2) end
 				bl._hooks[pkg][name][time] = nil
-				if tableEmpty(bl._hooks[pkg][name]) then
+				if tableEmpty(bl._hooks[pkg][name]) and tableEmpty(bl._hooks[pkg]) then
-					bl._hooks[pkg][name] = nil
-				end
-				if tableEmpty(bl._hooks[pkg]) then
 					bl._hooks[pkg] = nil
-					updateHook(pkg, name, {})
 					deactivatePackage(pkg)
+					updateHook(pkg, name, {})
 				else
 					updateHook(pkg, name, bl._hooks[pkg][name])
 				end
@@ -991,7 +852,7 @@ function bl.raycast(start, stop, mask, ignores)
 	local stopS = vecToTs(start)
 	local maskS = maskToTs(mask)
 	local ignoresS = {}
-	for _,v in ipairsNilable(ignores) do
+	for _,v in ipairs(ignores) do
 		table.insert(ignoresS, objToTs(v))
 	end
 	
@@ -1040,7 +901,7 @@ end
 local maxTsArgLen = 8192
 local function valsToString(vals)
 	local strs = {}
-	for i,v in ipairsNilable(vals) do
+	for i,v in ipairs(vals) do
 		local tstr = table.tostring(v)
 		if #tstr>maxTsArgLen then
 			tstr = tostring(v)

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)
@@ -16,141 +18,150 @@ function os.clock() return tonumber(_bllua_ts.call('getSimTime'))/1000 end
 --   Can't read nulls, can't distinguish between CRLF and LF.
 -- Todo someday: actually read the zip in lua?
 local file_meta = {
-	read = function(file, mode)
+  read = function(file, mode)
-		file:_init()
+    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 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)
+      local ws, n = file.data:match('^([ \t\r\n]*)([0-9%.%-e]+)', file.pos)
-			if n then
+      if n then
-				file.pos = file.pos + #ws + #n
+        file.pos = file.pos + #ws + #n
-				return n
+        return n
-			else
+      else
-				return nil
+        return nil
-			end
+      end
-		elseif mode=='*a' then
+    elseif mode == '*a' then
-			local d = file.data:sub(file.pos, #file.data)
+      local d = file.data:sub(file.pos, #file.data)
-			file.pos = #file.data + 1
+      file.pos = #file.data + 1
-			return d
+      return d
-		elseif mode=='*l' then
+    elseif mode == '*l' then
-			local l, ws = file.data:match('^([^\r\n]*)(\r?\n)', file.pos)
+      local l, ws = file.data:match('^([^\r\n]*)(\r?\n)', file.pos)
-			if not l then
+      if not l then
-				l = file.data:match('^([^\r\n]*)$', file.pos); ws = '';
+        l = file.data:match('^([^\r\n]*)$', file.pos); ws = '';
-				if l=='' then return nil end
+        if l == '' then return nil end
-			end
+      end
-			if l then
+      if l then
-				file.pos = file.pos + #l + #ws
+        file.pos = file.pos + #l + #ws
-				return l
+        return l
-			else
+      else
-				return nil
+        return nil
-			end
+      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
+      file.pos = file.pos + #d
-			return d
+      return d
-		else
+    else
-			error('File:read: Invalid mode \''..mode..'\'', 2)
+      error('File:read: Invalid mode \'' .. mode .. '\'', 2)
-		end
+    end
-	end,
+  end,
-	lines = function(file)
+  lines = function(file)
-		file:_init()
+    file:_init()
-		return function()
+    return function()
-			return file:read('*l')
+      return file:read('*l')
-		end
+    end
-	end,
+  end,
-	close = function(file)
+  close = function(file)
-		if not file._is_open then error('File:close: File is not open', 2) end
+    if not file._is_open then error('File:close: File is not open', 2) end
-		file._is_open = false
+    file._is_open = false
-	end,
+  end,
-	__index = function(f, k) return rawget(f, k) or getmetatable(f)[k] end,
+  __index = function(f, k) return rawget(f, k) or getmetatable(f)[k] end,
-	_init = function(f)
+  _init = function(f)
-		if not f.data then
+    if not f.data then
-			f.data = _bllua_ts.call('_bllua_ReadEntireFile', f.filename)
+      f.data = _bllua_ts.call('_bllua_ReadEntireFile', f.filename)
-		end
+    end
-	end,
+  end,
 }
 local function new_file_obj(fn)
-	local file = {
+  local file = {
-		_is_file = true,
+    _is_file = true,
-		_is_open = true,
+    _is_open = true,
-		pos = 1,
+    pos = 1,
-		__index = file_meta.__index,
+    __index = file_meta.__index,
-		filename = fn,
+    filename = fn,
-		data = nil,
+    data = nil,
-	}
+  }
-	setmetatable(file, file_meta)
+  setmetatable(file, file_meta)
-	return file
+  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;
-	'add-ons', 'base', 'config', 'saves', 'screenshots', 'shaders'
+end
+local allowed_zip_dirs = tflip {
+  'add-ons', 'base', 'config', 'saves', 'screenshots', 'shaders'
 }
 local function io_open_absolute(fn, mode)
-	-- if file exists, use original mode
+  -- if file exists, use original mode
-	local res, err = _bllua_io_open(fn, mode)
+  local res, err = _bllua_io_open(fn, mode)
-	if res then return res
+  if res then return res end
-	elseif err and not err:find('No such file or directory$') then return nil, err end
 
-	-- otherwise, if TS sees file but Lua doesn't, it must be in a zip, so use TS reader
+  -- otherwise, if TS sees file but Lua doesn't, it must be in a zip, so use TS reader
-	local dir = fn:match('^[^/]+')
+  local dir = fn:match('^[^/]+')
-	if not allowed_zip_dirs[dir:lower()] then return nil, 'Zip is not in one of the allowed directories' end
+  if not allowed_zip_dirs[dir:lower()] then return nil, 'File is not in one of the allowed directories' end
-	local exist = _bllua_ts.call('isFile', fn) == '1'
+  local exist = _bllua_ts.call('isFile', fn) == '1'
-	if not exist then return nil, err end
+  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
+  -- return a temp lua file object with the data
-	local fi = new_file_obj(fn)
+  local fi = new_file_obj(fn)
-	return fi
+  return fi
 end
 
 io = io or {}
+---@diagnostic disable-next-line: duplicate-set-field
 function io.open(fn, mode, errn)
-	errn = errn or 1
+  errn = errn or 1
 
-	-- try to open the file with relative path, otherwise use absolute path
+  -- try to open the file with relative path, otherwise use absolute path
-	local curfn = debug.getfilename(errn + 1) or _bllua_ts.getvar('Con::File')
+  local curfn = debug.getfilename(errn + 1) or _bllua_ts.getvar('Con::File')
-	if curfn == '' then curfn = nil end
+  if curfn == '' then curfn = nil end
-	if fn:find('^%.') then
+  if fn:find('^%.') then
-		local relfn = curfn and fn:find('^%./') and
+    local relfn = curfn and fn:find('^%./') and
-			curfn:gsub('[^/]+$', '')..fn:gsub('^%./', '')
+        curfn:gsub('[^/]+$', '') .. fn:gsub('^%./', '')
-		if relfn then
+    if relfn then
-			local fi, err = io_open_absolute(relfn, mode)
+      local fi, err = io_open_absolute(relfn, mode)
-			return fi, err, relfn
+      return fi, err, relfn
-		else
+    else
-			return nil, 'Invalid path', fn
+      return nil, 'Invalid path', fn
-		end
+    end
-	else
+  else
-		local fi, err = io_open_absolute(fn, mode)
+    local fi, err = io_open_absolute(fn, mode)
-		return fi, err, fn
+    return fi, err, fn
-	end
+  end
 end
+
+---@diagnostic disable-next-line: duplicate-set-field
 function io.lines(fn)
-	local fi, err, fn2 = io.open(fn, nil, 2)
+  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()
+  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
-		return f._is_open and 'file' or 'closed file'
+  if type(f) == 'table' and f._is_file then
-	else
+    ---@diagnostic disable-next-line: undefined-field
-		return _bllua_io_type(f)
+    return f._is_open and 'file' or 'closed file'
-	end
+  else
+    return _bllua_io_type(f)
+  end
 end
 
 -- provide dofile
 function dofile(fn, errn)
-	errn = errn or 1
+  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')
+  local text = fi:read('*a')
-	fi:close()
+  fi:close()
-	return assert(loadstring('--[['..fn2..']]'..text))()
+  return assert(loadstring('--[[' .. fn2 .. ']]' .. text))()
 end
 
 -- provide require (just a wrapper for dofile)
@@ -159,57 +170,67 @@ 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
+  if fi then
-		fi:close()
+    fi:close()
-		return fn2
+    return fn2
-	else
+  else
-		return nil
+    return nil
-	end
+  end
 end
 local require_memo = {}
 function require(mod)
-	if require_memo[mod] then return unpack(require_memo[mod]) end
+  if require_memo[mod] then return unpack(require_memo[mod]) end
-	local fp = mod:gsub('%.', '/')
+  local fp = mod:gsub('%.', '/')
-	local fns = {
+  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
+  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
+  end
-	for _,fn in ipairs(fns) do
+  for _, fn in ipairs(fns) do
-		local fne = file_exists(fn, 2)
+    local fne = file_exists(fn, 2)
-		if fne then
+    if fne then
-			local res = {dofile(fne, 2)}
+      local res = { dofile(fne, 2) }
-			require_memo[mod] = res
+      require_memo[mod] = res
-			return unpack(res)
+      return unpack(res)
-		end
+    end
-	end
+  end
-	return _bllua_requiresecure(mod)
+  return _bllua_requiresecure(mod)
 end
 
+-- Exposure to TS
+function _bllua_getvar(name) return _G[name] end
+
+function _bllua_setvar(name, val) _G[name] = val end
+
+function _bllua_eval(code) return loadstring(code)() end
+
+function _bllua_exec(fn) return dofile(fn, 2) 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
-	if f then
+  local f, e = loadstring(code)
-		return f()
+  if f then
-	else
+    return f()
-		print(e)
+  else
-	end
+    print(e)
+  end
 end
 
 function ts.setvar(name, val)
-	_bllua_ts.call('_bllua_set_var', name, val)
+  _bllua_ts.call('_bllua_set_var', name, val)
 end
 
 _bllua_ts.call('echo', '  Executed libts-lua.lua')

src/util/libts-ts.cs

@@ -49,4 +49,26 @@ function _bllua_set_var(%name, %val) {
 	return "";
 }
 
+// Public Lua library for TS
+function luacall(%func, %a,%b,%c,%d,%e,%f,%g,%h,%i,%j,%k,%l,%m,%n,%o,%p) {
+	if($_bllua_active)
+		return _bllua_luacall("_bllua_call", %func, %a,%b,%c,%d,%e,%f,%g,%h,%i,%j,%k,%l,%m,%n,%o,%p);
+}
+function luaexec(%fn) {
+	if($_bllua_active)
+		return _bllua_luacall("_bllua_exec", %fn);
+}
+function luaeval(%code) {
+	if($_bllua_active)
+		return _bllua_luacall("_bllua_eval", %code);
+}
+function luaget(%name) {
+	if($_bllua_active)
+		return _bllua_luacall("_bllua_getvar", %name);
+}
+function luaset(%name, %val) {
+	if($_bllua_active)
+		_bllua_luacall("_bllua_setvar", %name, %val);
+}
+
 echo("  Executed libts-ts.cs");

src/util/matrix.lua

@@ -1,7 +0,0 @@
-
--- todo
--- Matrix class with math operators
-
-
-
-print('  Executed matrix.lua')

src/util/std.lua

@@ -1,370 +1,374 @@
-
 -- 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 = {}
+  local u = {}
-	for k,_ in pairs(ts[1]) do
+  for k, _ in pairs(ts[1]) do
-		local args = {}
+    local args = {}
-		for j=1,#ts do args[j] = ts[j][k] end
+    for j = 1, #ts do args[j] = ts[j][i] end
-		u[k] = f(unpack(args))
+    u[i] = f(unpack(args))
-	end
+  end
-	return u
+  return u
-end
-function table.mapk(f, ...)
-	local ts = {...}
-	local u = {}
-	for k,_ in pairs(ts[1]) do
-		local args = {}
-		for j=1,#ts do args[j] = ts[j][k] end
-		u[k] = f(k, unpack(args))
-	end
-	return u
 end
+
 function table.map_list(f, ...)
-	local ts = {...}
+  local ts = { ... }
-	local u = {}
+  local u = {}
-	for i=1,#ts[1] do
+  for i = 1, #ts[1] do
-		local args = {}
+    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))
+    u[i] = f(unpack(args))
-	end
+  end
-	return u
+  return u
-end
-function table.mapi_list(f, ...)
-	local ts = {...}
-	local u = {}
-	for i=1,#ts[1] do
-		local args = {}
-		for j=1,#ts do args[j] = ts[j][i] end
-		u[i] = f(i, unpack(args))
-	end
-	return u
 end
+
 -- Swap keys/values
 function table.swap(t)
-	local u = {}
+  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
+  return u
 end
+
 -- Reverse a list
 function table.reverse(l)
-	local m = {}
+  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
+  return m
 end
+
 -- Whether a table is a list/array (has only monotonic integer keys)
 function table.islist(t)
-	local n = 0
+  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
+  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
+  end
-	return t
+  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 = {}
+  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
+  end
-	return w
+  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
+  end
-	return false
+  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
-	end
+    if v == s then return true end
-	return false
+  end
+  return false
 end
+
 -- Copy a table to another table
 function table.copy(t)
-	local u = {}
+  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
+  return u
 end
+
 function table.copy_list(l)
-	local m = {}
+  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
+  return m
 end
+
 -- Sort a table in a new copy
 function table.sortcopy(t, f)
-	local u = table.copy_list(t)
+  local u = table.copy_list(t)
-	table.sort(u, f)
+  table.sort(u, f)
-	return u
+  return u
 end
+
 -- Remove a value from a table
 function table.removevalue(t, r)
-	local rem = {}
+  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
+  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
+  for i = #t, 1, -1 do
-		if t[i]==r then
+    if t[i] == r then
-			table.remove(t, i)
+      table.remove(t, i)
-		end
+    end
-	end
+  end
 end
+
 -- Export tables into formatted executable strings
 local function tabs(tabLevel)
-	return ('  '):rep(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)
+    return tostring(t)
-	elseif table.islist(t) then
+  elseif table.islist(t) then
-		if #t==0 then
+    if #t == 0 then
-			return '{}'
+      return '{}'
-		else
+    else
-			local strs = {}
+      local strs = {}
-			local containsTables = false
+      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
+      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
+      else
-				return '{ '..table.concat(strs, ' ')..' }'
+        return '{ ' .. table.concat(strs, ' ') .. ' }'
-			end
+      end
-		end
+    end
-	else
+  else
-		local containsNonStringKeys = false
+    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
+        containsNonStringKeys = true
-			elseif type(k)=='table' then
+      elseif type(k) == 'table' then
-				error('table.tostring: table contains a table as key, cannot serialize')
+        error('table.tostring: table contains a table as key, cannot serialize')
-			end
+      end
-		end
+    end
-		local strs = {}
+    local strs = {}
-		if containsNonStringKeys then
+    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
+      end
-		else
+    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
-		end
+    end
-		return '{'..table.concat(strs)..'\n'..tabs(tabLevel)..'}'
+    return '{' .. table.concat(strs) .. '\n' .. tabs(tabLevel) .. '}'
-	end
+  end
 end
 valueToString = function(v, tabLevel, seen)
-	local t = type(v)
+  local t = type(v)
-	if t=='table' then
+  if t == 'table' then
-		if seen[v] then
+    if seen[v] then
-			return 'nil --[[ already seen: '..tostring(v)..' ]]'
+      return 'nil --[[ already seen: ' .. tostring(v) .. ' ]]'
-		else
+    else
-			seen[v] = true
+      seen[v] = true
-			return tableToString(v, tabLevel, seen)
+      return tableToString(v, tabLevel, seen)
-		end
+    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)
+    return tostring(v)
-	else
+  else
-		--error('table.tostring: table contains a '..t..' value, cannot serialize')
+    --error('table.tostring: table contains a '..t..' value, cannot serialize')
-		return 'nil --[[ '..tostring(v)..' ]]'
+    return 'nil --[[ cannot serialize ' .. t .. ': ' .. tostring(v) .. ' ]]'
-	end
+  end
 end
 function table.tostring(t)
-	return tableToString(t, 0, {})
+  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
-		local t = {}
+  if sep == nil or sep == '' then
-		local ns = #str
+    local t = {}
-		for x = 1, ns do
+    local ns = #str
-			table.insert(t, str:sub(x, x))
+    for x = 1, ns do
-		end
+      table.insert(t, str:sub(x, x))
-		return t
+    end
-	elseif type(sep)=='string' then
+    return t
-		local t = {}
+  elseif type(sep) == 'string' then
-		if #str>0 then
+    local t = {}
-			local first = 1
+    if #str > 0 then
-			while true do
+      local first = 1
-				local last, newfirst = str:find(sep, first, noregex)
+      while true do
-				if not last then break end
+        local last, newfirst = str:find(sep, first, noregex)
-				table.insert(t, str:sub(first, last-1))
+        if not last then break end
-				first = newfirst+1
+        table.insert(t, str:sub(first, last - 1))
-			end
+        first = newfirst + 1
-			table.insert(t, str:sub(first, #str))
+      end
-		end
+      table.insert(t, str:sub(first, #str))
-		return t
+    end
-	else
+    return t
-		error(
+  else
-			'string.split: argument #2: expected string or nil, got '..type(sep), 2)
+    error(
-	end
+      '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
-		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..']+$', '')..''
-end
--- String slicing and searching using [] operator
-local str_meta = getmetatable('')
-local str_meta_index_old= str_meta.__index
-function str_meta.__index(s,k)
-	if type(k)=='string' then
-		return str_meta_index_old[k]
-	elseif type(k)=='number' then
-		if k<0 then k = #s+k+1 end
-		return string.sub(s,k,k)
-	elseif type(k)=='table' then
-		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]
-		return string.sub(s,a,b)
-	end
-end
--- String iterator
-function string.chars(s)
-	local i = 0
-	return function()
-		i = i+1
-		if i<=#s then return s:sub(i,i)
-		else return nil end
-	end
-end
--- Escape sequences
-local defaultEscapes = {
-	['\\'] = '\\\\',
-	['\''] = '\\\'',
-	['\"'] = '\\\"',
-	['\t'] = '\\t',
-	['\r'] = '\\r',
-	['\n'] = '\\n',
-	['\0'] = '\\0',
-}
-function string.escape(s, escapes)
-	escapes = escapes or defaultEscapes
-	local t = {}
-	for i=1,#s do
-		local c = s:sub(i,i)
-		table.insert(t, escapes[c] or c)
-	end
-	return table.concat(t)
-end
-local defaultEscapeChar = '\\'
-local defaultUnescapes = {
-	['\\'] = '\\',
-	['\''] = '\'',
-	['\"'] = '\"',
-	['t'] = '\t',
-	['r'] = '\r',
-	['n'] = '\n',
-	['0'] = '\0',
-}
-function string.unescape(s, escapeChar, unescapes)
-	escapeChar = escapeChar or defaultEscapeChar
-	unescapes = unescapes or defaultUnescapes
-	local t = {}
-	local inEscape = false
-	for i=1,#s do
-		local c = s:sub(i,i)
-		if inEscape then
-			table.insert(t, unescapes[c]
-				or error('string.unescape: invalid escape sequence: \''
-					..escapeChar..c..'\''))
-		elseif c==escapeChar then
-			inEscape = true
-		else
-			table.insert(t, c)
-		end
-	end
-	return table.concat(t)
 end
 
+-- Split string to a list of char bytes
+function string.bytes(s)
+  local b = {}
+  for i = 1, #s do
+    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 .. ']+$', '') .. ''
+end
+
+-- String slicing and searching using [] operator
+local str_meta = getmetatable('')
+local str_meta_index_old = str_meta.__index
+function str_meta.__index(s, k)
+  if type(k) == 'string' then
+    return str_meta_index_old[k]
+  elseif type(k) == 'number' then
+    if k < 0 then k = #s + k + 1 end
+    return string.sub(s, k, k)
+  elseif type(k) == 'table' then
+    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]
+    return string.sub(s, a, b)
+  end
+end
+
+-- String iterator
+function string.chars(s)
+  local i = 0
+  return function()
+    i = i + 1
+    if i <= #s then
+      return s:sub(i, i)
+    else
+      return nil
+    end
+  end
+end
+
+-- Escape sequences
+local defaultEscapes = {
+  ['\\'] = '\\\\',
+  ['\''] = '\\\'',
+  ['\"'] = '\\\"',
+  ['\t'] = '\\t',
+  ['\r'] = '\\r',
+  ['\n'] = '\\n',
+  ['\0'] = '\\0',
+}
+function string.escape(s, escapes)
+  escapes = escapes or defaultEscapes
+  local t = {}
+  for i = 1, #s do
+    local c = s:sub(i, i)
+    table.insert(t, escapes[c] or c)
+  end
+  return table.concat(t)
+end
+
+local defaultEscapeChar = '\\'
+local defaultUnescapes = {
+  ['\\'] = '\\',
+  ['\''] = '\'',
+  ['\"'] = '\"',
+  ['t'] = '\t',
+  ['r'] = '\r',
+  ['n'] = '\n',
+  ['0'] = '\0',
+}
+function string.unescape(s, escapeChar, unescapes)
+  escapeChar = escapeChar or defaultEscapeChar
+  unescapes = unescapes or defaultUnescapes
+  local t = {}
+  local inEscape = false
+  for i = 1, #s do
+    local c = s:sub(i, i)
+    if inEscape then
+      table.insert(t, unescapes[c]
+        or error('string.unescape: invalid escape sequence: \''
+          .. escapeChar .. c .. '\''))
+    elseif c == escapeChar then
+      inEscape = true
+    else
+      table.insert(t, c)
+    end
+  end
+  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")
+  local s = fi:read("*a")
-	fi:close()
+  fi:close()
-	return s
+  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')
-	if not fi then return false,err end
-	fi:write(data)
-	fi:close()
-	return true,nil
 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')
+  if not fi then return false, err end
+  fi:write(data)
+  fi:close()
+  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))
+  return math.min(x, math.max(v, n))
 end
-
-
-print('  Executed std.lua')

src/util/vector.lua

@@ -1,222 +1,238 @@
-
 -- Vector math class with operators
 local vector_meta
 local vector_new
 local function vector_check(v, n, name, argn)
-	if not v.__is_vector then
+  if not v.__is_vector then
-		error('vector '..name..': argument #'..(argn or 1)
+    error('vector ' .. name .. ': argument #' .. (argn or 1)
-			..': expected vector, got '..type(v), n+1) end
+      .. ': expected vector, got ' .. type(v), n + 1)
+  end
 end
 local function vector_checksamelen(v1, v2, name)
-	vector_check(v1, 3, name, 1)
+  vector_check(v1, 3, name, 1)
-	vector_check(v2, 3, name, 2)
+  vector_check(v2, 3, name, 2)
-	if #v1~=#v2 then
+  if #v1 ~= #v2 then
-		error('vector '..name..': vector lengths do not match (lengths are '
+    error('vector ' .. name .. ': vector lengths do not match (lengths are '
-			..#v1..' and '..#v2..')', 3) end
+      .. #v1 .. ' and ' .. #v2 .. ')', 3)
-	return #v1
+  end
+  return #v1
 end
 local function vector_checklen(v1, v2, name, len)
-	vector_check(v1, 3, name, 1)
+  vector_check(v1, 3, name, 1)
-	vector_check(v2, 3, name, 2)
+  vector_check(v2, 3, name, 2)
-	if #v1~=len or #v2~=len then
+  if #v1 ~= len or #v2 ~= len then
-		error('vector '..name..': vector lengths are not '..len..' (lengths are '
+    error('vector ' .. name .. ': vector lengths are not ' .. len .. ' (lengths are '
-			..#v1..' and '..#v2..')', 3) end
+      .. #v1 .. ' and ' .. #v2 .. ')', 3)
+  end
 end
 local function vector_opnnn(name, op)
-	return function(v1, v2)
+  return function(v1, v2)
-		local len = vector_checksamelen(v1, v2, name)
+    local len = vector_checksamelen(v1, v2, name)
-		local v3 = {}
+    local v3 = {}
-		for i = 1, len do
+    for i = 1, len do
-			v3[i] = op(v1[i], v2[i])
+      v3[i] = op(v1[i], v2[i])
-		end
+    end
-		return vector_new(v3)
+    return vector_new(v3)
-	end
+  end
 end
 local function vector_opnxn(name, op)
-	return function(v1, v2)
+  return function(v1, v2)
-		local v1v = type(v1)=='table' and v1.__is_vector
+    local v1v = type(v1) == 'table' and v1.__is_vector
-		local v2v = type(v2)=='table' and v2.__is_vector
+    local v2v = type(v2) == 'table' and v2.__is_vector
-		if v1v and v2v then
+    if v1v and v2v then
-			local len = vector_checksamelen(v1, v2, name)
+      local len = vector_checksamelen(v1, v2, name)
-			local v3 = {}
+      local v3 = {}
-			for i = 1, len do
+      for i = 1, len do
-				v3[i] = op(v1[i], v2[i])
+        v3[i] = op(v1[i], v2[i])
-			end
+      end
-			return vector_new(v3)
+      return vector_new(v3)
-		else
+    else
-			if v2v then v1,v2 = v2,v1 end
+      if v2v then v1, v2 = v2, v1 end
-			local len = #v1
+      local len = #v1
-			local v3 = {}
+      local v3 = {}
-			for i = 1, len do
+      for i = 1, len do
-				v3[i] = op(v1[i], v2)
+        v3[i] = op(v1[i], v2)
-			end
+      end
-			return vector_new(v3)
+      return vector_new(v3)
-		end
+    end
-	end
+  end
 end
 local function vector_opn0n(name, op)
-	return function(v1)
+  return function(v1)
-		--vector_check(v1, 1, name)
+    --vector_check(v1, 1, name)
-		local len = #v1
+    local len = #v1
-		local v2 = {}
+    local v2 = {}
-		for i = 1, len do
+    for i = 1, len do
-			v2[i] = op(v1[i])
+      v2[i] = op(v1[i])
-		end
+    end
-		return vector_new(v2)
+    return vector_new(v2)
-	end
+  end
 end
-local vector_indices = {x = 1, y = 2, z = 3, w = 4, r = 1, g = 2, b = 3, a = 4}
+local vector_indices = { x = 1, y = 2, z = 3, w = 4, r = 1, g = 2, b = 3, a = 4 }
 local vector_meta = {
-	__is_vector = true,
+  __is_vector     = true,
-	__index = function(t, k)
+  __index         = function(t, k)
-		if tonumber(k) then return rawget(t, k)
+    if tonumber(k) then
-		elseif vector_indices[k] then return rawget(t, vector_indices[k])
+      return rawget(t, k)
-		else return getmetatable(t)[k]
+    elseif vector_indices[k] then
-		end
+      return rawget(t, vector_indices[k])
-	end,
+    else
-	__newindex = function(t, k, v)
+      return getmetatable(t)[k]
-		if tonumber(k) then rawset(t, k, v)
+    end
-		elseif vector_indices[k] then rawset(t, vector_indices[k], v)
+  end,
-		else return
+  __newindex      = function(t, k, v)
-		end
+    if tonumber(k) then
-	end,
+      rawset(t, k, v)
-	__add = vector_opnnn('add', function(x1, x2) return x1+x2 end),
+    elseif vector_indices[k] then
-	__sub = vector_opnnn('sub', function(x1, x2) return x1-x2 end),
+      rawset(t, vector_indices[k], v)
-	__mul = vector_opnxn('mul', function(x1, x2) return x1*x2 end),
+    else
-	__div = vector_opnxn('div', function(x1, x2) return x1/x2 end),
+      return
-	__pow = vector_opnxn('pow', function(x1, x2) return x1^x2 end),
+    end
-	__unm = vector_opn0n('inv', function(x1) return -x1 end),
+  end,
-	__concat = nil,
+  __add           = vector_opnnn('add', function(x1, x2) return x1 + x2 end),
-	--__len = function(v1) return #v1 end,
+  __sub           = vector_opnnn('sub', function(x1, x2) return x1 - x2 end),
-	__len = nil,
+  __mul           = vector_opnxn('mul', function(x1, x2) return x1 * x2 end),
-	__eq = function(v1, v2)
+  __div           = vector_opnxn('div', function(x1, x2) return x1 / x2 end),
-		local len = vector_checksamelen(v1, v2, 'equals')
+  __pow           = vector_opnxn('pow', function(x1, x2) return x1 ^ x2 end),
-		for i = 1, len do
+  __unm           = vector_opn0n('inv', function(x1) return -x1 end),
-			if v1[i]~=v2[i] then return false end
+  __concat        = nil,
-		end
+  --__len = function(v1) return #v1 end,
-		return true
+  __len           = nil,
-	end,
+  __eq            = function(v1, v2)
-	__lt = nil,
+    local len = vector_checksamelen(v1, v2, 'equals')
-	__le = nil,
+    for i = 1, len do
-	__call = nil,
+      if v1[i] ~= v2[i] then return false end
-	abs = vector_opn0n('abs', math.abs),
+    end
-	length = function(v1)
+    return true
-		--vector_check(v1, 2, 'length')
+  end,
-		local len = #v1
+  __lt            = nil,
-		local l = 0
+  __le            = nil,
-		for i = 1, len do
+  __call          = nil,
-			l = l + v1[i]^2
+  abs             = vector_opn0n('abs', math.abs),
-		end
+  length          = function(v1)
-		return math.sqrt(l)
+    --vector_check(v1, 2, 'length')
-	end,
+    local len = #v1
-	normalize = function(v1)
+    local l = 0
-		--vector_check(v1, 2, 'normal')
+    for i = 1, len do
-		local length = v1:length()
+      l = l + v1[i] ^ 2
-		local len = #v1
+    end
-		local v3 = {}
+    return math.sqrt(l)
-		for i = 1, len do
+  end,
-			if length==0 then v3[i] = 0
+  normalize       = function(v1)
-			else v3[i] = v1[i]/length end
+    --vector_check(v1, 2, 'normal')
-		end
+    local length = v1:length()
-		return vector_new(v3)
+    local len = #v1
-	end,
+    local v3 = {}
-	__tostring = function(v1)
+    for i = 1, len do
-		--vector_check(v1, 2, 'tostring')
+      if length == 0 then
-		local st = {}
+        v3[i] = 0
-		local len = #v1
+      else
-		for i = 1, len do
+        v3[i] = v1[i] / length
-			table.insert(st, tostring(v1[i]))
+      end
-		end
+    end
-		return 'vector{ '..table.concat(st, ', ')..' }'
+    return vector_new(v3)
-	end,
+  end,
-	unpack = function(v1) return unpack(v1) end,
+  __tostring      = function(v1)
-	floor = vector_opn0n('floor', function(x1) return math.floor(x1) end),
+    --vector_check(v1, 2, 'tostring')
-	ceil  = vector_opn0n('ceil' , function(x1) return math.ceil (x1) end),
+    local st = {}
-	round = vector_opn0n('round', function(x1) return math.floor(x1+0.5) end),
+    local len = #v1
-	dot = function(v1, v2)
+    for i = 1, len do
-		local len = vector_checksamelen(v1, v2, 'dot')
+      table.insert(st, tostring(v1[i]))
-		local x = 0
+    end
-		for i = 1, len do
+    return 'vector{ ' .. table.concat(st, ', ') .. ' }'
-			x = x + v1[i]*v2[i]
+  end,
-		end
+  unpack          = function(v1) return unpack(v1) end,
-		return x
+  floor           = vector_opn0n('floor', function(x1) return math.floor(x1) end),
-	end,
+  ceil            = vector_opn0n('ceil', function(x1) return math.ceil(x1) end),
-	cross = function(v1, v2)
+  round           = vector_opn0n('round', function(x1) return math.floor(x1 + 0.5) end),
-		vector_checklen(v1, v2, 'cross', 3)
+  dot             = function(v1, v2)
-		return vector_new{
+    local len = vector_checksamelen(v1, v2, 'dot')
-			v1[2]*v2[3] - v1[3]*v2[2],
+    local x = 0
-			v1[3]*v2[1] - v1[1]*v2[3],
+    for i = 1, len do
-			v1[1]*v2[2] - v1[2]*v2[1],
+      x = x + v1[i] * v2[i]
-		}
+    end
-	end,
+    return x
-	rotateByAngleId = function(v1, r)
+  end,
-		--vector_check(v1, 2, 'rotate')
+  cross           = function(v1, v2)
-		if type(r)~='number' or r%1~=0 then
+    vector_checklen(v1, v2, 'cross', 3)
-			error('vector rotateByAngleId: invalid rotation '..tostring(r), 2) end
+    return vector_new {
-		r = r%4
+      v1[2] * v2[3] - v1[3] * v2[2],
-		local v2
+      v1[3] * v2[1] - v1[1] * v2[3],
-		if     r==0 then v2 = vector_new{  v1[1],  v1[2], v1[3] }
+      v1[1] * v2[2] - v1[2] * v2[1],
-		elseif r==1 then v2 = vector_new{  v1[2], -v1[1], v1[3] }
+    }
-		elseif r==2 then v2 = vector_new{ -v1[1], -v1[2], v1[3] }
+  end,
-		elseif r==3 then v2 = vector_new{ -v1[2],  v1[1], v1[3] }
+  rotateByAngleId = function(v1, r)
-		else error('vector rotateByAngleId: invalid rotation '..r, 2) end
+    --vector_check(v1, 2, 'rotate')
-		return v2
+    if type(r) ~= 'number' or r % 1 ~= 0 then
-	end,
+      error('vector rotateByAngleId: invalid rotation ' .. tostring(r), 2)
-	rotateZ = function(v, r)
+    end
-		--vector_check(v, 2, 'rotate2d')
+    r = r % 4
-		if type(r)~='number' then
+    local v2
-			error('vector rotateZ: invalid rotation '..tostring(r), 2) end
+    if r == 0 then
-		local len = math.sqrt(v[1]^2 + v[2]^2)
+      v2 = vector_new { v1[1], v1[2], v1[3] }
-		local ang = math.atan2(v[2], v[1]) + r
+    elseif r == 1 then
-		local v2 = vector_new{ math.cos(ang)*len, math.sin(ang)*len }
+      v2 = vector_new { v1[2], -v1[1], v1[3] }
-		return v2
+    elseif r == 2 then
-	end,
+      v2 = vector_new { -v1[1], -v1[2], v1[3] }
-	tsString = function(v)
+    elseif r == 3 then
-		--vector_check(v, 2, 'tsString')
+      v2 = vector_new { -v1[2], v1[1], v1[3] }
-		return table.concat(v, ' ')
+    else
-	end,
+      error('vector rotateByAngleId: invalid rotation ' .. r, 2)
-	distance = function(v1, v2)
+    end
-		local len = vector_checksamelen(v1, v2, 'distance')
+    return v2
-		local sum = 0
+  end,
-		for i=1,len do
+  rotateZ         = function(v, r)
-			sum = sum + (v1[i] - v2[i])^2
+    --vector_check(v, 2, 'rotate2d')
-		end
+    if type(r) ~= 'number' then
-		return math.sqrt(sum)
+      error('vector rotateZ: invalid rotation ' .. tostring(r), 2)
-	end,
+    end
-	copy = function(v)
+    local len = math.sqrt(v[1] ^ 2 + v[2] ^ 2)
-		--vector_check(v, 2, 'copy')
+    local ang = math.atan2(v[2], v[1]) + r
-		return vector_new(v)
+    local v2 = vector_new { math.cos(ang) * len, math.sin(ang) * len }
-	end,
+    return v2
+  end,
+  tsString        = function(v)
+    --vector_check(v, 2, 'tsString')
+    return table.concat(v, ' ')
+  end,
+  distance        = function(v1, v2)
+    local len = vector_checksamelen(v1, v2, 'distance')
+    local sum = 0
+    for i = 1, len do
+      sum = sum + (v1[i] - v2[i]) ^ 2
+    end
+    return math.sqrt(sum)
+  end,
+  copy            = function(v)
+    --vector_check(v, 2, 'copy')
+    return vector_new(v)
+  end,
 }
 vector_new = function(vi)
-	if vi then
+  if vi then
-		if type(vi)=='string' then
+    if type(vi) == 'string' then
-			local vi2 = {}
+      local vi2 = {}
-			for val in vi:gmatch('[0-9%.%-e]+') do
+      for val in vi:gmatch('[0-9%.%-e]+') do
-				table.insert(vi2, tonumber(val))
+        table.insert(vi2, tonumber(val))
-			end
+      end
-			vi = vi2
+      vi = vi2
-		elseif type(vi)~='table' then
+    elseif type(vi) ~= 'table' then
-			error('vector: argument #1: expected input table, got '..type(vi), 2)
+      error('vector: argument #1: expected input table, got ' .. type(vi), 2)
-		end
+    end
-		local v = {}
+    local v = {}
-		if #vi>0 then
+    if #vi > 0 then
-			for i = 1, #vi do v[i] = vi[i] end
+      for i = 1, #vi do v[i] = vi[i] end
-		else
+    else
-			for n, i in pairs(vector_indices) do v[i] = vi[n] end
+      for n, i in pairs(vector_indices) do v[i] = vi[n] end
-			if #v==0 then
+      if #v == 0 then
-				error('vector: argument #1: table contains no values', 2)
+        error('vector: argument #1: table contains no values', 2)
-			end
+      end
-		end
+    end
-		setmetatable(v, vector_meta)
+    setmetatable(v, vector_meta)
-		return v
+    return v
-	else
+  else
-		error('vector: argument #1: expected input table, got nil', 2)
+    error('vector: argument #1: expected input table, got nil', 2)
-	end
+  end
 end
 
 vector = vector_new
-
-print('  Executed vector.lua')
-
 return vector_new