Merge branch 'master'

inc/lua/luaconf.h

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

readme.md

@@ -36,6 +36,8 @@ Lua scripting for Blockland
 `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.
+`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  
@@ -101,10 +103,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.object(thing)` - Manually convert a Torque object reference (object ID or name) into a Lua object.
+`bl.boolean(arg)` - 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.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,6 +132,9 @@ 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]`  
 `string[{start,stop}]`  
@@ -163,12 +169,7 @@ 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  
@@ -178,6 +179,17 @@ TorqueScript stores no type information; all values in TorqueScript are strings.
 - Any `string` is passed directly as a string  
 - Tables cannot be passed and will throw an error  
 
+### 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 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" in TorqueScript parlance), 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 objects 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.  

src/bllua4.cpp

@@ -31,6 +31,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");
@@ -72,6 +73,7 @@ bool init() {
   // Load utilities
   BLL_LOAD_LUA(gL, bll_fileLuaStd);
   BLL_LOAD_LUA(gL, bll_fileLuaVector);
+  BLL_LOAD_LUA(gL, bll_fileLuaMatrix);
   BLL_LOAD_LUA(gL, bll_fileLuaLibts);
   BlEval(bll_fileTsLibts);
   BLL_LOAD_LUA(gL, bll_fileLuaLibbl);

src/lua-env-safe.lua

@@ -143,4 +143,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,5 @@ function _bllua_on_error(err)
   return table.concat(tracelines, '\n')
 end
 
-_bllua_ts.echo('  Executed bllua-env.lua')
+print = _bllua_ts.echo
+print('  Executed bllua-env.lua')

src/luainterp.cpp

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

src/luainterp.hpp

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

src/lualibts.cpp

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

src/tsliblua.cpp

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

src/util/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,8 +2,6 @@
 -- Main lua-side functionality of bllua,
 -- provided through the global table 'bl.'
 
--- todo: set
-
 local _bllua_ts = ts
 
 bl = bl or {}
@@ -18,7 +16,7 @@ local function map(t, f)
 	return u
 end
 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 +74,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,36 +98,75 @@ 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,
-  ['object'] = function(val) toTsObject(val) end, -- toTsObject not defined yet
-  ['string'] = tostring,
+	['object'] = function(val) toTsObject(val) end, -- wrap because toTsObject not defined yet
+	['string'] = function(val) return val end,
 }
-local function convertValFromTs(val, typ)
+local function forceValFromTs(val, typ)
 	return fromTsForceTypes[typ](val) or
 		error('valFromTs: invalid force type '..typ, 4)
 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
 	if type(val)~='string' then
-    error('valFromTs: expected string, got ' .. type(val), 3)
-  end
+		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
@@ -137,18 +174,9 @@ 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
-  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) } end
-  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]+)$')
-  -- box (2 vectors)
-  if x1S then
-    return {
-      vector { tonumber(x1S), tonumber(y1S), tonumber(z1S) },
-      vector { tonumber(x2S), tonumber(y2S), tonumber(z2S) } }
-  end
+	-- vector, box, or axis->matrix
+	local vec = multinumericFromTs(val)
+	if vec then return vec end
 	-- string
 	return val
 end
@@ -165,18 +193,15 @@ end
 local function classFromForceTypeStr(name)
 	local class, rest = name:match('^([a-zA-Z0-9_]+)(::.+)$')
 	if not class then
-    class, rest = name:match('^([a-zA-Z0-9_]+)(%..+)$')
-  end
+		class, rest = name:match('^([a-zA-Z0-9_]+)(%..+)$') end
 	return class,rest
 end
 local setForceType
 setForceType = function(ftname, typ)
 	if typ~=nil and not fromTsForceTypes[typ] then
-    error('bl.type: invalid type \'' .. typ .. '\'', 2)
-  end
+		error('bl.type: invalid type \''..typ..'\'', 2) end
 	if not isValidFuncNameNsArgn(ftname) then
-    error('bl.type: invalid function or variable name \'' .. ftname .. '\'', 2)
-  end
+		error('bl.type: invalid function or variable name \''..ftname..'\'', 2) end
 
 	ftname = ftname:lower()
 
@@ -195,48 +220,66 @@ 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
 local function tsIsFunctionNsname(nsname)
 	local ns, name = nsname:match('^([^:]+)::([^:]+)$')
