fix table.empty, from auios

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 global function  
+`luacall("funcName", %args...);` - Call a Lua function (supports indexing tables and object methods)  
-`luaexec("fileName");` - Execute a Lua file. Path rules are the same as executing .cs files.  
+`luaexec("fileName");` - Execute a Lua file. Path rules are the same as when executing .cs files, relative paths are allowed.  
-`luaget("varName");` - Read a Lua global variable  
+`luaget("varName");` - Read a Lua global variable (supports indexing tables)  
-`luaset("varName", %value);` - Write a Lua global variable  
+`luaset("varName", %value);` - Write a Lua global variable (supports indexing tables)  
 
 ### From Lua
 `bl.eval('code')` - Eval TorqueScript code  
@@ -35,7 +35,9 @@ 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 childIndex, child in object:members() do` - Iterate objects within of a Torque set or group. Indices start at 0 like in Torque.
+`for 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  
@@ -46,15 +48,25 @@ 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...) yourCode end)` - Register a /command on the server  
+`bl.addServerCmd('commandName', function(client, args...) ... end)` - Register a /command on the server  
-`bl.addClientCmd('commandName', function(args...) yourCode end)` - Register a client command on the client  
+`bl.addClientCmd('commandName', function(args...) ... end)` - Register a client command on the client  
-`bl.commandToServer('commandName', args...)` - Execute a server command as a client  
+`bl.commandToServer('commandName', args...)` - As a client, execute a server command  
-`bl.commandToClient('commandName', args...)` - As the server, execute a client command on a specific client  
+`bl.commandToClient(client, '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) yourCode end)` - Hook a Torque function with a Lua function.  
+`bl.hook('packageName', 'functionName', 'before'/'after', function(args) ... 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.  
@@ -101,10 +113,11 @@ 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(thing)` - Manually convert a Torque boolean (0 or 1) into a Lua boolean.  
+`bl.boolean(arg)` - Manually convert a Torque boolean (0 or 1) into a Lua boolean.  
-`bl.object(thing)` - Manually convert a Torque object reference (object ID or name) into a Lua object.
+`bl.object(arg)` - 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.  
 
-### Vectors
+### Vector
 `vec = vector{x,y,z}` - Create a vector. Can have any number of elements  
 `vec1 + vec2` - Add  
 `vec1 - vec2` - Subtract  
@@ -129,15 +142,20 @@ 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
-`string[index]`  
+`str[index]`  
-`string[{start,stop}]`  
+`str[{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)`  
@@ -163,41 +181,39 @@ When reading from outside ZIPs, binary files are fully supported.
 ## 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  
-- Torque containers become their object ID  
+- A Torque object container becomes its object ID  
 - A `vector` becomes a string containing three numbers separated by spaces  
-- A table of two vectors becomes a string containing six numbers separated by spaces  
+- A table of two `vector`s 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.  
-Please do not publish add-ons that require unsafe mode.  
+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 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 src/bllua`  
+`g++ src/bllua4.cpp -o BlockLua.dll -m32 -shared -static-libgcc -Isrc -Iinc/tsfuncs -Iinc/lua -lpsapi -L. -llua5.1`  
   
 LuaJIT (lua5.1.dll) can be obtained from https://luajit.org/  

src/bllua4.cpp

@@ -1,4 +1,4 @@
-// BlockLua (bllua4): Simple Lua interface for TorqueScript
+// BlockLua (bllua4): Advanced Lua interface for TorqueScript
 
 // Includes
 
@@ -28,6 +28,7 @@ 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" );
@@ -56,21 +57,26 @@ 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);
 	
@@ -83,8 +89,7 @@ bool init() {
 bool deinit() {
 	BlPrintf("BlockLua: Unloading");
 	
-	BlEval("deactivatePackage(_bllua_main);");
+	BlEval("$_bllua_active=0;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

@@ -12,6 +12,7 @@ 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 {
@@ -37,13 +38,10 @@ 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'
 }
--- 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,
@@ -79,14 +77,15 @@ local function safe_path(fn, readonly)
 	end
 	-- allow only whitelisted dirs
 	local dir = fn:match('^([^/]+)/')
-	if (not dir) or (
+	if not (dir and (
-		(not allowed_dirs[dir:lower()]) and
+		allowed_dirs[dir:lower()] or
-		((not readonly) or (not allowed_dirs_readonly[dir:lower()])) ) then
+		( readonly and fn:find('^modules/lualib/') ) ))
-		return nil, 'filename is in disallowed directory '..(dir or 'nil')
+	then
+		return nil, 'File is in disallowed directory '..(dir or 'nil')
 	end
-	-- disallow blacklisted extensions or no extension
+	-- disallow blacklisted extensions
 	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 \''..
 			(ext or '')..'\''
 	end
@@ -117,6 +116,7 @@ local disallowed_packages = tmap {
 	'ffi', 'debug', 'package', 'io', 'os',
 	'_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
 		name:find('^%.') or name:find('%.$') then
@@ -139,4 +139,5 @@ debug = {
 	getfilename = old_debug.getfilename, -- defined in lua.env.lua
 }
 
-_bllua_ts.echo('  Executed bllua-env-safe.lua')
+print = _bllua_ts.echo
+print('  Executed bllua-env-safe.lua')

src/lua-env.lua

@@ -37,4 +37,9 @@ function _bllua_on_error(err)
 	return table.concat(tracelines, '\n')
 end
 
-_bllua_ts.echo('  Executed bllua-env.lua')
+-- overridden in lua-env-safe.lua (executed if not BLLUA_UNSAFE)
+_bllua_io_open = io.open
+_bllua_requiresecure = require
+
+print = _bllua_ts.echo
+print('  Executed bllua-env.lua')

src/util/libbl-support.cs

@@ -42,4 +42,26 @@ 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.lua

@@ -2,23 +2,36 @@
 -- 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
--- Apply a function to each element in a list, building a new list from the returns
+local function ipairsNilable(t)
-local function map(t,f)
+	local maxk = 0
-	local u = {}
+	for k,_ in pairs(t) do
-	for i,v in ipairs(t) do
+		if k>maxk then maxk = k end
-		u[i] = f(v)
+	end
+	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-Z0-9_]+$')
+	return type(name)=='string' and name:find('^[a-zA-Z_][a-zA-Z0-9_]*$')
 end
 local function isValidFuncNameNs(name)
 	return type(name)=='string' and (
@@ -76,7 +89,7 @@ for k,v in pairs(tsTypesByName) do
 	tsTypesByNum[v] = k
 end
 
--- Type conversion
+-- Type conversion from Lua to TS
 local toTsObject
 -- Convert a string from TS into a boolean
 -- Note: Nonempty nonnumeric strings evaluate to 1, unlike in TS
@@ -100,35 +113,77 @@ local function valToTs(val)
 			-- box - > 6 numbers
 			return table.concat(val[1], ' ')..' '..table.concat(val[2], ' ')
 		else
-			error('valToTs: could not convert table', 3)
+			error('valToTs: cannot pass Lua tables to TorqueScript.', 3)
 		end
 	else
-		error('valToTs: could not convert '..type(val), 3)
+		error('valToTs: could not convert value to TorqueScript: '..tostring(val), 3)
 	end
 end
+
+-- Type conversion from TS to Lua
 local fromTsForceTypes = {
-	['boolean'] = tsBool,
+	['boolean'] = function(val) return tsBool(val) end,
-	['object'] = function(val) toTsObject(val) end, -- toTsObject not defined yet
+	['object'] = function(val) return toTsObject(val) end, -- wrap because toTsObject not defined yet
-	['string'] = tostring,
+	['string'] = function(val) return val end,
 }
-local function convertValFromTs(val, typ)
+local function forceValFromTs(val, typ)
-	return fromTsForceTypes[typ](val) or
+	local func = fromTsForceTypes[typ]
-		error('valFromTs: invalid force type '..typ, 4)
+	if not func then error('valFromTs: invalid force type \''..typ..'\'', 4) end
+	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 {}
-local function valFromTs(val, name, name2) -- todo: ensure name and name2 are already lowercase
+-- 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 convertValFromTs(val, bl._forceType[name])
+			return forceValFromTs(val, bl._forceType[name])
 		end
 	end
 	if name2 then
 		name2 = name2:lower()
 		if bl._forceType[name2] then
-			return convertValFromTs(val, bl._forceType[name2])
+			return forceValFromTs(val, bl._forceType[name2])
 		end
 	end
 	-- '' -> nil
@@ -136,28 +191,29 @@ local function valFromTs(val, name, name2) -- todo: ensure name and name2 are al
 	-- number
 	local num = tonumber(val)
 	if num then return num end
-	-- vector
+	-- vector, box, or axis->matrix
-	local xS,yS,zS = val:match('^(%-?[0-9%.e]+) (%-?[0-9%.e]+) (%-?[0-9%.e]+)$')
+	local vec = multinumericFromTs(val)
-	if xS then return vector{tonumber(xS),tonumber(yS),tonumber(zS)} end
+	if vec then return vec end
-	local x1S,y1S,z1S,x2S,y2S,z2S = val:match(
+	-- net string
-		'^(%-?[0-9%.e]+) (%-?[0-9%.e]+) (%-?[0-9%.e]+) '..
+	if val:sub(1,1)=='\x01' then
-		'(%-?[0-9%.e]+) (%-?[0-9%.e]+) (%-?[0-9%.e]+)$')
+		return _bllua_ts.call('getTaggedString', val)
-	-- box (2 vectors)
+	end
-	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 ipairs(argsS) do
+	for i,arg in ipairsNilable(argsS) do
 		args[i] = valFromTs(arg, name..':'..i)
 	end
 	return args
 end
 local function arglistToTs(args)
-	return map(args, valToTs)
+	local argsS = {}
+	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_]+)(::.+)$')
@@ -189,13 +245,33 @@ 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
 
--- Value detection
+-- Getting info from TS about functions and objects
-
 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
@@ -204,27 +280,31 @@ 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 isTsObject(obj) then
+	if type(obj)=='number' then -- object id
-		obj = obj._tsObjectId
+		return tsIsObject(tostring(obj))
-	elseif type(obj)=='number' then
+	elseif type(obj)=='string' then -- object name
-		obj = tostring(obj)
+		return tsIsObject(obj)
-	elseif type(obj)~='string' then
+	elseif isTsObject(obj) then -- lua object
+		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(a1, a2)
+function bl.isFunction(name)
-	if type(a1)~='string' then
+	return tsIsFunctionNsname(name)
-		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
@@ -307,17 +387,19 @@ local tsObjectMeta = {
 				tsIsFunctionNs(rawget(t,'_tsNamespace'), name) or
 				tsIsFunctionNs(rawget(t,'_tsName'), name)
 			then
-				return function(t, ...)
+				return function(t2, ...)
-					local args = {...}
+					if t2==nil or type(t2)~='table' or not t2._tsObjectId then
-					local argsS = arglistToTs(args)
+						error('ts object method: be sure to use :func() not .func()', 2) end
-					return valFromTs(
+					local argsS = arglistToTs({...})
-						_bllua_ts.callobj(rawget(t,'_tsObjectId'), name, unpack(argsS)),
+					local res =
-						rawget(t,'_tsName') and rawget(t,'_tsName')..'::'..name,
+						_bllua_ts.callobj(t2._tsObjectId, name, unpack(argsS))
-						rawget(t,'_tsNamespace')..'::'..name)
+					return valFromTs(res,
+						t2._tsName and t2._tsName..'::'..name,
+						t2._tsNamespace..'::'..name)
 				end
 			else
-				return valFromTs(
+				local res = _bllua_ts.getfield(rawget(t,'_tsObjectId'), name)
-					_bllua_ts.getfield(rawget(t,'_tsObjectId'), name),
+				return valFromTs(res,
 					rawget(t,'_tsName') and rawget(t,'_tsName')..'.'..name,
 					rawget(t,'_tsNamespace')..'.'..name)
 			end
@@ -350,7 +432,8 @@ 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
@@ -381,7 +464,8 @@ 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
@@ -430,8 +514,10 @@ 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 end
+			return false
-		return tsIsObject(t._tsObjectId)
+		else
+			return assertTsObjectExists(t)
+		end
 	end,
 }
 -- Weak-values table for caching Torque object references
@@ -464,7 +550,7 @@ toTsObject = function(idiS)
 	idiS = idiS:lower()
 	if bl._objectsWeak[idiS] then return bl._objectsWeak[idiS] end
 	
-	if not tsBool(_bllua_ts.call('isObject', idiS)) then
+	if not tsIsObject(idiS) then
 		--error('toTsObject: object \''..idiS..'\' does not exist', 2) end
 		return nil end
 	
@@ -486,14 +572,13 @@ 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..'('..nscallArgStr..'){'..
+		local tfcode = 'function '..tfname..'('..tsArgsLocal..'){'..
-			name..'('..nscallArgStr..');}'
+			name..'('..tsArgsLocal..');}'
 		_bllua_ts.eval(tfcode)
 		bl._cachedNamespaceCalls[name] = tfname
 	end
@@ -501,9 +586,9 @@ local function tsNamespacedCallTfname(name)
 end
 local function tsCallGen(name)
 	return function(...)
-		local args = {...}
+		local argsS = arglistToTs({...})
-		local argsS = arglistToTs(args)
+		local res = _bllua_ts.call(name, unpack(argsS))
-		return valFromTs(_bllua_ts.call(name, unpack(argsS)), name)
+		return valFromTs(res, name)
 	end
 end
 
@@ -529,14 +614,16 @@ local tsMeta = {
 				if not rest:find('::') and tsIsFunctionNs(ns, rest) then
 					return tsCallGen(tsNamespacedCallTfname(name))
 				else
-					return valFromTs(_bllua_ts.getvar(name), name)
+					local res = _bllua_ts.getvar(name)
+					return valFromTs(res, name)
 				end
 			elseif tsIsFunction(name) then
 				return tsCallGen(name)
 			elseif tsIsObject(name) then
 				return toTsObject(name)
 			else
-				return valFromTs(_bllua_ts.getvar(name), name)
+				local res = _bllua_ts.getvar(name)
+				return valFromTs(res, name)
 			end
 		end
 	end,
@@ -555,10 +642,16 @@ function bl.call(func, ...)
 	return _bllua_ts.call(func, unpack(argsS))
 end
 function bl.eval(code)
-	return valFromTs(_bllua_ts.eval(code))
+	local res = _bllua_ts.eval(code)
+	return valFromTs(res)
 end
 function bl.exec(file)
-	return valFromTs(_bllua_ts.call('exec', file))
+	local res = _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
@@ -576,18 +669,63 @@ function bl.object(id)
 		error('bl.object: id must be a ts object, number, or string', 2)
 	end
 end
-function bl.array(name, ...)
+function bl.string(val)
-	local rest = {...}
+	return valFromTsTostring(val)
-	return name..table.concat(rest, '_')
 end
-function _bllua_call(fnameS, ...)
+
-	local args = arglistFromTs('lua:'..fnameS:lower(), {...}) -- todo: allow this though bl.type
+-- Lua calling from TS
-	if not _G[fnameS] then
+local luaLookup
-		error('luacall: no global lua function named \''..fnameS..'\'') end
+luaLookup = function(tbl, name, set, val)
-	-- todo: library fields and object methods
+	if name:find('%.') then
-	local res = _G[fnameS](unpack(args))
+		local first, rest = name:match('^([^%.:]+)%.(.+)$')
+		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...)
@@ -637,9 +775,8 @@ local function addCmd(cmd, func)
 	if not isValidFuncName(cmd) then
 		error('addCmd: invalid function name \''..tostring(cmd)..'\'') end
 	bl._cmds[cmd] = func
-	local arglist = '%a,%b,%c,%d,%e,%f,%g,%h,%i,%j,%k,%l,%m,%n,%o,%p'
+	_bllua_ts.eval('function '..cmd..'('..tsArgsLocal..'){'..
-	_bllua_ts.eval('function '..cmd..'('..arglist..'){'..
+		'_bllua_luacall(_bllua_process_cmd,"'..cmd..'",'..tsArgsLocal..');}')
-		'_bllua_luacall(_bllua_process_cmd,"'..cmd..'",'..arglist..');}')
 end
 function bl.addServerCmd(name, func)
 	name = name:lower()
@@ -657,8 +794,9 @@ function bl.commandToServer(cmd, ...)
 		_bllua_ts.call('addTaggedString', cmd),
 		unpack(arglistToTs({...})))
 end
-function bl.commandToClient(cmd, ...)
+function bl.commandToClient(client, cmd, ...)
 	_bllua_ts.call('commandToClient',
+		valToTs(client),
 		_bllua_ts.call('addTaggedString', cmd),
 		unpack(arglistToTs({...})))
 end
@@ -687,9 +825,6 @@ 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, {...})
@@ -703,7 +838,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,hookNargs do
+	for i=1,tsMaxArgs do
 		_bllua_ts.setvar('_bllua_hook_arg'..i, valToTs(args[i]))
 	end
 end
@@ -720,13 +855,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..
-			'",'..hookArglistLocal..');') or ''
+			'",'..tsArgsLocal..');') or ''
-	local arglist = (hk.before and hookArglistGlobal or hookArglistLocal)
+	local arglist = (hk.before and tsArgsGlobal or tsArgsLocal)
 	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 ''
@@ -735,10 +870,11 @@ local function updateHook(pkg, name, hk)
 			arglist..');') or ''
 	local code =
 		'package '..pkg..'{'..
-			'function '..name..'('..hookArglistLocal..'){'..
+			'function '..name..'('..tsArgsLocal..'){'..
 				beforeCode..parentCode..afterCode..
 			'}'..
 		'};'
+	print('bl.hook eval output: [['..code..']]')
 	_bllua_ts.eval(code)
 end
 function bl.hook(pkg, name, time, func)
@@ -764,9 +900,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 not isValidFuncNameNs(name) then
+	if name and not isValidFuncNameNs(name) then
 		error('bl.unhook: argument #2: invalid function name \''..tostring(name)..'\'', 2) end
-	if time~='before' and time~='after' then
+	if time and time~='before' and time~='after' then
 		error('bl.unhook: argument #3: time must be \'before\' or \'after\'', 2) end
 	
 	if not name then
@@ -793,10 +929,13 @@ 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]) and tableEmpty(bl._hooks[pkg]) then
+				if tableEmpty(bl._hooks[pkg][name]) then
+					bl._hooks[pkg][name] = nil
+				end
+				if tableEmpty(bl._hooks[pkg]) then
 					bl._hooks[pkg] = nil
-					deactivatePackage(pkg)
 					updateHook(pkg, name, {})
+					deactivatePackage(pkg)
 				else
 					updateHook(pkg, name, bl._hooks[pkg][name])
 				end
@@ -852,7 +991,7 @@ function bl.raycast(start, stop, mask, ignores)
 	local stopS = vecToTs(start)
 	local maskS = maskToTs(mask)
 	local ignoresS = {}
-	for _,v in ipairs(ignores) do
+	for _,v in ipairsNilable(ignores) do
 		table.insert(ignoresS, objToTs(v))
 	end
 	
@@ -901,7 +1040,7 @@ end
 local maxTsArgLen = 8192
 local function valsToString(vals)
 	local strs = {}
-	for i,v in ipairs(vals) do
+	for i,v in ipairsNilable(vals) do
 		local tstr = table.tostring(v)
 		if #tstr>maxTsArgLen then
 			tstr = tostring(v)

src/util/libts-lua.lua

@@ -89,11 +89,12 @@ local allowed_zip_dirs = tflip{
 local function io_open_absolute(fn, mode)
 	-- if file exists, use original mode
 	local res, err = _bllua_io_open(fn, mode)
-	if res then return res end
+	if res then return res
+	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
 	local dir = fn:match('^[^/]+')
-	if not allowed_zip_dirs[dir:lower()] then return nil, 'File is not in one of the allowed directories' end
+	if not allowed_zip_dirs[dir:lower()] then return nil, 'Zip is not in one of the allowed directories' end
 	local exist = _bllua_ts.call('isFile', fn) == '1'
 	if not exist then return nil, err end
 	
@@ -192,12 +193,6 @@ function require(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)
 	return f~=nil

src/util/libts-ts.cs

@@ -49,26 +49,4 @@ 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

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

src/util/std.lua

@@ -5,7 +5,7 @@
 -- 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, ...)
@@ -13,8 +13,18 @@ function table.map(f, ...)
 	local u = {}
 	for k,_ in pairs(ts[1]) do
 		local args = {}
-		for j=1,#ts do args[j] = ts[j][i] end
+		for j=1,#ts do args[j] = ts[j][k] end
-		u[i] = f(unpack(args))
+		u[k] = f(unpack(args))
+	end
+	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
@@ -28,6 +38,16 @@ function table.map_list(f, ...)
 	end
 	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 = {}
@@ -179,7 +199,7 @@ valueToString = function(v, tabLevel, seen)
 		return tostring(v)
 	else
 		--error('table.tostring: table contains a '..t..' value, cannot serialize')
-		return 'nil --[[ cannot serialize '..t..': '..tostring(v)..' ]]'
+		return 'nil --[[ '..tostring(v)..' ]]'
 	end
 end
 function table.tostring(t)
@@ -345,3 +365,6 @@ end
 function math.clamp(v, n, x)
 	return math.min(x, math.max(v, n))
 end
+
+
+print('  Executed std.lua')

src/util/vector.lua

@@ -216,4 +216,7 @@ vector_new = function(vi)
 end
 
 vector = vector_new
+
+print('  Executed vector.lua')
+
 return vector_new