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

support exludes only queries

Browse Source
This commit is contained in:
BlackMATov
2025-03-10 18:16:06 +07:00
parent 2e9f2e162d
commit b7db6712d1
2 changed files with 148 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
develop/untests.lua
View File

@@ -2294,18 +2294,12 @@ do
do
local iter, state = evo.execute(q)
local chunk, entities = iter(state)
local chunk, entities = iter(state)
assert(chunk == evo.chunk(f2))
assert(entities and entities[1] == e2)
end
evo.set(q, evo.INCLUDES)
do
local iter, state = evo.execute(q)
local chunk, entities = iter(state)
chunk, entities = iter(state)
assert(not chunk)
assert(not entities)
end
@@ -2398,16 +2392,16 @@ do
do
local iter, state = evo.execute(q)
local chunk, entities = iter(state)
assert(not chunk and not entities)
local chunk = iter(state)
assert(chunk and chunk ~= evo.chunk(f1))
end
evo.set(q, evo.EXCLUDES, f2)
do
local iter, state = evo.execute(q)
local chunk, entities = iter(state)
assert(not chunk and not entities)
local chunk = iter(state)
assert(chunk and chunk ~= evo.chunk(f1))
end
evo.set(q, evo.INCLUDES, f1)
@@ -7211,3 +7205,71 @@ do
assert(not chunk and not entity_list)
end
end
do
local f1, f2 = evo.id(2)
local q12 = evo.query():include(f1, f2):build()
do
local iter, state = evo.execute(q12)
local chunk, entity_list, entity_count = iter(state)
assert(not chunk and not entity_list and not entity_count)
end
end
do
local f1, f2 = evo.id(2)
local qe12 = evo.query():exclude(f1, f2):build()
evo.entity():set(f1, 1):build()
evo.entity():set(f2, 2):build()
local e12 = evo.entity():set(f1, 3):set(f2, 4):build()
local c1 = evo.chunk(f1)
local c2 = evo.chunk(f2)
local c12 = evo.chunk(f1, f2)
do
local matched_chunk_count = 0
local matched_entity_count = 0
for c, es, ec in evo.execute(qe12) do
assert(ec > 0)
assert(#es == ec)
assert(c ~= c1 and c ~= c2 and c ~= c12)
matched_chunk_count = matched_chunk_count + 1
matched_entity_count = matched_entity_count + ec
end
assert(matched_chunk_count > 0)
assert(matched_entity_count > 0)
end
assert(evo.assign(qe12, evo.EXCLUDES))
do
local matched_chunk_count = 0
local matched_entity_count = 0
for _, es, ec in evo.execute(qe12) do
assert(ec > 0)
assert(#es == ec)
matched_chunk_count = matched_chunk_count + 1
matched_entity_count = matched_entity_count + ec
end
assert(matched_chunk_count > 0)
assert(matched_entity_count > 0)
end
assert(evo.insert(qe12, evo.INCLUDES, f1, f2))
do
local iter, state = evo.execute(qe12)
local chunk, entity_list, entity_count = iter(state)
assert(chunk == c12)
assert(entity_list and #entity_list == 1)
assert(entity_count and entity_count == 1)
assert(entity_list[1] == e12)
end
end

155
evolved.lua
View File

@@ -1701,16 +1701,11 @@ local function __purge_fragment(fragment, policy)
__lua_error('purge operations should be deferred')
end
local minor_chunks = __minor_chunks[fragment]
if not minor_chunks then
return 0
end
local purged_count = 0
local minor_chunks = __minor_chunks[fragment]
local minor_chunk_list = minor_chunks.__item_list
local minor_chunk_count = minor_chunks.__item_count
local minor_chunk_count = minor_chunks.__item_count or 0
if policy == __DESTROY_POLICY_DESTROY_ENTITY then
for minor_chunk_index = minor_chunk_count, 1, -1 do
@@ -3156,14 +3151,9 @@ end
---@param phase evolved.phase
local function __phase_process(phase)
local phase_systems = __phase_systems[phase]
if not phase_systems then
return
end
local phase_system_set = phase_systems.__item_set
local phase_system_list = phase_systems.__item_list
local phase_system_count = phase_systems.__item_count
local phase_system_set = phase_systems and phase_systems.__item_set
local phase_system_list = phase_systems and phase_systems.__item_list
local phase_system_count = phase_systems and phase_systems.__item_count or 0
---@type evolved.system[]
local sorted_system_list = __acquire_table(__table_pool_tag.system_list)
@@ -3196,47 +3186,44 @@ local function __phase_process(phase)
sorting_marks[system_mark_index] = 1
local dependencies = __system_dependencies[system]
local dependency_list = dependencies and dependencies.__item_list
local dependency_count = dependencies and dependencies.__item_count or 0
if dependencies then
local dependency_list = dependencies.__item_list
local dependency_count = dependencies.__item_count
for dependency_index = dependency_count, 1, -1 do
local dependency = dependency_list[dependency_index]
local dependency_mark_index = phase_system_set[dependency]
for dependency_index = dependency_count, 1, -1 do
local dependency = dependency_list[dependency_index]
local dependency_mark_index = phase_system_set[dependency]
if not dependency_mark_index then
-- the dependency is not from this phase
else
local dependency_mark = sorting_marks[dependency_mark_index]
if not dependency_mark_index then
-- the dependency is not from this phase
else
local dependency_mark = sorting_marks[dependency_mark_index]
if not dependency_mark then
-- the dependency has already been added to the sorted list
elseif dependency_mark == 0 then
sorting_stack_size = sorting_stack_size + 1
sorting_stack[sorting_stack_size] = dependency
elseif dependency_mark == 1 then
local sorting_cycle_path = '' .. dependency
if not dependency_mark then
-- the dependency has already been added to the sorted list
elseif dependency_mark == 0 then
sorting_stack_size = sorting_stack_size + 1
sorting_stack[sorting_stack_size] = dependency
elseif dependency_mark == 1 then
local sorting_cycle_path = '' .. dependency
for cycled_system_index = sorting_stack_size, 1, -1 do
local cycled_system = sorting_stack[cycled_system_index]
for cycled_system_index = sorting_stack_size, 1, -1 do
local cycled_system = sorting_stack[cycled_system_index]
local cycled_system_mark_index = phase_system_set[cycled_system]
local cycled_system_mark = sorting_marks[cycled_system_mark_index]
local cycled_system_mark_index = phase_system_set[cycled_system]
local cycled_system_mark = sorting_marks[cycled_system_mark_index]
if cycled_system_mark == 1 then
sorting_cycle_path = __lua_string_format('%s -> %s',
sorting_cycle_path, cycled_system)
if cycled_system_mark == 1 then
sorting_cycle_path = __lua_string_format('%s -> %s',
sorting_cycle_path, cycled_system)
if cycled_system == dependency then
break
end
if cycled_system == dependency then
break
end
end
__lua_error(__lua_string_format('system sorting failed: cyclic dependency detected (%s)',
sorting_cycle_path))
end
__lua_error(__lua_string_format('system sorting failed: cyclic dependency detected (%s)',
sorting_cycle_path))
end
end
end
@@ -6511,51 +6498,57 @@ __evolved_execute = function(query)
__validate_query(query)
end
local query_includes = __query_sorted_includes[query]
local query_include_list = query_includes and query_includes.__item_list
local query_include_count = query_includes and query_includes.__item_count
if not query_include_list or query_include_count == 0 then
return __execute_iterator
end
local major_fragment = query_include_list[query_include_count]
local major_fragment_chunks = __major_chunks[major_fragment]
if not major_fragment_chunks then
return __execute_iterator
end
local query_excludes = __query_sorted_excludes[query]
local query_exclude_set = query_excludes and query_excludes.__item_set
local query_exclude_list = query_excludes and query_excludes.__item_list
local query_exclude_count = query_excludes and query_excludes.__item_count
---@type evolved.chunk[]
local chunk_stack = __acquire_table(__table_pool_tag.chunk_stack)
local chunk_stack_size = 0
local major_fragment_chunk_list = major_fragment_chunks.__item_list
local major_fragment_chunk_count = major_fragment_chunks.__item_count
local query_includes = __query_sorted_includes[query]
local query_include_list = query_includes and query_includes.__item_list
local query_include_count = query_includes and query_includes.__item_count or 0
for major_fragment_chunk_index = 1, major_fragment_chunk_count do
local major_fragment_chunk = major_fragment_chunk_list[major_fragment_chunk_index]
local query_excludes = __query_sorted_excludes[query]
local query_exclude_set = query_excludes and query_excludes.__item_set
local query_exclude_list = query_excludes and query_excludes.__item_list
local query_exclude_count = query_excludes and query_excludes.__item_count or 0
local is_major_fragment_chunk_matched = true
if query_include_count > 0 then
local major_fragment = query_include_list[query_include_count]
if is_major_fragment_chunk_matched and query_include_list and query_include_count > 1 then
is_major_fragment_chunk_matched = __chunk_has_all_fragment_list(
major_fragment_chunk, query_include_list, query_include_count - 1)
local major_fragment_chunks = __major_chunks[major_fragment]
local major_fragment_chunk_list = major_fragment_chunks and major_fragment_chunks.__item_list
local major_fragment_chunk_count = major_fragment_chunks and major_fragment_chunks.__item_count or 0
for major_fragment_chunk_index = 1, major_fragment_chunk_count do
local major_fragment_chunk = major_fragment_chunk_list[major_fragment_chunk_index]
local is_major_chunk_matched = true
if is_major_chunk_matched and query_include_count > 1 then
is_major_chunk_matched = __chunk_has_all_fragment_list(
major_fragment_chunk, query_include_list, query_include_count - 1)
end
if is_major_chunk_matched and query_exclude_count > 0 then
is_major_chunk_matched = not __chunk_has_any_fragment_list(
major_fragment_chunk, query_exclude_list, query_exclude_count)
end
if is_major_chunk_matched then
chunk_stack_size = chunk_stack_size + 1
chunk_stack[chunk_stack_size] = major_fragment_chunk
end
end
if is_major_fragment_chunk_matched and query_exclude_list and query_exclude_count > 0 then
is_major_fragment_chunk_matched = not __chunk_has_any_fragment_list(
major_fragment_chunk, query_exclude_list, query_exclude_count)
elseif query_exclude_count > 0 then
for root_fragment, root_fragment_chunk in __lua_next, __root_chunks do
if not query_exclude_set[root_fragment] then
chunk_stack_size = chunk_stack_size + 1
chunk_stack[chunk_stack_size] = root_fragment_chunk
end
end
if is_major_fragment_chunk_matched then
else
for _, root_fragment_chunk in __lua_next, __root_chunks do
chunk_stack_size = chunk_stack_size + 1
chunk_stack[chunk_stack_size] = major_fragment_chunk
chunk_stack[chunk_stack_size] = root_fragment_chunk
end
end