-  if ns then
-    return tsIsFunctionNs(ns, name)
-  else
-    return tsIsFunction(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
-    obj = obj._tsObjectId
-  elseif type(obj) == 'number' then
-    obj = tostring(obj)
-  elseif type(obj) ~= 'string' then
+	if type(obj)=='number' then -- object id
+		return tsIsObject(tostring(obj))
+	elseif type(obj)=='string' then -- object name
+		return tsIsObject(obj)
+	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)
-  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
+function bl.isFunction(name)
+	return tsIsFunctionNsname(name)
 end
 
 -- Torque object pseudo-class
@@ -249,11 +292,9 @@ local tsClassMeta = {
 bl._objectUserMetas = bl._objectUserMetas or {}
 function bl.class(cname, inhname)
 	if not ( type(cname)=='string' and isValidFuncName(cname) ) then
-    error('bl.class: argument #1: invalid class name', 2)
-  end
+		error('bl.class: argument #1: invalid class name', 2) end
 	if not ( inhname==nil or (type(inhname)=='string' and isValidFuncName(inhname)) ) then
-    error('bl.class: argument #2: inherit name must be a string or nil', 2)
-  end
+		error('bl.class: argument #2: inherit name must be a string or nil', 2) end
 	cname = cname:lower()
 
 	local met = bl._objectUserMetas[cname] or {
@@ -268,18 +309,15 @@ function bl.class(cname, inhname)
 		inhname = inhname:lower()
 
 		local inh = bl._objectUserMetas[inhname]
-    if not inh then
-      error('bl.class: argument #2: \'' .. inhname .. '\' is not the ' ..
-        'name of an existing class', 2)
-    end
+		if not inh then error('bl.class: argument #2: \''..inhname..'\' is not the '..
+			'name of an existing class', 2) end
 
 		inh._children[cname] = true
 
 		local inhI = met._inherit
 		if inhI and inhI~=inh then
 			error('bl.class: argument #2: class already exists and '..
-        'inherits a different parent.', 2)
-    end
+				'inherits a different parent.', 2) end
 		met._inherit = inh
 
 		-- apply inherited method and field types
@@ -291,7 +329,6 @@ function bl.class(cname, inhname)
 		end
 	end
 end
-
 local function objectInheritedMetas(name)
 	local inh = bl._objectUserMetas[name:lower()]
 	return function()
@@ -306,18 +343,15 @@ local tsObjectMeta = {
 	-- Return torque member function or value
 	__index = function(t, name)
 		if rawget(t,'_deleted') then
-      error('ts object index: object no longer exists', 2)
-    end
+			error('ts object index: object no longer exists', 2) end
 		if type(name)~='string' and type(name)~='number' then
-      error('ts object index: index must be a string or number', 2)
-    end
+			error('ts object index: index must be a string or number', 2) end
 		if getmetatable(t)[name] then
 			return getmetatable(t)[name]
 		elseif type(name)=='number' then
 			if not tsIsFunctionNs(rawget(t,'_tsNamespace'), 'getObject') then
 				error('ts object __index: index is number, but object does not have '..
-          'getObject method', 2)
-      end
+					'getObject method', 2) end
 			return toTsObject(_bllua_ts.callobj(t._tsObjectId, 'getObject',
 				tostring(name)))
 		else
@@ -349,11 +383,9 @@ local tsObjectMeta = {
 	-- Use :set() to set Torque data
 	__newindex = function(t, name, val)
 		if rawget(t,'_deleted') then
-      error('ts object newindex: object no longer exists', 2)
-    end
+			error('ts object newindex: object no longer exists', 2) end
 		if type(name)~='string' then
-      error('ts object newindex: index must be a string', 2)
-    end
+			error('ts object newindex: index must be a string', 2) end
 		rawset(t, name, val)
 		-- create strong reference since it's now storing lua data
 		bl._objectsStrong[rawget(t,'_tsObjectId')] = t
@@ -362,31 +394,27 @@ local tsObjectMeta = {
 	-- Use to set torque data
 	set = function(t, name, val)
 		if t==nil or type(t)~='table' or not t._tsObjectId then
-      error('ts object method: be sure to use :func() not .func()', 2)
-    end
+			error('ts object method: be sure to use :func() not .func()', 2) end
 		if t._deleted then
-      error('ts object method: object no longer exists', 2)
-    end
+			error('ts object method: object no longer exists', 2) end
 		if type(name)~='string' then
-      error('ts object :set(): index must be a string', 2)
-    end
+			error('ts object :set(): index must be a string', 2) end
 		_bllua_ts.setfield(t._tsObjectId, name, valToTs(val))
 	end,
 	-- __tostring: Called when printing
 	-- 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
 	__len = function(t)
 		if t._deleted then
-      error('ts object __len: object no longer exists', 2)
-    end
+			error('ts object __len: object no longer exists', 2) end
 		if not tsIsFunctionNs(t._tsNamespace, 'getCount') then
-      error('ts object __len: object has no getCount method', 2)
-    end
+			error('ts object __len: object has no getCount method', 2) end
 		return tonumber(_bllua_ts.callobj(t._tsObjectId, 'getCount'))
 	end,
 	-- object:members()
@@ -394,17 +422,14 @@ local tsObjectMeta = {
 	-- for index, object in group:members() do ... end
 	members = function(t)
 		if t==nil then
-      error('ts object method: be sure to use :func() not .func()', 2)
-    end
+			error('ts object method: be sure to use :func() not .func()', 2) end
 		if t._deleted then
-      error('ts object method: object no longer exists', 2)
-    end
+			error('ts object method: object no longer exists', 2) end
 		if not (
 			tsIsFunctionNs(t._tsNamespace, 'getCount' ) and
 			tsIsFunctionNs(t._tsNamespace, 'getObject')) then
 			error('ts object :members() - '..
-        'Object does not have getCount and getObject methods', 2)
-    end
+				'Object does not have getCount and getObject methods', 2) end
 		local count = tonumber(_bllua_ts.callobj(t._tsObjectId, 'getCount'))
 		local idx = 0
 		return function()
@@ -421,29 +446,23 @@ local tsObjectMeta = {
 	-- Wrap some Torque functions for performance and error checking
 	getName = function(t)
 		if t==nil then
-      error('ts object method: be sure to use :func() not .func()', 2)
-    end
+			error('ts object method: be sure to use :func() not .func()', 2) end
 		if t._deleted then
-      error('ts object method: object no longer exists', 2)
-    end
+			error('ts object method: object no longer exists', 2) end
 		return t._tsName
 	end,
 	getId = function(t)
 		if t==nil then
-      error('ts object method: be sure to use :func() not .func()', 2)
-    end
+			error('ts object method: be sure to use :func() not .func()', 2) end
 		if t._deleted then
-      error('ts object method: object no longer exists', 2)
-    end
+			error('ts object method: object no longer exists', 2) end
 		return tonumber(t._tsObjectId)
 	end,
 	getType = function(t)
 		if t==nil then
-      error('ts object method: be sure to use :func() not .func()', 2)
-    end
+			error('ts object method: be sure to use :func() not .func()', 2) end
 		if t._deleted then
-      error('ts object method: object no longer exists', 2)
-    end
+			error('ts object method: object no longer exists', 2) end
 		return tsTypesByNum[_bllua_ts.callobj(t._tsObjectId, 'getType')]
 	end,
 	---- Schedule method for objects
@@ -465,12 +484,12 @@ local tsObjectMeta = {
 	--end,
 	exists = function(t)
 		if t==nil then
-      error('ts object method: be sure to use :func() not .func()', 2)
-    end
+			error('ts object method: be sure to use :func() not .func()', 2) end
 		if t._deleted then
 			return false
+		else
+			return assertTsObjectExists(t)
 		end
-    return tsIsObject(t._tsObjectId)
 	end,
 }
 -- Weak-values table for caching Torque object references
@@ -499,15 +518,13 @@ end
 -- Return a Torque object for the object ID string, or create one if none exists
 toTsObject = function(idiS)
 	if type(idiS)~='string' then
-    error('toTsObject: input must be a string', 2)
-  end
+		error('toTsObject: input must be a string', 2) end
 	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
+		return nil end
 
 	local className = _bllua_ts.callobj(idiS, 'getClassName')
 	local obj = {
@@ -595,15 +612,16 @@ function bl.call(func, ...)
 	local argsS = arglistToTs(args)
 	return _bllua_ts.call(func, unpack(argsS))
 end
-
 function bl.eval(code)
 	return valFromTs(_bllua_ts.eval(code))
 end
-
 function bl.exec(file)
 	return valFromTs(_bllua_ts.call('exec', file))
 end
-
+function bl.array(name, ...)
+	local rest = {...}
+	return name..table.concat(rest, '_')
+end
 function bl.boolean(val)
 	return val~=nil and
 		val~=false and
@@ -611,7 +629,6 @@ function bl.boolean(val)
 		--val~='0' and
 		val~=0
 end
-
 function bl.object(id)
 	if type(id)=='table' and id._tsObjectId then
 		return id
@@ -621,21 +638,62 @@ function bl.object(id)
 		error('bl.object: id must be a ts object, number, or string', 2)
 	end
 end
-
-function bl.array(name, ...)
-  local rest = { ... }
-  return name .. table.concat(rest, '_')
+function bl.string(val)
+	return valFromTsTostring(val)
 end
 
-function _bllua_call(fnameS, ...)
-  local args = arglistFromTs('lua:' .. fnameS:lower(), { ... }) -- todo: allow this though bl.type
-  if not _G[fnameS] then
-    error('luacall: no global lua function named \'' .. fnameS .. '\'')
+-- Lua calling from TS
+local luaLookup
+luaLookup = function(tbl, name, set, val)
+	print('lookup', tbl, name, set, val)
+	if name:find('%.') then
+		local first, rest = name:match('^([^%.:]+)%.(.+)$')
+		if not isValidFuncName(first) then
+			error('luaLookup: invalid name \''..tostring(first)..'\'', 3) end
+		if not tbl[first] then
+			if set then tbl[first] = {}
+			else return nil end
 		end
-  -- todo: library fields and object methods
-  local res = _G[fnameS](unpack(args))
+		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 tbl[first] then
+			error('luacall: no object named \''..rest..'\'', 3) end
+		if not tbl[first][rest] 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 \''..name..'\'', 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...)
@@ -663,7 +721,6 @@ function bl.schedule(time, cb, ...)
 	bl._scheduleTable[id] = sch
 	return sch
 end
-
 function _bllua_schedule_callback(idS)
 	local id = tonumber(idS) or
 		error('_bllua_schedule_callback: invalid id: '..tostring(idS))
@@ -682,11 +739,9 @@ function _bllua_process_cmd(cmdS, ...)
 	if not func then error('_bllua_process_cmd: no cmd named \''..cmd..'\'') end
 	func(unpack(args)) --pcall(func, unpack(args))
 end
-
 local function addCmd(cmd, func)
 	if not isValidFuncName(cmd) then
-    error('addCmd: invalid function name \'' .. tostring(cmd) .. '\'')
-  end
+		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..'('..arglist..'){'..
@@ -697,7 +752,6 @@ function bl.addServerCmd(name, func)
 	addCmd('servercmd'..name, func)
 	bl._forceType['servercmd'..name..':1'] = 'object'
 end
-
 function bl.addClientCmd(name, func)
 	name = name:lower()
 	addCmd('clientcmd'..name, func)
@@ -709,13 +763,11 @@ function bl.commandToServer(cmd, ...)
 		_bllua_ts.call('addTaggedString', cmd),
 		unpack(arglistToTs({...})))
 end
-
 function bl.commandToClient(cmd, ...)
 	_bllua_ts.call('commandToClient',
 		_bllua_ts.call('addTaggedString', cmd),
 		unpack(arglistToTs({...})))
 end
-
 function bl.commandToAll(cmd, ...)
 	_bllua_ts.call('commandToAll',
 		_bllua_ts.call('addTaggedString', cmd),
@@ -743,16 +795,14 @@ local function deactivatePackage(pkg)
 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'
+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, {...})
 	local func = bl._hooks[pkgS] and bl._hooks[pkgS][nameS] and
 		bl._hooks[pkgS][nameS].before
 	if not func then
-    error('_bllua_process_hook_before: no hook for ' .. pkgs .. ':' .. nameS)
-  end
+		error('_bllua_process_hook_before: no hook for '..pkgs..':'..nameS) end
 	_bllua_ts.setvar('_bllua_hook_abort', '0')
 	func(args) --pcall(func, args)
 	if args._return then
@@ -763,7 +813,6 @@ function _bllua_process_hook_before(pkgS, nameS, ...)
 		_bllua_ts.setvar('_bllua_hook_arg'..i, valToTs(args[i]))
 	end
 end
-
 function _bllua_process_hook_after(pkgS, nameS, resultS, ...)
 	nameS = nameS:lower()
 	local args = arglistFromTs(nameS, {...})
@@ -771,12 +820,10 @@ function _bllua_process_hook_after(pkgS, nameS, resultS, ...)
 	local func = bl._hooks[pkgS] and bl._hooks[pkgS][nameS] and
 		bl._hooks[pkgS][nameS].after
 	if not func then
-    error('_bllua_process_hook_after: no hook for ' .. pkgs .. ':' .. nameS)
-  end
+		error('_bllua_process_hook_after: no hook for '..pkgs..':'..nameS) end
 	func(args) --pcall(func, args)
 	return valToTs(args._return)
 end
-
 local function updateHook(pkg, name, hk)
 	local beforeCode = hk.before and
 		('_bllua_luacall("_bllua_process_hook_before", "'..pkg..'","'..name..
@@ -802,17 +849,13 @@ local function updateHook(pkg, name, hk)
 end
 function bl.hook(pkg, name, time, func)
 	if not isValidFuncName(pkg) then
-    error('bl.hook: argument #1: invalid package name \'' .. tostring(pkg) .. '\'', 2)
-  end
+		error('bl.hook: argument #1: invalid package name \''..tostring(pkg)..'\'', 2) end
 	if not isValidFuncNameNs(name) then
-    error('bl.hook: argument #2: invalid function name \'' .. tostring(name) .. '\'', 2)
-  end
+		error('bl.hook: argument #2: invalid function name \''..tostring(name)..'\'', 2) end
 	if time~='before' and time~='after' then
-    error('bl.hook: argument #3: time must be \'before\' or \'after\'', 2)
-  end
+		error('bl.hook: argument #3: time must be \'before\' or \'after\'', 2) end
 	if type(func)~='function' then
-    error('bl.hook: argument #4: expected a function', 2)
-  end
+		error('bl.hook: argument #4: expected a function', 2) end
 
 	bl._hooks[pkg]             = bl._hooks[pkg]       or {}
 	bl._hooks[pkg][name]       = bl._hooks[pkg][name] or {}
@@ -821,20 +864,16 @@ function bl.hook(pkg, name, time, func)
 	updateHook(pkg, name, bl._hooks[pkg][name])
 	activatePackage(pkg)
 end
-
 local function tableEmpty(t)
 	return next(t)~=nil
 end
 function bl.unhook(pkg, name, time)
 	if not isValidFuncName(pkg) then
-    error('bl.unhook: argument #1: invalid package name \'' .. tostring(pkg) .. '\'', 2)
-  end
+		error('bl.unhook: argument #1: invalid package name \''..tostring(pkg)..'\'', 2) end
 	if not isValidFuncNameNs(name) then
-    error('bl.unhook: argument #2: invalid function name \'' .. tostring(name) .. '\'', 2)
-  end
+		error('bl.unhook: argument #2: invalid function name \''..tostring(name)..'\'', 2) end
 	if time~='before' and time~='after' then
-    error('bl.unhook: argument #3: time must be \'before\' or \'after\'', 2)
-  end
+		error('bl.unhook: argument #3: time must be \'before\' or \'after\'', 2) end
 
 	if not name then
 		if bl._hooks[pkg] then
@@ -858,8 +897,7 @@ function bl.unhook(pkg, name, time)
 				updateHook(pkg, name, {})
 			else
 				if time~='before' and time~='after' then
-          error('bl.unhook: argument #3: time must be nil, \'before\', or \'after\'', 2)
-        end
+					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
 					bl._hooks[pkg] = nil
@@ -879,16 +917,14 @@ end
 -- Container search/raycast
 local function vecToTs(v)
 	if not isTsVector(v) then
-    error('vecToTs: argument is not a vector', 3)
-  end
+		error('vecToTs: argument is not a vector', 3) end
 	return table.concat(v, ' ')
 end
 local function maskToTs(mask)
 	if type(mask)=='string' then
 		local val = tsTypesByName[mask:lower()]
 		if not val then
-      error('maskToTs: invalid mask \'' .. mask .. '\'', 3)
-    end
+			error('maskToTs: invalid mask \''..mask..'\'', 3) end
 		return tostring(val)
 	elseif type(mask)=='table' then
 		local tval = 0
@@ -898,8 +934,7 @@ local function maskToTs(mask)
 				local val = tsTypesByName[v:lower()]
 				if not val then
 					error('maskToTs: invalid mask \''..v..
-            '\' at index ' .. i .. ' in mask list', 3)
-        end
+						'\' at index '..i..' in mask list', 3) end
 				tval = tval + val
 				seen[v] = true
 			end
@@ -941,7 +976,6 @@ function bl.raycast(start, stop, mask, ignores)
 		return hit, pos, norm
 	end
 end
-
 local function tsContainerSearchIterator()
 	local retS = _bllua_ts.call('containerSearchNext')
 	if retS=='0' then
@@ -958,12 +992,10 @@ function bl.boxSearch(pos, size, mask)
 	_bllua_ts.call('initContainerBoxSearch', posS, sizeS, maskS)
 	return tsContainerSearchIterator
 end
-
 function bl.radiusSearch(pos, radius, mask)
 	local posS = vecToTs(pos)
 	if type(radius)~='number' then
-    error('bl.radiusSearch: argument #2: radius must be a number', 2)
-  end
+		error('bl.radiusSearch: argument #2: radius must be a number', 2) end
 	local radiusS = tostring(radius)
 	local maskS = maskToTs(mask)
 
@@ -1001,8 +1033,7 @@ local function createTsObj(keyword, class, name, inherit, props)
 	if props then
 		for k,v in pairs(props) do
 			if not isValidFuncName(k) then
-        error('bl.new/bl.datablock: invalid property name \'' .. k .. '\'')
-      end
+				error('bl.new/bl.datablock: invalid property name \''..k..'\'') end
 			table.insert(propsT, k..'="'..valToTs(v)..'";')
 		end
 	end
@@ -1013,8 +1044,7 @@ local function createTsObj(keyword, class, name, inherit, props)
 		table.concat(propsT)..'};')
 	local obj = toTsObject(objS)
 	if not obj then
-    error('bl.new/bl.datablock: failed to create object', 3)
-  end
+		error('bl.new/bl.datablock: failed to create object', 3) end
 
 	return obj
 end
@@ -1039,15 +1069,13 @@ local function parseTsDecl(decl)
 		(inherit==nil or isValidFuncName(inherit)) ) then
 		error('bl.new/bl.datablock: invalid decl \''..decl..'\'\n'..
 			'must be of the format: \'className\', \'className name\', '..
-      '\'className :inherit\', or \'className name:inherit\'', 3)
-  end
+			'\'className :inherit\', or \'className name:inherit\'', 3) end
 	return class, name, inherit
 end
 function bl.new(decl, props)
 	local class, name, inherit = parseTsDecl(decl)
 	return createTsObj('new', class, name, inherit, props)
 end
