BlackMATov/evolved.lua
1
0
Fork 0
mirror of https://github.com/BlackMATov/evolved.lua.git synced 2025-12-15 04:15:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

don't create empty exclude_set in execution when it's not existing

Browse Source
This commit is contained in:
BlackMATov
2024-12-29 16:28:27 +07:00
parent affd13255a
commit 900f447f3d
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ROADMAP.md
View File

@@ -7,5 +7,4 @@
- every chunk can hold has_on_assign/has_on_insert/has_on_remove tags - every chunk can hold has_on_assign/has_on_insert/has_on_remove tags
- rename alive/empty to is_alive/is_empty - rename alive/empty to is_alive/is_empty
- optimize batch operations for cases with moving entities to empty chunks - optimize batch operations for cases with moving entities to empty chunks
- don't create empty exclude_set in execution every time when it's not exist
- should we clear chunk's components by on_insert tag callback? - should we clear chunk's components by on_insert tag callback?

19
evolved.lua
View File

@@ -18,7 +18,7 @@ local evolved = {}
---@field package __without_fragment_edges table<evolved.fragment, evolved.chunk> ---@field package __without_fragment_edges table<evolved.fragment, evolved.chunk>
---@alias evolved.execution_stack evolved.chunk[] ---@alias evolved.execution_stack evolved.chunk[]
---@alias evolved.execution_state [integer, table<evolved.fragment, boolean>, evolved.execution_stack] ---@alias evolved.execution_state [integer, evolved.execution_stack, table<evolved.fragment, boolean>?]
---@alias evolved.execution_iterator fun(state: evolved.execution_state?): evolved.chunk?, evolved.entity[]? ---@alias evolved.execution_iterator fun(state: evolved.execution_state?): evolved.chunk?, evolved.entity[]?
--- ---
@@ -207,27 +207,28 @@ local function __release_execution_stack(stack)
__execution_stacks[#__execution_stacks + 1] = stack __execution_stacks[#__execution_stacks + 1] = stack
end end
---@param exclude_set table<evolved.fragment, boolean> ---@param exclude_set? table<evolved.fragment, boolean>
---@return evolved.execution_state ---@return evolved.execution_state
---@return evolved.execution_stack ---@return evolved.execution_stack
---@nodiscard ---@nodiscard
local function __acquire_execution_state(exclude_set) local function __acquire_execution_state(exclude_set)
if #__execution_states == 0 then if #__execution_states == 0 then
local stack = __acquire_execution_stack() local stack = __acquire_execution_stack()
return { __structural_changes, exclude_set, stack }, stack return { __structural_changes, stack, exclude_set }, stack
end end
local state = __execution_states[#__execution_states] local state = __execution_states[#__execution_states]
__execution_states[#__execution_states] = nil __execution_states[#__execution_states] = nil
local stack = __acquire_execution_stack() local stack = __acquire_execution_stack()
state[1], state[2], state[3] = __structural_changes, exclude_set, stack state[1], state[2], state[3] = __structural_changes, stack, exclude_set
return state, stack return state, stack
end end
---@param state evolved.execution_state ---@param state evolved.execution_state
local function __release_execution_state(state) local function __release_execution_state(state)
__release_execution_stack(state[3]); state[3] = nil __release_execution_stack(state[2]);
for i = #state, 1, -1 do state[i] = nil end
__execution_states[#__execution_states + 1] = state __execution_states[#__execution_states + 1] = state
end end
@@ -235,7 +236,7 @@ end
local function __execution_iterator(execution_state) local function __execution_iterator(execution_state)
if not execution_state then return end if not execution_state then return end
local structural_changes, exclude_set, execution_stack = local structural_changes, execution_stack, exclude_set =
execution_state[1], execution_state[2], execution_state[3] execution_state[1], execution_state[2], execution_state[3]
if structural_changes ~= __structural_changes then if structural_changes ~= __structural_changes then
@@ -247,7 +248,7 @@ local function __execution_iterator(execution_state)
execution_stack[#execution_stack] = nil execution_stack[#execution_stack] = nil
for _, matched_chunk_child in ipairs(matched_chunk.__children) do for _, matched_chunk_child in ipairs(matched_chunk.__children) do
if not exclude_set[matched_chunk_child.__fragment] then if not exclude_set or not exclude_set[matched_chunk_child.__fragment] then
execution_stack[#execution_stack + 1] = matched_chunk_child execution_stack[#execution_stack + 1] = matched_chunk_child
end end
end end
@@ -2282,8 +2283,8 @@ function evolved.execute(query)
return __execution_iterator, nil return __execution_iterator, nil
end end
---@type table<evolved.fragment, boolean> ---@type table<evolved.fragment, boolean>?
local exclude_set = evolved.get(query, __EXCLUDE_SET) or {} local exclude_set = evolved.get(query, __EXCLUDE_SET)
local execution_state, execution_stack = __acquire_execution_state(exclude_set) local execution_state, execution_stack = __acquire_execution_state(exclude_set)
for _, major_fragment_chunk in ipairs(major_fragment_chunks) do for _, major_fragment_chunk in ipairs(major_fragment_chunks) do