diff --git a/BlockLua.dll b/BlockLua.dll new file mode 100644 index 0000000..a11bb18 Binary files /dev/null and b/BlockLua.dll differ diff --git a/readme.md b/readme.md index 1e5e5c2..e78f471 100644 --- a/readme.md +++ b/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. diff --git a/src/bllua4.cpp b/src/bllua4.cpp index d5acac0..01bcf36 100644 --- a/src/bllua4.cpp +++ b/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); diff --git a/src/lua-env-safe.lua b/src/lua-env-safe.lua index aa46dad..07f485a 100644 --- a/src/lua-env-safe.lua +++ b/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') diff --git a/src/lua-env.lua b/src/lua-env.lua index 618fec4..761a23d 100644 --- a/src/lua-env.lua +++ b/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') diff --git a/src/util/libbl-support.cs b/src/util/libbl-support.cs index c4032d0..873b50b 100644 --- a/src/util/libbl-support.cs +++ b/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"); diff --git a/src/util/libbl.lua b/src/util/libbl.lua index d875a76..52195df 100644 --- a/src/util/libbl.lua +++ b/src/util/libbl.lua @@ -2,1056 +2,1084 @@ -- Main lua-side functionality of bllua, -- provided through the global table 'bl.' --- todo: set - local _bllua_ts = ts bl = bl or {} -- Misc -- Apply a function to each element in a list, building a new list from the returns -local function map(t, f) - local u = {} - for i, v in ipairs(t) do - u[i] = f(v) - end - return u +local function map(t,f) + local u = {} + for i,v in ipairs(t) do + u[i] = f(v) + end + 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 ( - name:find('^[a-zA-Z0-9_]+$') or - name:find('^[a-zA-Z0-9_]+::[a-zA-Z0-9_]+$')) + return type(name)=='string' and ( + name:find('^[a-zA-Z0-9_]+$') or + name:find('^[a-zA-Z0-9_]+::[a-zA-Z0-9_]+$') ) end local function isValidFuncNameNsArgn(name) - return type(name) == 'string' and ( - name:find('^[a-zA-Z0-9_]+$') or - name:find('^[a-zA-Z0-9_]+%.[a-zA-Z0-9_]+$') or - name:find('^[a-zA-Z0-9_]+::[a-zA-Z0-9_]+$') or - name:find('^[a-zA-Z0-9_]+:[0-9]+$') or - name:find('^[a-zA-Z0-9_]+::[a-zA-Z0-9_]+:[0-9]+$')) + return type(name)=='string' and ( + name:find('^[a-zA-Z0-9_]+$') or + name:find('^[a-zA-Z0-9_]+%.[a-zA-Z0-9_]+$') or + name:find('^[a-zA-Z0-9_]+::[a-zA-Z0-9_]+$') or + name:find('^[a-zA-Z0-9_]+:[0-9]+$') or + name:find('^[a-zA-Z0-9_]+::[a-zA-Z0-9_]+:[0-9]+$') ) end -- Whether a var can be converted into a TS vector local function isTsVector(val) - if type(val) ~= 'table' then return false end - if #val ~= 3 and #val ~= 2 then return false end - if val.__is_vector then return true end - for _, v in ipairs(val) do - if type(v) ~= 'number' then return false end - end - return true + if type(val)~='table' then return false end + if #val~=3 and #val~=2 then return false end + if val.__is_vector then return true end + for _,v in ipairs(val) do + if type(v)~='number' then return false end + end + return true end -- Use strings for object types instead of integer bitmasks like in TS local tsTypesByName = { - ['all'] = -1, - ['static'] = 1, - ['environment'] = 2, - ['terrain'] = 4, - ['water'] = 16, - ['trigger'] = 32, - ['marker'] = 64, - ['gamebase'] = 1024, - ['shapebase'] = 2048, - ['camera'] = 4096, - ['staticshape'] = 8192, - ['player'] = 16384, - ['item'] = 32768, - ['vehicle'] = 65536, - ['vehicleblocker'] = 131072, - ['projectile'] = 262144, - ['explosion'] = 524288, - ['corpse'] = 1048576, - ['debris'] = 4194304, - ['physicalzone'] = 8388608, - ['staticts'] = 16777216, - ['brick'] = 33554432, - ['brickalways'] = 67108864, - ['staticrendered'] = 134217728, - ['damagableitem'] = 268435456, + ['all'] = -1, + ['static'] = 1, + ['environment'] = 2, + ['terrain'] = 4, + ['water'] = 16, + ['trigger'] = 32, + ['marker'] = 64, + ['gamebase'] = 1024, + ['shapebase'] = 2048, + ['camera'] = 4096, + ['staticshape'] = 8192, + ['player'] = 16384, + ['item'] = 32768, + ['vehicle'] = 65536, + ['vehicleblocker'] = 131072, + ['projectile'] = 262144, + ['explosion'] = 524288, + ['corpse'] = 1048576, + ['debris'] = 4194304, + ['physicalzone'] = 8388608, + ['staticts'] = 16777216, + ['brick'] = 33554432, + ['brickalways'] = 67108864, + ['staticrendered'] = 134217728, + ['damagableitem'] = 268435456, } local tsTypesByNum = {} -for k, v in pairs(tsTypesByName) do - tsTypesByNum[v] = k +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 -local function tsBool(v) return v ~= '' and v ~= '0' end +local function tsBool(v) return v~='' and v~='0' end -- Convert a Lua var into a TS string, or error if not possible local function valToTs(val) - if val == nil then -- nil -> '' - return '' - elseif type(val) == 'boolean' then -- bool -> 0 or 1 - return val and '1' or '0' - elseif type(val) == 'number' then -- number - return tostring(val) - elseif type(val) == 'string' then -- string - return val - elseif type(val) == 'table' then - if val._tsObjectId then -- object -> object id - return tostring(val._tsObjectId) - elseif isTsVector(val) then -- vector - > 3 numbers - return table.concat(val, ' ') - elseif #val == 2 and isTsVector(val[1]) and isTsVector(val[2]) then - -- box - > 6 numbers - return table.concat(val[1], ' ') .. ' ' .. table.concat(val[2], ' ') - else - error('valToTs: could not convert table', 3) - end - else - error('valToTs: could not convert ' .. type(val), 3) - end + if val==nil then -- nil -> '' + return '' + elseif type(val)=='boolean' then -- bool -> 0 or 1 + return val and '1' or '0' + elseif type(val)=='number' then -- number + return tostring(val) + elseif type(val)=='string' then -- string + return val + elseif type(val)=='table' then + if val._tsObjectId then -- object -> object id + return tostring(val._tsObjectId) + elseif isTsVector(val) then -- vector - > 3 numbers + return table.concat(val, ' ') + elseif #val==2 and isTsVector(val[1]) and isTsVector(val[2]) then + -- box - > 6 numbers + return table.concat(val[1], ' ')..' '..table.concat(val[2], ' ') + else + error('valToTs: cannot pass Lua tables to TorqueScript.', 3) + end + else + 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, + ['boolean'] = tsBool, + ['object'] = function(val) toTsObject(val) end, -- wrap because toTsObject not defined yet + ['string'] = function(val) return val end, } -local function convertValFromTs(val, typ) - return fromTsForceTypes[typ](val) or - error('valFromTs: invalid force type ' .. typ, 4) +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 - if name then - name = name:lower() - if bl._forceType[name] then - return convertValFromTs(val, bl._forceType[name]) - end - end - if name2 then - name2 = name2:lower() - if bl._forceType[name2] then - return convertValFromTs(val, bl._forceType[name2]) - end - end - -- '' -> nil - if val == '' then return nil end - -- 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 - -- string - return val + 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]) + end + end + if name2 then + name2 = name2:lower() + if bl._forceType[name2] then + return forceValFromTs(val, bl._forceType[name2]) + end + end + -- '' -> nil + if val=='' then return nil end + -- number + local num = tonumber(val) + if num then return num end + -- vector, box, or axis->matrix + local vec = multinumericFromTs(val) + if vec then return vec end + -- string + return val end local function arglistFromTs(name, argsS) - local args = {} - for i, arg in ipairs(argsS) do - args[i] = valFromTs(arg, name .. ':' .. i) - end - return args + local args = {} + for i,arg in ipairs(argsS) do + args[i] = valFromTs(arg, name..':'..i) + end + return args end local function arglistToTs(args) - return map(args, valToTs) + return map(args, valToTs) 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 - return class, rest + local class, rest = name:match('^([a-zA-Z0-9_]+)(::.+)$') + if not class then + 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 - if not isValidFuncNameNsArgn(ftname) then - error('bl.type: invalid function or variable name \'' .. ftname .. '\'', 2) - end - - ftname = ftname:lower() - - bl._forceType[ftname] = typ - - -- apply to child classes if present - local cname, rest = classFromForceTypeStr(ftname) - if cname then - local meta = bl._objectUserMetas[cname] - if meta then - for chcname, _ in pairs(meta._children) do - setForceType(chcname .. rest, typ) - end - end - end + if typ~=nil and not fromTsForceTypes[typ] then + error('bl.type: invalid type \''..typ..'\'', 2) end + if not isValidFuncNameNsArgn(ftname) then + error('bl.type: invalid function or variable name \''..ftname..'\'', 2) end + + ftname = ftname:lower() + + bl._forceType[ftname] = typ + + -- apply to child classes if present + local cname, rest = classFromForceTypeStr(ftname) + if cname then + local meta = bl._objectUserMetas[cname] + if meta then + for chcname,_ in pairs(meta._children) do + setForceType(chcname..rest, typ) + end + end + end end bl.type = setForceType - --- Value detection - -local function isTsObject(t) - return type(t) == 'table' and t._tsObjectId ~= nil +-- 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 +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) - end + local ns, name = nsname:match('^([^:]+)::([^:]+)$') + 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 - error('bl.isObject: argument #1: expected torque object, number, or string', 2) - end - return tsIsObject(obj) + 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 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 local tsClassMeta = { - __tostring = function(t) - return 'torqueClass:' .. t._name .. - (t._inherit and (':' .. t._inherit._name) or '') - end, + __tostring = function(t) + return 'torqueClass:'..t._name.. + (t._inherit and (':'..t._inherit._name) or '') + end, } 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 - 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 - cname = cname:lower() - - local met = bl._objectUserMetas[cname] or { - _name = cname, - _inherit = nil, - _children = {}, - } - bl._objectUserMetas[cname] = met - setmetatable(met, tsClassMeta) - - if inhname then - 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 - - 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 - met._inherit = inh - - -- apply inherited method and field types - for ftname, typ in pairs(bl._forceType) do - local cname2, rest = classFromForceTypeStr(ftname) - if cname2 == inhname then - setForceType(cname .. rest, typ) - end - end - end + if not ( type(cname)=='string' and isValidFuncName(cname) ) then + 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 + cname = cname:lower() + + local met = bl._objectUserMetas[cname] or { + _name = cname, + _inherit = nil, + _children = {}, + } + bl._objectUserMetas[cname] = met + setmetatable(met, tsClassMeta) + + if inhname then + 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 + + 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 + met._inherit = inh + + -- apply inherited method and field types + for ftname, typ in pairs(bl._forceType) do + local cname2, rest = classFromForceTypeStr(ftname) + if cname2==inhname then + setForceType(cname..rest, typ) + end + end + end end - local function objectInheritedMetas(name) - local inh = bl._objectUserMetas[name:lower()] - return function() - local inhP = inh - if inhP == nil then return nil end - inh = inh._inherit - return inhP - end + local inh = bl._objectUserMetas[name:lower()] + return function() + local inhP = inh + if inhP==nil then return nil end + inh = inh._inherit + return inhP + end end local tsObjectMeta = { - -- __index: Called when accessing fields that don't exist in the object itself - -- 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 - if type(name) ~= 'string' and type(name) ~= 'number' then - 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 - return toTsObject(_bllua_ts.callobj(t._tsObjectId, 'getObject', - tostring(name))) - else - for inh in objectInheritedMetas(rawget(t, '_tsClassName')) do - if inh[name] then return inh[name] end - end - if - tsIsFunctionNs(rawget(t, '_tsNamespace'), name) or - tsIsFunctionNs(rawget(t, '_tsName'), name) - then - return function(t, ...) - local args = { ... } - local argsS = arglistToTs(args) - return valFromTs( - _bllua_ts.callobj(rawget(t, '_tsObjectId'), name, unpack(argsS)), - rawget(t, '_tsName') and rawget(t, '_tsName') .. '::' .. name, - rawget(t, '_tsNamespace') .. '::' .. name) - end - else - return valFromTs( - _bllua_ts.getfield(rawget(t, '_tsObjectId'), name), - rawget(t, '_tsName') and rawget(t, '_tsName') .. '.' .. name, - rawget(t, '_tsNamespace') .. '.' .. name) - end - end - end, - -- __newindex: Called when setting fields on the object - -- Set lua data - -- 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 - if type(name) ~= 'string' then - 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 - end, - -- object:set(fieldName, value) - -- 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 - if t._deleted then - 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 - _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 '') - 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 - if not tsIsFunctionNs(t._tsNamespace, 'getCount') then - error('ts object __len: object has no getCount method', 2) - end - return tonumber(_bllua_ts.callobj(t._tsObjectId, 'getCount')) - end, - -- object:members() - -- Return an iterator for Torque objects with the getCount and getObject methods - -- 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 - if t._deleted then - 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 - local count = tonumber(_bllua_ts.callobj(t._tsObjectId, 'getCount')) - local idx = 0 - return function() - if idx < count then - local obj = toTsObject(_bllua_ts.callobj(t._tsObjectId, - 'getObject', tostring(idx))) - idx = idx + 1 - return idx - 1, obj - else - return nil - end - end - end, - -- 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 - if t._deleted then - 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 - if t._deleted then - 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 - if t._deleted then - error('ts object method: object no longer exists', 2) - end - return tsTypesByNum[_bllua_ts.callobj(t._tsObjectId, 'getType')] - end, - ---- Schedule method for objects - --schedule = function(t, time, cb, ...) - -- if type(t)~='table' or not t._tsObjectId then - -- 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 - -- if type(time)~='number' then - -- error('ts object schedule: argument #2: time must be a number', 2) end - -- if type(cb)~='function' then - -- error('ts object schedule: argument #3: callback must be a function', 2) end - -- local args = {...} - -- bl.schedule(time, function() - -- if tsBool(__bllua_ts.call('isObject', t._tsObjectId)) then - -- pcall(cb, unpack(args)) - -- end - -- end) - --end, - exists = function(t) - 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 tsIsObject(t._tsObjectId) - end, + -- __index: Called when accessing fields that don't exist in the object itself + -- 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 + if type(name)~='string' and type(name)~='number' then + 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 + return toTsObject(_bllua_ts.callobj(t._tsObjectId, 'getObject', + tostring(name))) + else + for inh in objectInheritedMetas(rawget(t,'_tsClassName')) do + if inh[name] then return inh[name] end + end + if + tsIsFunctionNs(rawget(t,'_tsNamespace'), name) or + tsIsFunctionNs(rawget(t,'_tsName'), name) + then + return function(t, ...) + local args = {...} + local argsS = arglistToTs(args) + return valFromTs( + _bllua_ts.callobj(rawget(t,'_tsObjectId'), name, unpack(argsS)), + rawget(t,'_tsName') and rawget(t,'_tsName')..'::'..name, + rawget(t,'_tsNamespace')..'::'..name) + end + else + return valFromTs( + _bllua_ts.getfield(rawget(t,'_tsObjectId'), name), + rawget(t,'_tsName') and rawget(t,'_tsName')..'.'..name, + rawget(t,'_tsNamespace')..'.'..name) + end + end + end, + -- __newindex: Called when setting fields on the object + -- Set lua data + -- 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 + if type(name)~='string' then + 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 + end, + -- object:set(fieldName, value) + -- 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 + if t._deleted then + 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 + _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._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 + if not tsIsFunctionNs(t._tsNamespace, 'getCount') then + error('ts object __len: object has no getCount method', 2) end + return tonumber(_bllua_ts.callobj(t._tsObjectId, 'getCount')) + end, + -- object:members() + -- Return an iterator for Torque objects with the getCount and getObject methods + -- 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 + if t._deleted then + 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 + local count = tonumber(_bllua_ts.callobj(t._tsObjectId, 'getCount')) + local idx = 0 + return function() + if idx < count then + local obj = toTsObject(_bllua_ts.callobj(t._tsObjectId, + 'getObject', tostring(idx))) + idx = idx+1 + return idx-1, obj + else + return nil + end + end + end, + -- 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 + if t._deleted then + 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 + if t._deleted then + 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 + if t._deleted then + error('ts object method: object no longer exists', 2) end + return tsTypesByNum[_bllua_ts.callobj(t._tsObjectId, 'getType')] + end, + ---- Schedule method for objects + --schedule = function(t, time, cb, ...) + -- if type(t)~='table' or not t._tsObjectId then + -- 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 + -- if type(time)~='number' then + -- error('ts object schedule: argument #2: time must be a number', 2) end + -- if type(cb)~='function' then + -- error('ts object schedule: argument #3: callback must be a function', 2) end + -- local args = {...} + -- bl.schedule(time, function() + -- if tsBool(__bllua_ts.call('isObject', t._tsObjectId)) then + -- pcall(cb, unpack(args)) + -- end + -- end) + --end, + exists = function(t) + if t==nil then + error('ts object method: be sure to use :func() not .func()', 2) end + if t._deleted then + return false + else + return assertTsObjectExists(t) + end + end, } -- Weak-values table for caching Torque object references -- Objects in this table can be garbage collected if there are no other refs to them if not bl._objectsWeak then - bl._objectsWeak = {} - setmetatable(bl._objectsWeak, { __mode = 'v' }) + bl._objectsWeak = {} + setmetatable(bl._objectsWeak, { __mode='v' }) end -- Strong table for preserving Torque object references containing lua data -- If an object in this table, it will remain here and in the Weak table until deleted if not bl._objectsStrong then - bl._objectsStrong = {} + bl._objectsStrong = {} end -- Hook object deletion to clean up its lua data -- idS is expected to be the object ID number, NOT the object name function _bllua_objectDeleted(idS) - local obj = bl._objectsWeak[idS] - if obj then - obj._deleted = true - bl._objectsStrong[idS] = nil - bl._objectsWeak[idS] = nil - bl._objectsWeak[obj._tsName:lower()] = nil - end + local obj = bl._objectsWeak[idS] + if obj then + obj._deleted = true + bl._objectsStrong[idS] = nil + bl._objectsWeak[idS] = nil + bl._objectsWeak[obj._tsName:lower()] = nil + end 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 - idiS = idiS:lower() - if bl._objectsWeak[idiS] then return bl._objectsWeak[idiS] end - - if not tsBool(_bllua_ts.call('isObject', idiS)) then - --error('toTsObject: object \''..idiS..'\' does not exist', 2) end - return nil - end - - local className = _bllua_ts.callobj(idiS, 'getClassName') - local obj = { - _tsObjectId = _bllua_ts.callobj(idiS, 'getId'), - _tsName = _bllua_ts.callobj(idiS, 'getName'), - _tsNamespace = className, - _tsClassName = className:lower(), - } - setmetatable(obj, tsObjectMeta) - - bl._objectsWeak[obj._tsObjectId] = obj - bl._objectsWeak[obj._tsName:lower()] = obj - return obj + if type(idiS)~='string' then + error('toTsObject: input must be a string', 2) end + idiS = idiS:lower() + if bl._objectsWeak[idiS] then return bl._objectsWeak[idiS] end + + if not tsIsObject(idiS) then + --error('toTsObject: object \''..idiS..'\' does not exist', 2) end + return nil end + + local className = _bllua_ts.callobj(idiS, 'getClassName') + local obj = { + _tsObjectId = _bllua_ts.callobj(idiS, 'getId' ), + _tsName = _bllua_ts.callobj(idiS, 'getName' ), + _tsNamespace = className, + _tsClassName = className:lower(), + } + setmetatable(obj, tsObjectMeta) + + bl._objectsWeak[obj._tsObjectId ] = obj + bl._objectsWeak[obj._tsName:lower()] = obj + return obj end -- Allow bl['namespaced::function']() local function safeNamespaceName(name) - return tostring(name:gsub(':', '_')) + 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 .. '){' .. - name .. '(' .. nscallArgStr .. ');}' - _bllua_ts.eval(tfcode) - bl._cachedNamespaceCalls[name] = tfname - end - return tfname + local tfname = bl._cachedNamespaceCalls[name] + if not tfname then + tfname = '_bllua_nscall_'..safeNamespaceName(name) + local tfcode = 'function '..tfname..'('..nscallArgStr..'){'.. + name..'('..nscallArgStr..');}' + _bllua_ts.eval(tfcode) + bl._cachedNamespaceCalls[name] = tfname + end + return tfname end local function tsCallGen(name) - return function(...) - local args = { ... } - local argsS = arglistToTs(args) - return valFromTs(_bllua_ts.call(name, unpack(argsS)), name) - end + return function(...) + local args = {...} + local argsS = arglistToTs(args) + return valFromTs(_bllua_ts.call(name, unpack(argsS)), name) + end end -- Metatable for the global bl library -- Allows accessing Torque objects, variables, and functions by indexing it local tsMeta = { - -- __index: Called when accessing fields that don't exist in the table itself - -- Allow indexing by object id: bl[1234] - -- by object name: bl.mainMenuGui - -- by function name: bl.quit() - -- by variable name: bl.iAmAdmin - __index = function(t, name) - if getmetatable(t)[name] then - return getmetatable(t)[name] - elseif type(name) == 'string' and bl._objectUserMetas[name:lower()] then - return bl._objectUserMetas[name:lower()] - else - if type(name) == 'number' then - return toTsObject(tostring(name)) - elseif name:find('::') then - local ns, rest = name:match('^([^:]+)::(.+)$') - if not ns then error('ts index: invalid name \'' .. name .. '\'', 2) end - if not rest:find('::') and tsIsFunctionNs(ns, rest) then - return tsCallGen(tsNamespacedCallTfname(name)) - else - return valFromTs(_bllua_ts.getvar(name), name) - end - elseif tsIsFunction(name) then - return tsCallGen(name) - elseif tsIsObject(name) then - return toTsObject(name) - else - return valFromTs(_bllua_ts.getvar(name), name) - end - end - end, + -- __index: Called when accessing fields that don't exist in the table itself + -- Allow indexing by object id: bl[1234] + -- by object name: bl.mainMenuGui + -- by function name: bl.quit() + -- by variable name: bl.iAmAdmin + __index = function(t, name) + if getmetatable(t)[name] then + return getmetatable(t)[name] + elseif type(name)=='string' and bl._objectUserMetas[name:lower()] then + return bl._objectUserMetas[name:lower()] + else + if type(name)=='number' then + return toTsObject(tostring(name)) + elseif name:find('::') then + local ns, rest = name:match('^([^:]+)::(.+)$') + if not ns then error('ts index: invalid name \''..name..'\'', 2) end + if not rest:find('::') and tsIsFunctionNs(ns, rest) then + return tsCallGen(tsNamespacedCallTfname(name)) + else + return valFromTs(_bllua_ts.getvar(name), name) + end + elseif tsIsFunction(name) then + return tsCallGen(name) + elseif tsIsObject(name) then + return toTsObject(name) + else + return valFromTs(_bllua_ts.getvar(name), name) + end + end + end, } -- bl.set(name, value) -- Used to set global variables function bl.set(name, val) - _bllua_ts.setvar(name, valToTs(val)) + _bllua_ts.setvar(name, valToTs(val)) end -- Utility functions function bl.call(func, ...) - local args = { ... } - local argsS = arglistToTs(args) - return _bllua_ts.call(func, unpack(argsS)) + local args = {...} + local argsS = arglistToTs(args) + return _bllua_ts.call(func, unpack(argsS)) end - function bl.eval(code) - return valFromTs(_bllua_ts.eval(code)) + return valFromTs(_bllua_ts.eval(code)) end - function bl.exec(file) - return valFromTs(_bllua_ts.call('exec', file)) + return valFromTs(_bllua_ts.call('exec', file)) end - -function bl.boolean(val) - return val ~= nil and - val ~= false and - --val~='' and - --val~='0' and - val ~= 0 -end - -function bl.object(id) - if type(id) == 'table' and id._tsObjectId then - return id - elseif type(id) == 'string' or type(id) == 'number' then - return toTsObject(tostring(id)) - else - 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, '_') + local rest = {...} + return name..table.concat(rest, '_') +end +function bl.boolean(val) + return val~=nil and + val~=false and + --val~='' and + --val~='0' and + val~=0 +end +function bl.object(id) + if type(id)=='table' and id._tsObjectId then + return id + elseif type(id)=='string' or type(id)=='number' then + return toTsObject(tostring(id)) + else + error('bl.object: id must be a ts object, number, or string', 2) + end +end +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 .. '\'') - end - -- todo: library fields and object methods - local res = _G[fnameS](unpack(args)) - return valToTs(res) +-- 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 + 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...) -bl._scheduleTable = bl._scheduleTable or {} +bl._scheduleTable = bl._scheduleTable or {} bl._scheduleNextId = bl._scheduleNextId or 1 local function cancelTsSched(sched) - if not (sched and sched.handle) then - error('schedule:cancel() - invalid object', 2) - end - _bllua_ts.call('cancel', sched.handle) - bl._scheduleTable[id] = nil + if not (sched and sched.handle) then + error('schedule:cancel() - invalid object', 2) + end + _bllua_ts.call('cancel', sched.handle) + bl._scheduleTable[id] = nil end function bl.schedule(time, cb, ...) - local id = bl._scheduleNextId - bl._scheduleNextId = bl._scheduleNextId + 1 - local args = { ... } - local handle = tonumber(_bllua_ts.call('schedule', - time, 0, '_bllua_luacall', '_bllua_schedule_callback', id)) - local sch = { - callback = cb, - args = args, - handle = handle, - cancel = cancelTsSched, - } - bl._scheduleTable[id] = sch - return sch + local id = bl._scheduleNextId + bl._scheduleNextId = bl._scheduleNextId+1 + local args = {...} + local handle = tonumber(_bllua_ts.call('schedule', + time, 0, '_bllua_luacall', '_bllua_schedule_callback', id)) + local sch = { + callback = cb, + args = args, + handle = handle, + cancel = cancelTsSched, + } + 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)) - local sch = bl._scheduleTable[id] - if not sch then error('_bllua_schedule_callback: no schedule with id ' .. id) end - bl._scheduleTable[id] = nil - sch.callback(unpack(sch.args)) + local id = tonumber(idS) or + error('_bllua_schedule_callback: invalid id: '..tostring(idS)) + local sch = bl._scheduleTable[id] + if not sch then error('_bllua_schedule_callback: no schedule with id '..id) end + bl._scheduleTable[id] = nil + sch.callback(unpack(sch.args)) end -- serverCmd and clientCmd bl._cmds = bl._cmds or {} function _bllua_process_cmd(cmdS, ...) - local cmd = cmdS:lower() - local args = arglistFromTs(cmd, { ... }) - local func = bl._cmds[cmd] - if not func then error('_bllua_process_cmd: no cmd named \'' .. cmd .. '\'') end - func(unpack(args)) --pcall(func, unpack(args)) + local cmd = cmdS:lower() + local args = arglistFromTs(cmd, {...}) + local func = bl._cmds[cmd] + 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 - 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 .. '){' .. - '_bllua_luacall(_bllua_process_cmd,"' .. cmd .. '",' .. arglist .. ');}') + 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..'('..arglist..'){'.. + '_bllua_luacall(_bllua_process_cmd,"'..cmd..'",'..arglist..');}') end function bl.addServerCmd(name, func) - name = name:lower() - addCmd('servercmd' .. name, func) - bl._forceType['servercmd' .. name .. ':1'] = 'object' + name = name:lower() + addCmd('servercmd'..name, func) + bl._forceType['servercmd'..name..':1'] = 'object' end - function bl.addClientCmd(name, func) - name = name:lower() - addCmd('clientcmd' .. name, func) + name = name:lower() + addCmd('clientcmd'..name, func) end -- commandToServer and commandToClient function bl.commandToServer(cmd, ...) - _bllua_ts.call('commandToServer', - _bllua_ts.call('addTaggedString', cmd), - unpack(arglistToTs({ ... }))) + _bllua_ts.call('commandToServer', + _bllua_ts.call('addTaggedString', cmd), + unpack(arglistToTs({...}))) end - function bl.commandToClient(cmd, ...) - _bllua_ts.call('commandToClient', - _bllua_ts.call('addTaggedString', cmd), - unpack(arglistToTs({ ... }))) + _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), - unpack(arglistToTs({ ... }))) + _bllua_ts.call('commandToAll', + _bllua_ts.call('addTaggedString', cmd), + unpack(arglistToTs({...}))) end -- Hooks (using TS packages) local function isPackageActive(pkg) - local numpkgs = tonumber(_bllua_ts.call('getNumActivePackages')) - for i = 0, numpkgs - 1 do - local apkg = _bllua_ts.call('getActivePackage', tostring(i)) - if apkg == pkg then return true end - end - return false + local numpkgs = tonumber(_bllua_ts.call('getNumActivePackages')) + for i = 0, numpkgs-1 do + local apkg = _bllua_ts.call('getActivePackage', tostring(i)) + if apkg==pkg then return true end + end + return false end local function activatePackage(pkg) - if not isPackageActive(pkg) then - _bllua_ts.call('activatePackage', pkg) - end + if not isPackageActive(pkg) then + _bllua_ts.call('activatePackage', pkg) + end end local function deactivatePackage(pkg) - if isPackageActive(pkg) then - _bllua_ts.call('deactivatePackage', pkg) - end + if isPackageActive(pkg) then + _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' +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 - _bllua_ts.setvar('_bllua_hook_abort', '0') - func(args) --pcall(func, args) - if args._return then - _bllua_ts.setvar('_bllua_hook_abort', '1') - _bllua_ts.setvar('_bllua_hook_return', valToTs(args._return)) - end - for i = 1, hookNargs do - _bllua_ts.setvar('_bllua_hook_arg' .. i, valToTs(args[i])) - end + 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 + _bllua_ts.setvar('_bllua_hook_abort', '0') + func(args) --pcall(func, args) + if args._return then + _bllua_ts.setvar('_bllua_hook_abort', '1') + _bllua_ts.setvar('_bllua_hook_return', valToTs(args._return)) + end + for i=1,hookNargs do + _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, { ... }) - args._return = valFromTs(resultS, nameS) - 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 - func(args) --pcall(func, args) - return valToTs(args._return) + nameS = nameS:lower() + local args = arglistFromTs(nameS, {...}) + args._return = valFromTs(resultS, nameS) + 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 + 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 .. - '",' .. hookArglistLocal .. ');') or '' - 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 '') .. - ((hk.after and '%result=' or 'return ') .. - 'parent::' .. name:match('[^:]+$') .. - '(' .. arglist .. ');') or '' - local afterCode = hk.after and - ('return _bllua_luacall("_bllua_process_hook_after","' .. pkg .. '","' .. name .. '",%result,' .. - arglist .. ');') or '' - local code = - 'package ' .. pkg .. '{' .. - 'function ' .. name .. '(' .. hookArglistLocal .. '){' .. - beforeCode .. parentCode .. afterCode .. - '}' .. - '};' - _bllua_ts.eval(code) + local beforeCode = hk.before and + ('_bllua_luacall("_bllua_process_hook_before", "'..pkg..'","'..name.. + '",'..hookArglistLocal..');') or '' + 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 '').. + ((hk.after and '%result=' or 'return ').. + 'parent::'..name:match('[^:]+$').. + '('..arglist..');') or '' + local afterCode = hk.after and + ('return _bllua_luacall("_bllua_process_hook_after","'..pkg..'","'..name..'",%result,'.. + arglist..');') or '' + local code = + 'package '..pkg..'{'.. + 'function '..name..'('..hookArglistLocal..'){'.. + beforeCode..parentCode..afterCode.. + '}'.. + '};' + _bllua_ts.eval(code) 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 - if not isValidFuncNameNs(name) then - 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 - if type(func) ~= 'function' then - 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 {} - bl._hooks[pkg][name][time] = func - - updateHook(pkg, name, bl._hooks[pkg][name]) - activatePackage(pkg) + if not isValidFuncName(pkg) then + 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 + if time~='before' and time~='after' then + 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 + + bl._hooks[pkg] = bl._hooks[pkg] or {} + bl._hooks[pkg][name] = bl._hooks[pkg][name] or {} + bl._hooks[pkg][name][time] = func + + updateHook(pkg, name, bl._hooks[pkg][name]) + activatePackage(pkg) end - local function tableEmpty(t) - return next(t) ~= nil + 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 - if not isValidFuncNameNs(name) then - 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 - - if not name then - if bl._hooks[pkg] then - for name, hk in pairs(bl._hooks[pkg]) do - updateHook(pkg, name, {}) - end - bl._hooks[pkg] = nil - else - --error('bl.unhook: no hooks registered under package name \''.. - -- pkg..'\'', 2) - end - deactivatePackage(pkg) - else - if bl._hooks[pkg][name] then - if not time then - bl._hooks[pkg][name] = nil - if table.empty(bl._hooks[pkg]) then - bl._hooks[pkg] = nil - deactivatePackage(pkg) - end - 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 - bl._hooks[pkg][name][time] = nil - if tableEmpty(bl._hooks[pkg][name]) and tableEmpty(bl._hooks[pkg]) then - bl._hooks[pkg] = nil - deactivatePackage(pkg) - updateHook(pkg, name, {}) - else - updateHook(pkg, name, bl._hooks[pkg][name]) - end - end - else - --error('bl.unhook: no hooks registered for function \''..name.. - -- '\' under package name \''..pkg..'\'', 2) - end - end + if not isValidFuncName(pkg) then + 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 + if time~='before' and time~='after' then + error('bl.unhook: argument #3: time must be \'before\' or \'after\'', 2) end + + if not name then + if bl._hooks[pkg] then + for name,hk in pairs(bl._hooks[pkg]) do + updateHook(pkg, name, {}) + end + bl._hooks[pkg] = nil + else + --error('bl.unhook: no hooks registered under package name \''.. + -- pkg..'\'', 2) + end + deactivatePackage(pkg) + else + if bl._hooks[pkg][name] then + if not time then + bl._hooks[pkg][name] = nil + if table.empty(bl._hooks[pkg]) then + bl._hooks[pkg] = nil + deactivatePackage(pkg) + end + 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 + bl._hooks[pkg][name][time] = nil + if tableEmpty(bl._hooks[pkg][name]) and tableEmpty(bl._hooks[pkg]) then + bl._hooks[pkg] = nil + deactivatePackage(pkg) + updateHook(pkg, name, {}) + else + updateHook(pkg, name, bl._hooks[pkg][name]) + end + end + else + --error('bl.unhook: no hooks registered for function \''..name.. + -- '\' under package name \''..pkg..'\'', 2) + end + end end -- Container search/raycast local function vecToTs(v) - if not isTsVector(v) then - error('vecToTs: argument is not a vector', 3) - end - return table.concat(v, ' ') + if not isTsVector(v) then + 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 - return tostring(val) - elseif type(mask) == 'table' then - local tval = 0 - local seen = {} - for i, v in ipairs(mask) do - if not seen[v] then - local val = tsTypesByName[v:lower()] - if not val then - error('maskToTs: invalid mask \'' .. v .. - '\' at index ' .. i .. ' in mask list', 3) - end - tval = tval + val - seen[v] = true - end - end - return tostring(tval) - else - error('maskToTs: mask must be a string or table', 3) - end + if type(mask)=='string' then + local val = tsTypesByName[mask:lower()] + if not val then + error('maskToTs: invalid mask \''..mask..'\'', 3) end + return tostring(val) + elseif type(mask)=='table' then + local tval = 0 + local seen = {} + for i,v in ipairs(mask) do + if not seen[v] then + local val = tsTypesByName[v:lower()] + if not val then + error('maskToTs: invalid mask \''..v.. + '\' at index '..i..' in mask list', 3) end + tval = tval + val + seen[v] = true + end + end + return tostring(tval) + else + error('maskToTs: mask must be a string or table', 3) + end end local function objToTs(obj) - if type(obj) == 'number' or type(obj) == 'string' then - return tostring(obj) - elseif type(obj) == 'table' and obj._tsObjectId then - return tostring(obj._tsObjectId) - else - error('objToTs: invalid object \'' .. tostring(obj) .. '\'', 3) - end + if type(obj)=='number' or type(obj)=='string' then + return tostring(obj) + elseif type(obj)=='table' and obj._tsObjectId then + return tostring(obj._tsObjectId) + else + error('objToTs: invalid object \''..tostring(obj)..'\'', 3) + end end function bl.raycast(start, stop, mask, ignores) - local startS = vecToTs(start) - local stopS = vecToTs(start) - local maskS = maskToTs(mask) - local ignoresS = {} - for _, v in ipairs(ignores) do - table.insert(ignoresS, objToTs(v)) - end - - local retS = _bllua_ts.call('containerRaycast', startS, stopS, maskS, unpack(ignoresS)) - - if retS == '0' then - return nil - else - local hitS, pxS, pyS, pzS, nxS, nyS, nzS = retS:match('^([0-9]+) ' .. - '(%-?[0-9%.e]+) (%-?[0-9%.e]+) (%-?[0-9%.e]+) ' .. - '(%-?[0-9%.e]+) (%-?[0-9%.e]+) (%-?[0-9%.e]+)$') - local hit = toTsObject(hitS) - local pos = vector { tonumber(pxS), tonumber(pyS), tonumber(pzS) } - local norm = vector { tonumber(nxS), tonumber(nyS), tonumber(nzS) } - return hit, pos, norm - end + local startS = vecToTs(start) + local stopS = vecToTs(start) + local maskS = maskToTs(mask) + local ignoresS = {} + for _,v in ipairs(ignores) do + table.insert(ignoresS, objToTs(v)) + end + + local retS = _bllua_ts.call('containerRaycast', startS, stopS, maskS, unpack(ignoresS)) + + if retS=='0' then + return nil + else + local hitS, pxS,pyS,pzS, nxS,nyS,nzS = retS:match('^([0-9]+) '.. + '(%-?[0-9%.e]+) (%-?[0-9%.e]+) (%-?[0-9%.e]+) '.. + '(%-?[0-9%.e]+) (%-?[0-9%.e]+) (%-?[0-9%.e]+)$') + local hit = toTsObject(hitS) + local pos = vector{tonumber(pxS),tonumber(pyS),tonumber(pzS)} + local norm = vector{tonumber(nxS),tonumber(nyS),tonumber(nzS)} + return hit, pos, norm + end end - local function tsContainerSearchIterator() - local retS = _bllua_ts.call('containerSearchNext') - if retS == '0' then - return nil - else - return toTsObject(retS) - end + local retS = _bllua_ts.call('containerSearchNext') + if retS=='0' then + return nil + else + return toTsObject(retS) + end end function bl.boxSearch(pos, size, mask) - local posS = vecToTs(pos) - local sizeS = vecToTs(size) - local maskS = maskToTs(mask) - - _bllua_ts.call('initContainerBoxSearch', posS, sizeS, maskS) - return tsContainerSearchIterator + local posS = vecToTs(pos) + local sizeS = vecToTs(size) + local maskS = maskToTs(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 - local radiusS = tostring(radius) - local maskS = maskToTs(mask) - - _bllua_ts.call('initContainerRadiusSearch', posS, radiusS, maskS) - return tsContainerSearchIterator + local posS = vecToTs(pos) + if type(radius)~='number' then + error('bl.radiusSearch: argument #2: radius must be a number', 2) end + local radiusS = tostring(radius) + local maskS = maskToTs(mask) + + _bllua_ts.call('initContainerRadiusSearch', posS, radiusS, maskS) + return tsContainerSearchIterator end -- Print/Talk/Echo local maxTsArgLen = 8192 local function valsToString(vals) - local strs = {} - for i, v in ipairs(vals) do - local tstr = table.tostring(v) - if #tstr > maxTsArgLen then - tstr = tostring(v) - end - strs[i] = tstr - end - return table.concat(strs, ' ') + local strs = {} + for i,v in ipairs(vals) do + local tstr = table.tostring(v) + if #tstr>maxTsArgLen then + tstr = tostring(v) + end + strs[i] = tstr + end + return table.concat(strs, ' ') end bl.echo = function(...) - local str = valsToString({ ... }) - _bllua_ts.call('echo', str) + local str = valsToString({...}) + _bllua_ts.call('echo', str) end print = bl.echo bl.talk = function(...) - local str = valsToString({ ... }) - _bllua_ts.call('echo', str) - _bllua_ts.call('talk', str) + local str = valsToString({...}) + _bllua_ts.call('echo', str) + _bllua_ts.call('talk', str) end -- bl.new and bl.datablock local function createTsObj(keyword, class, name, inherit, props) - local propsT = {} - 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 - table.insert(propsT, k .. '="' .. valToTs(v) .. '";') - end - end - - local objS = _bllua_ts.eval( - 'return ' .. keyword .. ' ' .. class .. '(' .. - (name or '') .. (inherit and (':' .. inherit) or '') .. '){' .. - table.concat(propsT) .. '};') - local obj = toTsObject(objS) - if not obj then - error('bl.new/bl.datablock: failed to create object', 3) - end - - return obj + local propsT = {} + 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 + table.insert(propsT, k..'="'..valToTs(v)..'";') + end + end + + local objS = _bllua_ts.eval( + 'return '..keyword..' '..class..'('.. + (name or '')..(inherit and (':'..inherit) or '')..'){'.. + table.concat(propsT)..'};') + local obj = toTsObject(objS) + if not obj then + error('bl.new/bl.datablock: failed to create object', 3) end + + return obj end local function parseTsDecl(decl) - local class, name, inherit - if decl:find(' ') then -- class ... - local cl, rest = decl:match('^([^ ]+) ([^ ]+)$') - class = cl - if rest:find(':') then -- class name:inherit - name, inherit = rest:match('^([^:]*):([^:]+)$') - if not name then class = nil end -- error - if name == '' then name = nil end -- class :inherit - else - name = rest - end - else -- class - class = decl - end - if not ( - isValidFuncName(class) and - (name == nil or isValidFuncName(name)) and - (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 - return class, name, inherit + local class, name, inherit + if decl:find(' ') then -- class ... + local cl, rest = decl:match('^([^ ]+) ([^ ]+)$') + class = cl + if rest:find(':') then -- class name:inherit + name, inherit = rest:match('^([^:]*):([^:]+)$') + if not name then class = nil end -- error + if name=='' then name = nil end -- class :inherit + else + name = rest + end + else -- class + class = decl + end + if not ( + isValidFuncName(class) and + (name==nil or isValidFuncName(name)) and + (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 + return class, name, inherit end function bl.new(decl, props) - local class, name, inherit = parseTsDecl(decl) - return createTsObj('new', class, name, inherit, 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 - return createTsObj('datablock', class, name, inherit, props) + local class, name, inherit = parseTsDecl(decl) + if not name then error('bl.datablock: must specify a name', 2) end + return createTsObj('datablock', class, name, inherit, props) end setmetatable(bl, tsMeta) diff --git a/src/util/libts-lua.lua b/src/util/libts-lua.lua index cf4789c..56f4a9d 100644 --- a/src/util/libts-lua.lua +++ b/src/util/libts-lua.lua @@ -1,3 +1,4 @@ + -- 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. @@ -6,11 +7,8 @@ ts = _bllua_ts -- Provide limited OS functions os = os or {} ----@diagnostic disable-next-line: duplicate-set-field -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 +function os.clock() return tonumber(_bllua_ts.call('getSimTime'))/1000 end -- Virtual file class, emulating a file object as returned by io.open -- Used to wrap io.open to allow reading from zips (using TS) @@ -18,150 +16,140 @@ 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) - file:_init() - if not file or type(file) ~= 'table' or not file._is_file then error('File:read: Not a file', 2) end - if file._is_open ~= true then error('File:read: File is closed', 2) end - if mode == '*n' then - local ws, n = file.data:match('^([ \t\r\n]*)([0-9%.%-e]+)', file.pos) - if n then - file.pos = file.pos + #ws + #n - return n - else - return nil - end - elseif mode == '*a' then - local d = file.data:sub(file.pos, #file.data) - file.pos = #file.data + 1 - return d - elseif mode == '*l' then - local l, ws = file.data:match('^([^\r\n]*)(\r?\n)', file.pos) - if not l then - l = file.data:match('^([^\r\n]*)$', file.pos); ws = ''; - if l == '' then return nil end - end - if l then - file.pos = file.pos + #l + #ws - return l - else - return nil - end - elseif type(mode) == 'number' then - local d = file.data:sub(file.pos, file.pos + mode) - file.pos = file.pos + #d - return d - else - error('File:read: Invalid mode \'' .. mode .. '\'', 2) - end - end, - lines = function(file) - file:_init() - return function() - return file:read('*l') - end - end, - close = function(file) - if not file._is_open then error('File:close: File is not open', 2) end - file._is_open = false - end, - __index = function(f, k) return rawget(f, k) or getmetatable(f)[k] end, - _init = function(f) - if not f.data then - f.data = _bllua_ts.call('_bllua_ReadEntireFile', f.filename) - end - end, + read = function(file, mode) + file:_init() + if not file or type(file)~='table' or not file._is_file then error('File:read: Not a file', 2) end + if file._is_open ~= true then error('File:read: File is closed', 2) end + if mode=='*n' then + local ws, n = file.data:match('^([ \t\r\n]*)([0-9%.%-e]+)', file.pos) + if n then + file.pos = file.pos + #ws + #n + return n + else + return nil + end + elseif mode=='*a' then + local d = file.data:sub(file.pos, #file.data) + file.pos = #file.data + 1 + return d + elseif mode=='*l' then + local l, ws = file.data:match('^([^\r\n]*)(\r?\n)', file.pos) + if not l then + l = file.data:match('^([^\r\n]*)$', file.pos); ws = ''; + if l=='' then return nil end + end + if l then + file.pos = file.pos + #l + #ws + return l + else + return nil + end + elseif type(mode)=='number' then + local d = file.data:sub(file.pos, file.pos+mode) + file.pos = file.pos + #d + return d + else + error('File:read: Invalid mode \''..mode..'\'', 2) + end + end, + lines = function(file) + file:_init() + return function() + return file:read('*l') + end + end, + close = function(file) + if not file._is_open then error('File:close: File is not open', 2) end + file._is_open = false + end, + __index = function(f, k) return rawget(f, k) or getmetatable(f)[k] end, + _init = function(f) + if not f.data then + f.data = _bllua_ts.call('_bllua_ReadEntireFile', f.filename) + end + end, } local function new_file_obj(fn) - local file = { - _is_file = true, - _is_open = true, - pos = 1, - __index = file_meta.__index, - filename = fn, - data = nil, - } - setmetatable(file, file_meta) - return file + local file = { + _is_file = true, + _is_open = true, + pos = 1, + __index = file_meta.__index, + filename = fn, + data = nil, + } + setmetatable(file, file_meta) + return file end -local function tflip(t) - local u = {}; for _, n in ipairs(t) do u[n] = true end; return u; -end -local allowed_zip_dirs = tflip { - 'add-ons', 'base', 'config', 'saves', 'screenshots', 'shaders' +local function tflip(t) local u = {}; for _, n in ipairs(t) do u[n] = true end; return u; end +local allowed_zip_dirs = tflip{ + 'add-ons', 'base', 'config', 'saves', 'screenshots', 'shaders' } local function io_open_absolute(fn, mode) - -- if file exists, use original mode - local res, err = _bllua_io_open(fn, mode) - if res then return res 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 - local exist = _bllua_ts.call('isFile', fn) == '1' - if not exist then return nil, err end - - if mode ~= nil and mode ~= 'r' and mode ~= 'rb' then - return nil, 'Files in zips can only be opened in read mode' - end - - -- return a temp lua file object with the data - local fi = new_file_obj(fn) - return fi + -- if file exists, use original mode + local res, err = _bllua_io_open(fn, mode) + if res then return res 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 + local exist = _bllua_ts.call('isFile', fn) == '1' + if not exist then return nil, err end + + if mode~=nil and mode~='r' and mode~='rb' then + return nil, 'Files in zips can only be opened in read mode' end + + -- return a temp lua file object with the data + local fi = new_file_obj(fn) + return fi end io = io or {} ----@diagnostic disable-next-line: duplicate-set-field function io.open(fn, mode, errn) - errn = errn or 1 - - -- try to open the file with relative path, otherwise use absolute path - local curfn = debug.getfilename(errn + 1) or _bllua_ts.getvar('Con::File') - if curfn == '' then curfn = nil end - if fn:find('^%.') then - local relfn = curfn and fn:find('^%./') and - curfn:gsub('[^/]+$', '') .. fn:gsub('^%./', '') - if relfn then - local fi, err = io_open_absolute(relfn, mode) - return fi, err, relfn - else - return nil, 'Invalid path', fn - end - else - local fi, err = io_open_absolute(fn, mode) - return fi, err, fn - end + errn = errn or 1 + + -- try to open the file with relative path, otherwise use absolute path + local curfn = debug.getfilename(errn + 1) or _bllua_ts.getvar('Con::File') + if curfn == '' then curfn = nil end + if fn:find('^%.') then + local relfn = curfn and fn:find('^%./') and + curfn:gsub('[^/]+$', '')..fn:gsub('^%./', '') + if relfn then + local fi, err = io_open_absolute(relfn, mode) + return fi, err, relfn + else + return nil, 'Invalid path', fn + end + else + local fi, err = io_open_absolute(fn, mode) + return fi, err, fn + end 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 - return fi:lines() + 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 - ----@diagnostic disable-next-line: duplicate-set-field function io.type(f) - ---@diagnostic disable-next-line: undefined-field - if type(f) == 'table' and f._is_file then - ---@diagnostic disable-next-line: undefined-field - return f._is_open and 'file' or 'closed file' - else - return _bllua_io_type(f) - end + if type(f)=='table' and f._is_file then + return f._is_open and 'file' or 'closed file' + else + return _bllua_io_type(f) + end end -- provide dofile 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 - - print('Executing ' .. fn2) - local text = fi:read('*a') - fi:close() - return assert(loadstring('--[[' .. fn2 .. ']]' .. text))() + errn = errn or 1 + + local fi, err, fn2 = io.open(fn, 'r', errn+1) + if not fi then error('Error executing file \''..fn2..'\': '..err, errn+1) end + + print('Executing '..fn2) + local text = fi:read('*a') + fi:close() + return assert(loadstring('--[['..fn2..']]'..text))() end -- provide require (just a wrapper for dofile) @@ -170,67 +158,57 @@ end -- blockland directory -- current add-on local function file_exists(fn, errn) - local fi, err, fn2 = io.open(fn, 'r', errn + 1) - if fi then - fi:close() - return fn2 - else - return nil - end + local fi, err, fn2 = io.open(fn, 'r', errn+1) + if fi then + fi:close() + return fn2 + else + return nil + end end local require_memo = {} function require(mod) - if require_memo[mod] then return unpack(require_memo[mod]) end - local fp = mod:gsub('%.', '/') - local fns = { - './' .. fp .. '.lua', -- local file - './' .. fp .. '/init.lua', -- local library - fp .. '.lua', -- global file - fp .. '/init.lua', -- global library - } - if fp:lower():find('^add-ons/') then - local addonpath = fp:lower():match('^add-ons/[^/]+') .. '/' - table.insert(fns, addonpath .. fp .. '.lua') -- add-on file - table.insert(fns, addonpath .. fp .. '/init.lua') -- add-on library - end - for _, fn in ipairs(fns) do - local fne = file_exists(fn, 2) - if fne then - local res = { dofile(fne, 2) } - require_memo[mod] = res - return unpack(res) - end - end - return _bllua_requiresecure(mod) + if require_memo[mod] then return unpack(require_memo[mod]) end + local fp = mod:gsub('%.', '/') + local fns = { + './'..fp..'.lua', -- local file + './'..fp..'/init.lua', -- local library + fp..'.lua', -- global file + fp..'/init.lua', -- global library + } + if fp:lower():find('^add-ons/') then + local addonpath = fp:lower():match('^add-ons/[^/]+')..'/' + table.insert(fns, addonpath..fp..'.lua') -- add-on file + table.insert(fns, addonpath..fp..'/init.lua') -- add-on library + end + for _,fn in ipairs(fns) do + local fne = file_exists(fn, 2) + if fne then + local res = {dofile(fne, 2)} + require_memo[mod] = res + return unpack(res) + end + end + 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 + local f,e = loadstring(code) + return f~=nil end function _bllua_smarteval(code) - if (not code:find('^print%(')) and isValidCode('print(' .. code .. ')') then - code = 'print(' .. code .. ')' - end - local f, e = loadstring(code) - if f then - return f() - else - print(e) - end + if (not code:find('^print%(')) and isValidCode('print('..code..')') then + code = 'print('..code..')' end + local f,e = loadstring(code) + if f then + return f() + else + 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') diff --git a/src/util/libts-ts.cs b/src/util/libts-ts.cs index 292c40e..63e03a7 100644 --- a/src/util/libts-ts.cs +++ b/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"); diff --git a/src/util/matrix.lua b/src/util/matrix.lua new file mode 100644 index 0000000..41a3542 --- /dev/null +++ b/src/util/matrix.lua @@ -0,0 +1,7 @@ + +-- todo +-- Matrix class with math operators + + + +print(' Executed matrix.lua') diff --git a/src/util/std.lua b/src/util/std.lua index 6cd00fd..ca79eea 100644 --- a/src/util/std.lua +++ b/src/util/std.lua @@ -1,374 +1,350 @@ + -- 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 u = {} - for k, _ in pairs(ts[1]) do - local args = {} - for j = 1, #ts do args[j] = ts[j][i] end - u[i] = f(unpack(args)) - end - return u + local ts = {...} + local u = {} + for k,_ in pairs(ts[1]) do + local args = {} + for j=1,#ts do args[j] = ts[j][i] end + u[i] = f(unpack(args)) + end + return u end - function table.map_list(f, ...) - local ts = { ... } - local u = {} - for i = 1, #ts[1] do - local args = {} - for j = 1, #ts do args[j] = ts[j][i] end - u[i] = f(unpack(args)) - end - return u + 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(unpack(args)) + end + return u end - -- Swap keys/values function table.swap(t) - local u = {} - for k, v in pairs(t) do u[v] = k end - return u + local u = {} + for k,v in pairs(t) do u[v] = k end + return u end - -- Reverse a list function table.reverse(l) - local m = {} - for i = 1, #l do m[#l - i + 1] = l[i] end - return m + local m = {} + for i=1,#l do m[#l-i+1] = l[i] end + return m end - -- Whether a table is a list/array (has only monotonic integer keys) function table.islist(t) - local n = 0 - for i, _ in pairs(t) do - if type(i) ~= 'number' or i % 1 ~= 0 then return false end - n = n + 1 - end - return n == #t + local n = 0 + for i,_ in pairs(t) do + if type(i)~='number' or i%1~=0 then return false end + n = n+1 + end + return n==#t end - -- Append contents of other tables to first table function table.append(t, ...) - local a = { ... } - for _, u in ipairs(a) do - for _, v in ipairs(u) do table.insert(t, v) end - end - return t + local a = {...} + for _,u in ipairs(a) do + for _,v in ipairs(u) do table.insert(t,v) end + end + return t end - -- Create a new table containing all keys from any number of tables -- latter tables in the arg list override prior ones -- overlaps, NOT appends, integer keys function table.join(...) - local ts = { ... } - local w = {} - for _, t in ipairs(ts) do - for k, v in pairs(t) do w[k] = v end - end - return w + local ts = {...} + local w = {} + for _,t in ipairs(ts) do + for k,v in pairs(t) do w[k] = v end + end + return w end - -- Whether a table contains a certain value in any key -function table.contains(t, s) - for _, v in pairs(t) do - if v == s then return true end - end - return false +function table.contains(t,s) + for _,v in pairs(t) do + if v==s then return true end + end + return false end - -function table.contains_list(t, s) - for _, v in ipairs(t) do - if v == s then return true end - end - return false +function table.contains_list(t,s) + for _,v in ipairs(t) do + if v==s then return true end + end + return false end - -- Copy a table to another table function table.copy(t) - local u = {} - for k, v in pairs(t) do u[k] = v end - return u + local u = {} + for k,v in pairs(t) do u[k] = v end + return u end - function table.copy_list(l) - local m = {} - for i, v in ipairs(l) do m[i] = v end - return m + local m = {} + for i,v in ipairs(l) do m[i] = v end + return m end - -- Sort a table in a new copy function table.sortcopy(t, f) - local u = table.copy_list(t) - table.sort(u, f) - return u + local u = table.copy_list(t) + table.sort(u, f) + return u end - -- Remove a value from a table function table.removevalue(t, r) - local rem = {} - for k, v in pairs(t) do - if v == r then table.insert(rem, k) end - end - for _, k in ipairs(rem) do t[k] = nil end + local rem = {} + for k,v in pairs(t) do + if v==r then table.insert(rem, k) end + end + for _,k in ipairs(rem) do t[k] = nil end end - function table.removevalue_list(t, r) - for i = #t, 1, -1 do - if t[i] == r then - table.remove(t, i) - end - end + for i = #t, 1, -1 do + if t[i]==r then + table.remove(t, i) + end + end end - -- Export tables into formatted executable strings local function tabs(tabLevel) - return (' '):rep(tabLevel) + return (' '):rep(tabLevel) end local valueToString local function tableToString(t, tabLevel, seen) - if type(t) ~= 'table' or (getmetatable(t) and getmetatable(t).__tostring) then - return tostring(t) - elseif table.islist(t) then - if #t == 0 then - return '{}' - else - local strs = {} - local containsTables = false - for _, v in ipairs(t) do - if type(v) == 'table' then containsTables = true end - table.insert(strs, valueToString(v, tabLevel + 1, seen) .. ',') - end - if containsTables or #t > 3 then - return '{\n' .. tabs(tabLevel + 1) - .. table.concat(strs, '\n' .. tabs(tabLevel + 1)) - .. '\n' .. tabs(tabLevel) .. '}' - else - return '{ ' .. table.concat(strs, ' ') .. ' }' - end - end - else - local containsNonStringKeys = false - for k, v in pairs(t) do - if type(k) ~= 'string' or k:find('[^a-zA-Z0-9_]') then - containsNonStringKeys = true - elseif type(k) == 'table' then - error('table.tostring: table contains a table as key, cannot serialize') - end - end - local strs = {} - if containsNonStringKeys then - for k, v in pairs(t) do - table.insert(strs, '\n' .. tabs(tabLevel + 1) - .. '[' .. valueToString(k, tabLevel + 1, seen) .. '] = ' - .. valueToString(v, tabLevel + 1, seen) .. ',') - end - else - for k, v in pairs(t) do - table.insert(strs, '\n' .. tabs(tabLevel + 1) - .. k .. ' = ' .. valueToString(v, tabLevel + 1, seen) .. ',') - end - end - return '{' .. table.concat(strs) .. '\n' .. tabs(tabLevel) .. '}' - end + if type(t)~='table' or (getmetatable(t) and getmetatable(t).__tostring) then + return tostring(t) + elseif table.islist(t) then + if #t==0 then + return '{}' + else + local strs = {} + local containsTables = false + for _,v in ipairs(t) do + if type(v)=='table' then containsTables = true end + table.insert(strs, valueToString(v, tabLevel+1, seen)..',') + end + if containsTables or #t>3 then + return '{\n'..tabs(tabLevel+1) + ..table.concat(strs, '\n'..tabs(tabLevel+1)) + ..'\n'..tabs(tabLevel)..'}' + else + return '{ '..table.concat(strs, ' ')..' }' + end + end + else + local containsNonStringKeys = false + for k,v in pairs(t) do + if type(k)~='string' or k:find('[^a-zA-Z0-9_]') then + containsNonStringKeys = true + elseif type(k)=='table' then + error('table.tostring: table contains a table as key, cannot serialize') + end + end + local strs = {} + if containsNonStringKeys then + for k,v in pairs(t) do + table.insert(strs, '\n'..tabs(tabLevel+1) + ..'['..valueToString(k, tabLevel+1, seen)..'] = ' + ..valueToString(v, tabLevel+1, seen)..',') + end + else + for k,v in pairs(t) do + table.insert(strs, '\n'..tabs(tabLevel+1) + ..k..' = '..valueToString(v, tabLevel+1, seen)..',') + end + end + return '{'..table.concat(strs)..'\n'..tabs(tabLevel)..'}' + end end valueToString = function(v, tabLevel, seen) - local t = type(v) - if t == 'table' then - if seen[v] then - return 'nil --[[ already seen: ' .. tostring(v) .. ' ]]' - else - seen[v] = true - return tableToString(v, tabLevel, seen) - end - elseif t == 'string' then - return '\'' .. string.escape(v) .. '\'' - elseif t == 'number' or t == 'boolean' then - return tostring(v) - else - --error('table.tostring: table contains a '..t..' value, cannot serialize') - return 'nil --[[ cannot serialize ' .. t .. ': ' .. tostring(v) .. ' ]]' - end + local t = type(v) + if t=='table' then + if seen[v] then + return 'nil --[[ already seen: '..tostring(v)..' ]]' + else + seen[v] = true + return tableToString(v, tabLevel, seen) + end + elseif t=='string' then + return '\''..string.escape(v)..'\'' + elseif t=='number' or t=='boolean' then + return tostring(v) + else + --error('table.tostring: table contains a '..t..' value, cannot serialize') + return 'nil --[[ cannot serialize '..tostring(v)..' ]]' + 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 - error('string.split: argument #1: expected string, got ' .. type(str), 2) - end - if sep == nil or sep == '' then - local t = {} - local ns = #str - for x = 1, ns do - table.insert(t, str:sub(x, x)) - end - return t - elseif type(sep) == 'string' then - local t = {} - if #str > 0 then - local first = 1 - while true do - local last, newfirst = str:find(sep, first, noregex) - if not last then break end - table.insert(t, str:sub(first, last - 1)) - first = newfirst + 1 - end - table.insert(t, str:sub(first, #str)) - end - return t - else - error( - 'string.split: argument #2: expected string or nil, got ' .. type(sep), 2) - end + if type(str)~='string' then + error('string.split: argument #1: expected string, got '..type(str), 2) end + if sep==nil or sep=='' then + local t = {} + local ns = #str + for x = 1, ns do + table.insert(t, str:sub(x, x)) + end + return t + elseif type(sep)=='string' then + local t = {} + if #str>0 then + local first = 1 + while true do + local last, newfirst = str:find(sep, first, noregex) + if not last then break end + table.insert(t, str:sub(first, last-1)) + first = newfirst+1 + end + table.insert(t, str:sub(first, #str)) + end + return t + else + error( + 'string.split: argument #2: expected string or nil, got '..type(sep), 2) + 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 + 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 .. ']+$', '') .. '' + 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 +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 + 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', + ['\\'] = '\\\\', + ['\''] = '\\\'', + ['\"'] = '\\\"', + ['\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) + 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', + ['\\'] = '\\', + ['\''] = '\'', + ['\"'] = '\"', + ['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) + 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') - if not fi then return nil, err end - local s = fi:read("*a") - fi:close() - return s + local fi,err = io.open(filename, 'rb') + if not fi then return nil,err end + local s = fi:read("*a") + fi:close() + return s end - -- Write data to file all at once, return true if success / false,err if failure function io.writeall(filename, data) - local fi, err = io.open(filename, 'wb') - if not fi then return false, err end - fi:write(data) - fi:close() - return true, nil + 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) - local m = a % b - if m == 0 or math.abs(m) < 1e-15 or math.abs(m - b) < 1e-15 then - return 0 - else - return m - end +function math.mod(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 + 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') diff --git a/src/util/vector.lua b/src/util/vector.lua index 7c280d8..e78a87d 100644 --- a/src/util/vector.lua +++ b/src/util/vector.lua @@ -235,4 +235,7 @@ vector_new = function(vi) end vector = vector_new + +print(' Executed vector.lua') + return vector_new