-
 function bl.datablock(decl, props)
 	local class, name, inherit = parseTsDecl(decl)
 	if not name then error('bl.datablock: must specify a name', 2) end

src/util/libts-lua.lua

@@ -135,8 +135,8 @@ end
 
 ---@diagnostic disable-next-line: duplicate-set-field
 function io.lines(fn)
-  local fi, err, fn2 = io.open(fn, 'r', 2)
-  if not fi then error('Error opening file \'' .. tostring(fn2) .. '\': ' .. tostring(err), 2) end
+  local fi, err, fn2 = io.open(fn, nil, 2)
+  if not fi then error('Error opening file \'' .. fn2 .. '\': ' .. err, 2) end
   return fi:lines()
 end
 
@@ -156,7 +156,7 @@ function dofile(fn, errn)
   errn = errn or 1
 
   local fi, err, fn2 = io.open(fn, 'r', errn + 1)
-  if not fi then error('Error executing file \'' .. tostring(fn2) .. '\': ' .. tostring(err), errn + 1) end
+  if not fi then error('Error executing file \'' .. fn2 .. '\': ' .. err, errn + 1) end
 
   print('Executing ' .. fn2)
   local text = fi:read('*a')
@@ -204,15 +204,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,6 @@
+-- todo
+-- Matrix class with math operators
+
+
+
+print('  Executed matrix.lua')

src/util/std.lua

@@ -193,7 +193,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 --[[ cannot serialize ' .. tostring(v) .. ' ]]'
   end
 end
 function table.tostring(t)
@@ -372,3 +372,5 @@ end
 function math.clamp(v, n, x)
   return math.min(x, math.max(v, n))
 end
+
+print('  Executed std.lua')

src/util/vector.lua

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