From 206361ca384a5f359fc9b70d8f6bf07fb5935588 Mon Sep 17 00:00:00 2001 From: bakpakin Date: Sat, 5 Mar 2016 13:34:44 -0500 Subject: [PATCH] Make filters compile. Add some filter tests. --- spec/tiny_spec.lua | 21 +++++++++ tiny.lua | 106 ++++++++++++++++++--------------------------- 2 files changed, 62 insertions(+), 65 deletions(-) diff --git a/spec/tiny_spec.lua b/spec/tiny_spec.lua index b2ba9a6..c007b87 100644 --- a/spec/tiny_spec.lua +++ b/spec/tiny_spec.lua @@ -90,6 +90,27 @@ describe('tiny-ecs:', function() end) + it("Can use functions as subfilters", function() + + local f1 = tiny.requireAny('a', 'b', 'c') + local f2 = tiny.requireAll('x', 'y', 'z') + local f = tiny.requireAll(f1, f2) + + assert.truthy(f(nil, { + x = true, y = true, z = true, a = true, b = true, c = true + })) + assert.truthy(f(nil, { + x = true, y = true, z = true, a = true + })) + assert.falsy(f(nil, { + x = true, y = true, a = true + })) + assert.falsy(f(nil, { + x = true, y = true, z = true + })) + + end) + end) describe('World:', function() diff --git a/tiny.lua b/tiny.lua index f786dbd..bbb9362 100644 --- a/tiny.lua +++ b/tiny.lua @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -- @author Calvin Rose -- @license MIT -- @copyright 2015 -local tiny = { _VERSION = "1.2-1" } +local tiny = { _VERSION = "scm" } -- Local versions of standard lua functions local tinsert = table.insert @@ -85,88 +85,64 @@ local tiny_remove -- -- @section Filter + +-- A helper function to compile filters. +local filterJoin +do + local loadstring = loadstring or load + local function getchr(c) + return "\\" .. c:byte() + end + local function make_safe(text) + return ("%q"):format(text):gsub('\n', 'n'):gsub("[\128-\255]", getchr) + end + function filterJoin(prefix, seperator, ...) + local accum = {} + local build = {} + for i = 1, select('#', ...) do + local item = select(i, ...) + if type(item) == 'string' then + accum[#accum + 1] = ("(e[%s] ~= nil)"):format(make_safe(item)) + elseif type(item) == 'function' then + build[#build + 1] = ('local subfilter_%d_ = select(%d, ...)'):format(i, i) + accum[#accum + 1] = ('(subfilter_%d_(system, e))'):format(i) + else + error 'Filter token must be a string or a filter function.' + end + end + local source = ('do %s\n return function(system, e) return %s(%s) end end'):format( + table.concat(build, '\n'), + prefix, + table.concat(accum, seperator) + ) + local loader, err = loadstring(source) + if err then error(err) end + return loader(...) + end +end + --- Makes a Filter that selects Entities with all specified Components and -- Filters. function tiny.requireAll(...) - local components = {...} - local len = #components - return function(system, e) - local c - for i = 1, len do - c = components[i] - if type(c) == 'function' then - if not c(system, e) then - return false - end - elseif e[c] == nil then - return false - end - end - return true - end + return filterJoin('', ' and ', ...) end --- Makes a Filter that selects Entities with at least one of the specified -- Components and Filters. function tiny.requireAny(...) - local components = {...} - local len = #components - return function(system, e) - local c - for i = 1, len do - c = components[i] - if type(c) == 'function' then - if c(system, e) then - return true - end - elseif e[c] ~= nil then - return true - end - end - return false - end + return filterJoin('', ' or ', ...) end --- Makes a Filter that rejects Entities with all specified Components and -- Filters, and selects all other Entities. function tiny.rejectAll(...) - local components = {...} - local len = #components - return function(system, e) - local c - for i = 1, len do - c = components[i] - if type(c) == 'function' then - if not c(system, e) then - return true - end - elseif e[c] == nil then - return true - end - end - return false - end + return filterJoin('not', ' and ', ...) end --- Makes a Filter that rejects Entities with at least one of the specified -- Components and Filters, and selects all other Entities. function tiny.rejectAny(...) - local components = {...} - local len = #components - return function(system, e) - local c - for i = 1, len do - c = components[i] - if type(c) == 'function' then - if c(system, e) then - return false - end - elseif e[c] ~= nil then - return false - end - end - return true - end + return filterJoin('not', ' or ', ...) end --- System functions.