diff --git a/README.md b/README.md index da3da97..ee13ee7 100644 --- a/README.md +++ b/README.md @@ -77,21 +77,21 @@ has_any :: chunk | entity, fragment... -> boolean get :: entity, fragment... -> component... -set :: entity, fragment, any... -> boolean -remove :: entity, fragment... -> boolean -clear :: entity... -> boolean -destroy :: entity... -> boolean +set :: entity, fragment, any... -> () +remove :: entity, fragment... -> () +clear :: entity... -> () +destroy :: entity... -> () -multi_set :: entity, fragment[], component[]? -> boolean -multi_remove :: entity, fragment[] -> boolean +multi_set :: entity, fragment[], component[]? -> () +multi_remove :: entity, fragment[] -> () -batch_set :: query, fragment, any... -> boolean -batch_remove :: query, fragment... -> boolean -batch_clear :: query... -> boolean -batch_destroy :: query... -> boolean +batch_set :: query, fragment, any... -> () +batch_remove :: query, fragment... -> () +batch_clear :: query... -> () +batch_destroy :: query... -> () -batch_multi_set :: query, fragment[], component[]? -> boolean -batch_multi_remove :: query, fragment[] -> boolean +batch_multi_set :: query, fragment[], component[]? -> () +batch_multi_remove :: query, fragment[] -> () chunk :: fragment, fragment... -> chunk, entity[], integer @@ -104,11 +104,11 @@ execute :: query -> {execute_state? -> chunk?, entity[]?, integer?}, execute_sta process :: phase... -> () -spawn_at :: chunk?, fragment[]?, component[]? -> entity, boolean -spawn_with :: fragment[]?, component[]? -> entity, boolean +spawn_at :: chunk?, fragment[]?, component[]? -> entity +spawn_with :: fragment[]?, component[]? -> entity debug_mode :: boolean -> () -collect_garbage :: boolean, boolean +collect_garbage :: () ``` ## Builders @@ -116,7 +116,7 @@ collect_garbage :: boolean, boolean ``` entity :: entity_builder entity_builder:set :: fragment, any... -> entity_builder -entity_builder:build :: entity, boolean +entity_builder:build :: entity ``` ``` @@ -131,7 +131,7 @@ fragment_builder:on_assign :: {entity, fragment, component, component} -> fragme fragment_builder:on_insert :: {entity, fragment, component} -> fragment_builder fragment_builder:on_remove :: {entity, fragment} -> fragment_builder fragment_builder:destroy_policy :: id -> fragment_builder -fragment_builder:build :: fragment, boolean +fragment_builder:build :: fragment ``` ``` @@ -140,7 +140,7 @@ query_builder:name :: string -> query_builder query_builder:single :: component -> query_builder query_builder:include :: fragment... -> query_builder query_builder:exclude :: fragment... -> query_builder -query_builder:build :: query, boolean +query_builder:build :: query ``` ``` @@ -152,7 +152,7 @@ group_builder:phase :: phase -> group_builder group_builder:after :: group... -> group_builder group_builder:prologue :: {} -> group_builder group_builder:epilogue :: {} -> group_builder -group_builder:build :: group, boolean +group_builder:build :: group ``` ``` @@ -162,7 +162,7 @@ phase_builder:single :: component -> phase_builder phase_builder:disable :: phase_builder phase_builder:prologue :: {} -> phase_builder phase_builder:epilogue :: {} -> phase_builder -phase_builder:build :: phase, boolean +phase_builder:build :: phase ``` ``` @@ -175,7 +175,7 @@ system_builder:query :: query -> system_builder system_builder:execute :: {chunk, entity[], integer} -> system_builder system_builder:prologue :: {} -> system_builder system_builder:epilogue :: {} -> system_builder -system_builder:build :: system, boolean +system_builder:build :: system ``` ## [License (MIT)](./LICENSE.md) diff --git a/develop/untests.lua b/develop/untests.lua index dc6cf0e..d332526 100644 --- a/develop/untests.lua +++ b/develop/untests.lua @@ -36,19 +36,19 @@ do assert(evo.is_alive(e1)) assert(evo.is_alive(e2)) - assert(evo.destroy(e1)) + evo.destroy(e1) assert(not evo.is_alive(e1)) assert(evo.is_alive(e2)) - assert(evo.destroy(e1)) - assert(evo.destroy(e2)) + evo.destroy(e1) + evo.destroy(e2) assert(not evo.is_alive(e1)) assert(not evo.is_alive(e2)) - assert(evo.destroy(e1)) - assert(evo.destroy(e2)) + evo.destroy(e1) + evo.destroy(e2) assert(not evo.is_alive(e1)) assert(not evo.is_alive(e2)) @@ -120,7 +120,7 @@ do assert(c1 == nil and c2 == nil) end - assert(evo.set(e, f1, 41)) + evo.set(e, f1, 41) do assert(evo.has(e, f1)) @@ -137,7 +137,7 @@ do assert(c1 == 41 and c2 == nil) end - assert(evo.set(e, f2, 42)) + evo.set(e, f2, 42) do assert(evo.has(e, f1)) @@ -159,9 +159,9 @@ do local f1, f2 = evo.id(2) local e = evo.id() - assert(evo.set(e, f1, 41)) + evo.set(e, f1, 41) - assert(evo.set(e, f2, 42)) + evo.set(e, f2, 42) do assert(evo.has_all(e, f1, f2)) @@ -175,8 +175,8 @@ do do local e = evo.id() - assert(evo.set(e, f1, 41)) - assert(evo.set(e, f2, 42)) + evo.set(e, f1, 41) + evo.set(e, f2, 42) evo.remove(e, f1) @@ -189,8 +189,8 @@ do do local e = evo.id() - assert(evo.set(e, f1, 41)) - assert(evo.set(e, f2, 42)) + evo.set(e, f1, 41) + evo.set(e, f2, 42) evo.remove(e, f2) @@ -203,8 +203,8 @@ do do local e = evo.id() - assert(evo.set(e, f1, 41)) - assert(evo.set(e, f2, 42)) + evo.set(e, f1, 41) + evo.set(e, f2, 42) evo.remove(e, f1, f2) @@ -219,22 +219,22 @@ do local f1, f2 = evo.id(2) local e1, e2 = evo.id(2) - assert(evo.set(e1, f1, 41)) - assert(evo.set(e2, f2, 42)) + evo.set(e1, f1, 41) + evo.set(e2, f2, 42) do assert(evo.get(e1, f1) == 41 and evo.get(e1, f2) == nil) assert(evo.get(e2, f2) == 42 and evo.get(e2, f1) == nil) end - assert(evo.set(e1, f2, 43)) + evo.set(e1, f2, 43) do assert(evo.get(e1, f1) == 41 and evo.get(e1, f2) == 43) assert(evo.get(e2, f2) == 42 and evo.get(e2, f1) == nil) end - assert(evo.set(e2, f1, 44)) + evo.set(e2, f1, 44) do assert(evo.get(e1, f1) == 41 and evo.get(e1, f2) == 43) @@ -248,10 +248,10 @@ do do local e1, e2 = evo.id(2) - assert(evo.set(e1, f1, 41)) - assert(evo.set(e1, f2, 43)) - assert(evo.set(e2, f1, 44)) - assert(evo.set(e2, f2, 42)) + evo.set(e1, f1, 41) + evo.set(e1, f2, 43) + evo.set(e2, f1, 44) + evo.set(e2, f2, 42) do assert(evo.get(e1, f1) == 41 and evo.get(e1, f2) == 43) @@ -278,10 +278,10 @@ do local f1, f2 = evo.id(2) local e1, e2 = evo.id(2) - assert(evo.set(e1, f1, 41)) - assert(evo.set(e1, f2, 43)) - assert(evo.set(e2, f1, 44)) - assert(evo.set(e2, f2, 42)) + evo.set(e1, f1, 41) + evo.set(e1, f2, 43) + evo.set(e2, f1, 44) + evo.set(e2, f2, 42) evo.clear(e1) @@ -305,14 +305,14 @@ do assert(evo.get(e, f1) == nil) - assert(evo.set(e, f1, 41)) - assert(evo.set(e, f1, 42)) + evo.set(e, f1, 41) + evo.set(e, f1, 42) assert(evo.get(e, f1) == 42) assert(evo.get(e, f2) == nil) - assert(evo.set(e, f2, 43)) - assert(evo.set(e, f2, 44)) + evo.set(e, f2, 43) + evo.set(e, f2, 44) assert(evo.get(e, f2) == 44) end @@ -481,7 +481,7 @@ do last_remove_old_component = old_component end) - assert(evo.set(e, f, 21)) + evo.set(e, f, 21) assert(set_count == 1) assert(assign_count == 0) assert(insert_count == 1) @@ -490,7 +490,7 @@ do assert(last_set_new_component == 21) assert(last_insert_new_component == 21) - assert(evo.set(e, f, 42)) + evo.set(e, f, 42) assert(set_count == 2) assert(assign_count == 1) assert(insert_count == 1) @@ -500,7 +500,7 @@ do assert(last_assign_new_component == 42) assert(last_assign_old_component == 21) - assert(evo.set(e, f, 43)) + evo.set(e, f, 43) assert(set_count == 3) assert(assign_count == 2) assert(insert_count == 1) @@ -565,24 +565,24 @@ do last_removed_component = component end) - assert(evo.set(e, f1, 42)) + evo.set(e, f1, 42) evo.remove(e, f1, f2) assert(remove_count == 1) assert(last_removed_component == 42) - assert(evo.set(e, f1, 42)) - assert(evo.set(e, f2, 43)) + evo.set(e, f1, 42) + evo.set(e, f2, 43) evo.remove(e, f1, f2, f2) assert(remove_count == 3) assert(last_removed_component == 43) - assert(evo.set(e, f1, 44)) - assert(evo.set(e, f2, 45)) + evo.set(e, f1, 44) + evo.set(e, f2, 45) evo.clear(e) assert(remove_count == 5) - assert(evo.set(e, f1, 46)) - assert(evo.set(e, f2, 47)) + evo.set(e, f1, 46) + evo.set(e, f2, 47) evo.destroy(e) assert(remove_count == 7) end @@ -591,7 +591,7 @@ do local f = evo.id() local e = evo.id() - assert(evo.set(e, f, 42)) + evo.set(e, f, 42) assert(evo.has(e, f)) assert(evo.is_alive(e)) @@ -632,15 +632,15 @@ do local _ = evo.id() local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) local e2 = evo.id() - assert(evo.set(e2, f1, 42)) - assert(evo.set(e2, f2, 43)) + evo.set(e2, f1, 42) + evo.set(e2, f2, 43) local e2b = evo.id() - assert(evo.set(e2b, f1, 44)) - assert(evo.set(e2b, f2, 45)) + evo.set(e2b, f1, 44) + evo.set(e2b, f2, 45) do local chunk, entities = evo.chunk(f1) @@ -677,15 +677,15 @@ do local e1, e2, e3, e4 = evo.id(4) - assert(evo.set(e1, f3, 44)) + evo.set(e1, f3, 44) - assert(evo.set(e2, f1, 45)) - assert(evo.set(e2, f2, 46)) - assert(evo.set(e2, f3, 47)) + evo.set(e2, f1, 45) + evo.set(e2, f2, 46) + evo.set(e2, f3, 47) - assert(evo.set(e3, f1, 45)) - assert(evo.set(e3, f2, 46)) - assert(evo.set(e3, f3, 47)) + evo.set(e3, f1, 45) + evo.set(e3, f2, 46) + evo.set(e3, f3, 47) assert(evo.defer()) assert(not evo.defer()) @@ -751,7 +751,7 @@ do do local e = evo.id() - assert(evo.set(e, f1, 21)) + evo.set(e, f1, 21) assert(evo.get(e, f1) == 21) assert(evo.get(e, f2) == 42) @@ -762,7 +762,7 @@ do do local e = evo.id() - assert(evo.set(e, f1, 21)) + evo.set(e, f1, 21) assert(evo.get(e, f1) == 21) assert(evo.get(e, f2) == 42) @@ -773,7 +773,7 @@ do do local e = evo.id() - assert(evo.set(e, f1, 21)) + evo.set(e, f1, 21) assert(evo.get(e, f1) == 21) assert(evo.get(e, f2) == 42) @@ -806,7 +806,7 @@ do do local e = evo.id() - assert(evo.set(e, f1, 21)) + evo.set(e, f1, 21) assert(evo.get(e, f1) == 21) assert(evo.get(e, f2) == 42) @@ -817,7 +817,7 @@ do do local e = evo.id() - assert(evo.set(e, f1, 21)) + evo.set(e, f1, 21) assert(evo.get(e, f1) == 21) assert(evo.get(e, f2) == 42) @@ -828,7 +828,7 @@ do do local e = evo.id() - assert(evo.set(e, f1, 21)) + evo.set(e, f1, 21) assert(evo.get(e, f1) == 21) assert(evo.get(e, f2) == 42) @@ -843,32 +843,32 @@ do local f1, f2, f3, f4 = evo.id(4) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) local e2 = evo.id() - assert(evo.set(e2, f1, 42)) - assert(evo.set(e2, f2, 43)) + evo.set(e2, f1, 42) + evo.set(e2, f2, 43) local e3 = evo.id() - assert(evo.set(e3, f1, 44)) - assert(evo.set(e3, f2, 45)) - assert(evo.set(e3, f3, 46)) + evo.set(e3, f1, 44) + evo.set(e3, f2, 45) + evo.set(e3, f3, 46) local e4 = evo.id() - assert(evo.set(e4, f1, 47)) - assert(evo.set(e4, f2, 48)) - assert(evo.set(e4, f3, 49)) - assert(evo.set(e4, f4, 50)) + evo.set(e4, f1, 47) + evo.set(e4, f2, 48) + evo.set(e4, f3, 49) + evo.set(e4, f4, 50) local e5 = evo.id() - assert(evo.set(e5, f2, 51)) - assert(evo.set(e5, f3, 52)) - assert(evo.set(e5, f4, 53)) + evo.set(e5, f2, 51) + evo.set(e5, f3, 52) + evo.set(e5, f4, 53) local q = evo.id() evo.set(q, evo.INCLUDES, f1, f2) - assert(evo.batch_set(q, f1, 60)) + evo.batch_set(q, f1, 60) assert(evo.get(e1, f1) == 41 and evo.get(e1, f3) == nil) assert(evo.get(e2, f1) == 60 and evo.get(e2, f3) == nil) @@ -877,7 +877,7 @@ do assert(evo.get(e5, f1) == nil and evo.get(e5, f3) == 52) evo.set(q, evo.INCLUDES, f1, f2, f3) - assert(evo.batch_set(q, f3, 70)) + evo.batch_set(q, f3, 70) assert(evo.get(e1, f1) == 41 and evo.get(e1, f3) == nil) assert(evo.get(e2, f1) == 60 and evo.get(e2, f3) == nil) @@ -904,32 +904,32 @@ do end) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) local e2 = evo.id() - assert(evo.set(e2, f1, 42)) - assert(evo.set(e2, f2, 43)) + evo.set(e2, f1, 42) + evo.set(e2, f2, 43) local e3 = evo.id() - assert(evo.set(e3, f1, 44)) - assert(evo.set(e3, f2, 45)) - assert(evo.set(e3, f3, 46)) + evo.set(e3, f1, 44) + evo.set(e3, f2, 45) + evo.set(e3, f3, 46) local e4 = evo.id() - assert(evo.set(e4, f1, 47)) - assert(evo.set(e4, f2, 48)) - assert(evo.set(e4, f3, 49)) - assert(evo.set(e4, f4, 50)) + evo.set(e4, f1, 47) + evo.set(e4, f2, 48) + evo.set(e4, f3, 49) + evo.set(e4, f4, 50) local e5 = evo.id() - assert(evo.set(e5, f2, 51)) - assert(evo.set(e5, f3, 52)) - assert(evo.set(e5, f4, 53)) + evo.set(e5, f2, 51) + evo.set(e5, f3, 52) + evo.set(e5, f4, 53) local q = evo.id() evo.set(q, evo.INCLUDES, f1, f2) - assert(evo.batch_set(q, f1, 60)) + evo.batch_set(q, f1, 60) assert(entity_sum == e2 + e3 + e4) assert(component_sum == 42 + 44 + 47 + 60 + 60 + 60) @@ -943,7 +943,7 @@ do assert(evo.get(e5, f1) == nil and evo.get(e5, f3) == 52) evo.set(q, evo.INCLUDES, f1, f2, f3) - assert(evo.batch_set(q, f3, 70)) + evo.batch_set(q, f3, 70) assert(entity_sum == e3 + e4) assert(component_sum == 46 + 49 + 70 + 70) @@ -963,32 +963,32 @@ do local f1, f2, f3, f4 = evo.id(4) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) local e2 = evo.id() - assert(evo.set(e2, f1, 42)) - assert(evo.set(e2, f2, 43)) + evo.set(e2, f1, 42) + evo.set(e2, f2, 43) local e3 = evo.id() - assert(evo.set(e3, f1, 44)) - assert(evo.set(e3, f2, 45)) - assert(evo.set(e3, f3, 46)) + evo.set(e3, f1, 44) + evo.set(e3, f2, 45) + evo.set(e3, f3, 46) local e4 = evo.id() - assert(evo.set(e4, f1, 47)) - assert(evo.set(e4, f2, 48)) - assert(evo.set(e4, f3, 49)) - assert(evo.set(e4, f4, 50)) + evo.set(e4, f1, 47) + evo.set(e4, f2, 48) + evo.set(e4, f3, 49) + evo.set(e4, f4, 50) local e5 = evo.id() - assert(evo.set(e5, f2, 51)) - assert(evo.set(e5, f3, 52)) - assert(evo.set(e5, f4, 53)) + evo.set(e5, f2, 51) + evo.set(e5, f3, 52) + evo.set(e5, f4, 53) local q = evo.id() evo.set(q, evo.INCLUDES, f1, f2) - assert(evo.batch_clear(q)) + evo.batch_clear(q) assert(evo.is_alive(e1)) assert(evo.is_alive(e2)) @@ -1033,32 +1033,32 @@ do end) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) local e2 = evo.id() - assert(evo.set(e2, f1, 42)) - assert(evo.set(e2, f2, 43)) + evo.set(e2, f1, 42) + evo.set(e2, f2, 43) local e3 = evo.id() - assert(evo.set(e3, f1, 44)) - assert(evo.set(e3, f2, 45)) - assert(evo.set(e3, f3, 46)) + evo.set(e3, f1, 44) + evo.set(e3, f2, 45) + evo.set(e3, f3, 46) local e4 = evo.id() - assert(evo.set(e4, f1, 47)) - assert(evo.set(e4, f2, 48)) - assert(evo.set(e4, f3, 49)) - assert(evo.set(e4, f4, 50)) + evo.set(e4, f1, 47) + evo.set(e4, f2, 48) + evo.set(e4, f3, 49) + evo.set(e4, f4, 50) local e5 = evo.id() - assert(evo.set(e5, f2, 51)) - assert(evo.set(e5, f3, 52)) - assert(evo.set(e5, f4, 53)) + evo.set(e5, f2, 51) + evo.set(e5, f3, 52) + evo.set(e5, f4, 53) local q = evo.id() evo.set(q, evo.INCLUDES, f1, f2) - assert(evo.batch_clear(q)) + evo.batch_clear(q) assert(entity_sum == e2 * 2 + e3 * 3 + e4 * 4) assert(component_sum == 42 + 43 + 44 + 45 + 46 + 47 + 48 + 49 + 50) @@ -1081,32 +1081,32 @@ do local f1, f2, f3, f4 = evo.id(4) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) local e2 = evo.id() - assert(evo.set(e2, f1, 42)) - assert(evo.set(e2, f2, 43)) + evo.set(e2, f1, 42) + evo.set(e2, f2, 43) local e3 = evo.id() - assert(evo.set(e3, f1, 44)) - assert(evo.set(e3, f2, 45)) - assert(evo.set(e3, f3, 46)) + evo.set(e3, f1, 44) + evo.set(e3, f2, 45) + evo.set(e3, f3, 46) local e4 = evo.id() - assert(evo.set(e4, f1, 47)) - assert(evo.set(e4, f2, 48)) - assert(evo.set(e4, f3, 49)) - assert(evo.set(e4, f4, 50)) + evo.set(e4, f1, 47) + evo.set(e4, f2, 48) + evo.set(e4, f3, 49) + evo.set(e4, f4, 50) local e5 = evo.id() - assert(evo.set(e5, f2, 51)) - assert(evo.set(e5, f3, 52)) - assert(evo.set(e5, f4, 53)) + evo.set(e5, f2, 51) + evo.set(e5, f3, 52) + evo.set(e5, f4, 53) local q = evo.id() evo.set(q, evo.INCLUDES, f1, f2) - assert(evo.batch_destroy(q)) + evo.batch_destroy(q) assert(evo.is_alive(e1)) assert(not evo.is_alive(e2)) @@ -1151,32 +1151,32 @@ do end) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) local e2 = evo.id() - assert(evo.set(e2, f1, 42)) - assert(evo.set(e2, f2, 43)) + evo.set(e2, f1, 42) + evo.set(e2, f2, 43) local e3 = evo.id() - assert(evo.set(e3, f1, 44)) - assert(evo.set(e3, f2, 45)) - assert(evo.set(e3, f3, 46)) + evo.set(e3, f1, 44) + evo.set(e3, f2, 45) + evo.set(e3, f3, 46) local e4 = evo.id() - assert(evo.set(e4, f1, 47)) - assert(evo.set(e4, f2, 48)) - assert(evo.set(e4, f3, 49)) - assert(evo.set(e4, f4, 50)) + evo.set(e4, f1, 47) + evo.set(e4, f2, 48) + evo.set(e4, f3, 49) + evo.set(e4, f4, 50) local e5 = evo.id() - assert(evo.set(e5, f2, 51)) - assert(evo.set(e5, f3, 52)) - assert(evo.set(e5, f4, 53)) + evo.set(e5, f2, 51) + evo.set(e5, f3, 52) + evo.set(e5, f4, 53) local q = evo.id() evo.set(q, evo.INCLUDES, f1, f2) - assert(evo.batch_destroy(q)) + evo.batch_destroy(q) assert(entity_sum == e2 * 2 + e3 * 3 + e4 * 4) assert(component_sum == 42 + 43 + 44 + 45 + 46 + 47 + 48 + 49 + 50) @@ -1199,32 +1199,32 @@ do local f1, f2, f3, f4 = evo.id(4) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) local e2 = evo.id() - assert(evo.set(e2, f1, 42)) - assert(evo.set(e2, f2, 43)) + evo.set(e2, f1, 42) + evo.set(e2, f2, 43) local e3 = evo.id() - assert(evo.set(e3, f1, 44)) - assert(evo.set(e3, f2, 45)) - assert(evo.set(e3, f3, 46)) + evo.set(e3, f1, 44) + evo.set(e3, f2, 45) + evo.set(e3, f3, 46) local e4 = evo.id() - assert(evo.set(e4, f1, 47)) - assert(evo.set(e4, f2, 48)) - assert(evo.set(e4, f3, 49)) - assert(evo.set(e4, f4, 50)) + evo.set(e4, f1, 47) + evo.set(e4, f2, 48) + evo.set(e4, f3, 49) + evo.set(e4, f4, 50) local e5 = evo.id() - assert(evo.set(e5, f2, 51)) - assert(evo.set(e5, f3, 52)) - assert(evo.set(e5, f4, 53)) + evo.set(e5, f2, 51) + evo.set(e5, f3, 52) + evo.set(e5, f4, 53) local q = evo.id() evo.set(q, evo.INCLUDES, f1, f2) - assert(evo.batch_remove(q, f2, f3)) + evo.batch_remove(q, f2, f3) assert(evo.get(e1, f1) == 41) assert(evo.get(e2, f1) == 42) @@ -1272,32 +1272,32 @@ do end) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) local e2 = evo.id() - assert(evo.set(e2, f1, 42)) - assert(evo.set(e2, f2, 43)) + evo.set(e2, f1, 42) + evo.set(e2, f2, 43) local e3 = evo.id() - assert(evo.set(e3, f1, 44)) - assert(evo.set(e3, f2, 45)) - assert(evo.set(e3, f3, 46)) + evo.set(e3, f1, 44) + evo.set(e3, f2, 45) + evo.set(e3, f3, 46) local e4 = evo.id() - assert(evo.set(e4, f1, 47)) - assert(evo.set(e4, f2, 48)) - assert(evo.set(e4, f3, 49)) - assert(evo.set(e4, f4, 50)) + evo.set(e4, f1, 47) + evo.set(e4, f2, 48) + evo.set(e4, f3, 49) + evo.set(e4, f4, 50) local e5 = evo.id() - assert(evo.set(e5, f2, 51)) - assert(evo.set(e5, f3, 52)) - assert(evo.set(e5, f4, 53)) + evo.set(e5, f2, 51) + evo.set(e5, f3, 52) + evo.set(e5, f4, 53) local q = evo.id() evo.set(q, evo.INCLUDES, f1, f2) - assert(evo.batch_remove(q, f2, f3, f3)) + evo.batch_remove(q, f2, f3, f3) assert(entity_sum == e2 + e3 * 2 + e4 * 2) assert(component_sum == 43 + 45 + 46 + 48 + 49) @@ -1321,7 +1321,7 @@ do assert(evo.get(e2, f1) == 21 and evo.get(e2, f2) == 22) local q = evo.query():include(f1):exclude(f2):build() - assert(evo.batch_set(q, f2)) + evo.batch_set(q, f2) assert(evo.get(e1, f1) == 11 and evo.get(e1, f2) == 42) assert(evo.get(e2, f1) == 21 and evo.get(e2, f2) == 22) @@ -1330,27 +1330,27 @@ do local f1, f2, f3, f4 = evo.id(4) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) local e2 = evo.id() - assert(evo.set(e2, f1, 42)) - assert(evo.set(e2, f2, 43)) + evo.set(e2, f1, 42) + evo.set(e2, f2, 43) local e3 = evo.id() - assert(evo.set(e3, f1, 44)) - assert(evo.set(e3, f2, 45)) - assert(evo.set(e3, f3, 46)) + evo.set(e3, f1, 44) + evo.set(e3, f2, 45) + evo.set(e3, f3, 46) local e4 = evo.id() - assert(evo.set(e4, f2, 48)) - assert(evo.set(e4, f3, 49)) - assert(evo.set(e4, f4, 50)) + evo.set(e4, f2, 48) + evo.set(e4, f3, 49) + evo.set(e4, f4, 50) local q = evo.id() evo.set(q, evo.INCLUDES, f2) evo.set(q, evo.EXCLUDES, f1) - assert(evo.batch_set(q, f1, 60)) + evo.batch_set(q, f1, 60) assert(evo.get(e1, f1) == 41) assert(evo.get(e2, f1) == 42) @@ -1376,21 +1376,21 @@ do end) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) local e2 = evo.id() - assert(evo.set(e2, f1, 42)) - assert(evo.set(e2, f2, 43)) + evo.set(e2, f1, 42) + evo.set(e2, f2, 43) local e3 = evo.id() - assert(evo.set(e3, f1, 44)) - assert(evo.set(e3, f2, 45)) - assert(evo.set(e3, f3, 46)) + evo.set(e3, f1, 44) + evo.set(e3, f2, 45) + evo.set(e3, f3, 46) local e4 = evo.id() - assert(evo.set(e4, f2, 48)) - assert(evo.set(e4, f3, 49)) - assert(evo.set(e4, f4, 50)) + evo.set(e4, f2, 48) + evo.set(e4, f3, 49) + evo.set(e4, f4, 50) local q = evo.id() evo.set(q, evo.INCLUDES, f2) @@ -1398,7 +1398,7 @@ do entity_sum = 0 component_sum = 0 - assert(evo.batch_set(q, f1, 60)) + evo.batch_set(q, f1, 60) assert(entity_sum == e4) assert(component_sum == 60) @@ -1411,7 +1411,7 @@ do entity_sum = 0 component_sum = 0 - assert(evo.batch_set(q, f5, 70)) + evo.batch_set(q, f5, 70) assert(entity_sum == e2 + e3 + e4) assert(component_sum == 70 * 3) end @@ -1422,26 +1422,26 @@ do local f1, f2, f3, f4 = evo.id(4) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) local e2 = evo.id() - assert(evo.set(e2, f1, 42)) - assert(evo.set(e2, f2, 43)) + evo.set(e2, f1, 42) + evo.set(e2, f2, 43) local e3 = evo.id() - assert(evo.set(e3, f1, 44)) - assert(evo.set(e3, f2, 45)) - assert(evo.set(e3, f3, 46)) + evo.set(e3, f1, 44) + evo.set(e3, f2, 45) + evo.set(e3, f3, 46) local e4 = evo.id() - assert(evo.set(e4, f2, 48)) - assert(evo.set(e4, f3, 49)) - assert(evo.set(e4, f4, 50)) + evo.set(e4, f2, 48) + evo.set(e4, f3, 49) + evo.set(e4, f4, 50) local q = evo.id() evo.set(q, evo.INCLUDES, f2) - assert(evo.batch_set(q, f1, 60)) + evo.batch_set(q, f1, 60) assert(evo.get(e1, f1) == 41) assert(evo.get(e2, f1) == 60) @@ -1467,28 +1467,28 @@ do end) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) local e2 = evo.id() - assert(evo.set(e2, f1, 42)) - assert(evo.set(e2, f2, 43)) + evo.set(e2, f1, 42) + evo.set(e2, f2, 43) local e3 = evo.id() - assert(evo.set(e3, f1, 44)) - assert(evo.set(e3, f2, 45)) - assert(evo.set(e3, f3, 46)) + evo.set(e3, f1, 44) + evo.set(e3, f2, 45) + evo.set(e3, f3, 46) local e4 = evo.id() - assert(evo.set(e4, f2, 48)) - assert(evo.set(e4, f3, 49)) - assert(evo.set(e4, f4, 50)) + evo.set(e4, f2, 48) + evo.set(e4, f3, 49) + evo.set(e4, f4, 50) local q = evo.id() evo.set(q, evo.INCLUDES, f2) entity_sum = 0 component_sum = 0 - assert(evo.batch_set(q, f1, 60)) + evo.batch_set(q, f1, 60) assert(entity_sum == e2 + e3 + e4) assert(component_sum == 42 + 60 + 44 + 60 + 60) @@ -1562,60 +1562,60 @@ do local e = evo.id() last_set_entity = 0 - assert(evo.set(e, f1, 41)) + evo.set(e, f1, 41) assert(last_set_entity == e) assert(evo.has(e, f1) and not evo.has(e, f2)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil) do last_set_entity = 0 - assert(evo.set(e, f1, 41)) + evo.set(e, f1, 41) assert(last_set_entity == e) assert(evo.has(e, f1) and not evo.has(e, f2)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil) end last_set_entity = 0 - assert(evo.set(e, f2, 42)) + evo.set(e, f2, 42) assert(last_set_entity == e) assert(evo.has(e, f1) and evo.has(e, f2)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil) do last_set_entity = 0 - assert(evo.set(e, f1, 42)) + evo.set(e, f1, 42) assert(last_set_entity == e) assert(evo.has(e, f1) and evo.has(e, f2)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil) last_set_entity = 0 - assert(evo.set(e, f2, 42)) + evo.set(e, f2, 42) assert(last_set_entity == e) assert(evo.has(e, f1) and evo.has(e, f2)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil) end last_set_entity = 0 - assert(evo.set(e, f3, 43)) + evo.set(e, f3, 43) assert(last_set_entity == e) assert(evo.has(e, f1) and evo.has(e, f2) and evo.has(e, f3)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil and evo.get(e, f3) == 43) do last_set_entity = 0 - assert(evo.set(e, f1, 42)) + evo.set(e, f1, 42) assert(last_set_entity == e) assert(evo.has(e, f1) and evo.has(e, f2) and evo.has(e, f3)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil and evo.get(e, f3) == 43) last_set_entity = 0 - assert(evo.set(e, f2, 42)) + evo.set(e, f2, 42) assert(last_set_entity == e) assert(evo.has(e, f1) and evo.has(e, f2) and evo.has(e, f3)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil and evo.get(e, f3) == 43) last_set_entity = 0 - assert(evo.set(e, f3, 44)) + evo.set(e, f3, 44) assert(last_set_entity == e) assert(evo.has(e, f1) and evo.has(e, f2) and evo.has(e, f3)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil and evo.get(e, f3) == 44) @@ -1626,19 +1626,19 @@ do local e = evo.id() last_set_entity = 0 - assert(evo.set(e, f1)) + evo.set(e, f1) assert(last_set_entity == e) assert(evo.has(e, f1) and not evo.has(e, f2)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil) last_set_entity = 0 - assert(evo.set(e, f2, 42)) + evo.set(e, f2, 42) assert(last_set_entity == e) assert(evo.has(e, f1) and evo.has(e, f2)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil) last_set_entity = 0 - assert(evo.set(e, f3, 43)) + evo.set(e, f3, 43) assert(last_set_entity == e) assert(evo.has(e, f1) and evo.has(e, f2) and evo.has(e, f3)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil and evo.get(e, f3) == 43) @@ -1649,12 +1649,12 @@ do do last_assign_entity = 0 - assert(evo.set(e, f1)) + evo.set(e, f1) assert(evo.has(e, f1) and not evo.has(e, f2)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil) last_assign_entity = 0 - assert(evo.set(e, f1)) + evo.set(e, f1) assert(last_assign_entity == e) assert(evo.has(e, f1) and not evo.has(e, f2)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil) @@ -1662,12 +1662,12 @@ do do last_assign_entity = 0 - assert(evo.set(e, f2, 43)) + evo.set(e, f2, 43) assert(evo.has(e, f1) and evo.has(e, f2)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil) last_assign_entity = 0 - assert(evo.set(e, f2, 44)) + evo.set(e, f2, 44) assert(last_assign_entity == e) assert(evo.has(e, f1) and evo.has(e, f2)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil) @@ -1675,12 +1675,12 @@ do do last_assign_entity = 0 - assert(evo.set(e, f3, 44)) + evo.set(e, f3, 44) assert(evo.has(e, f1) and evo.has(e, f2) and evo.has(e, f3)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil and evo.get(e, f3) == 44) last_assign_entity = 0 - assert(evo.set(e, f3, 45)) + evo.set(e, f3, 45) assert(last_assign_entity == e) assert(evo.has(e, f1) and evo.has(e, f2) and evo.has(e, f3)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil and evo.get(e, f3) == 45) @@ -1690,10 +1690,10 @@ do do do local e = evo.id() - assert(evo.set(e, f1, 41)) + evo.set(e, f1, 41) last_remove_entity = 0 - assert(evo.remove(e, f1)) + evo.remove(e, f1) assert(last_remove_entity == e) assert(not evo.has(e, f1)) assert(evo.get(e, f1) == nil) @@ -1701,11 +1701,11 @@ do do local e = evo.id() - assert(evo.set(e, f1, 41)) - assert(evo.set(e, f2, 42)) + evo.set(e, f1, 41) + evo.set(e, f2, 42) last_remove_entity = 0 - assert(evo.remove(e, f1, f2)) + evo.remove(e, f1, f2) assert(last_remove_entity == e) assert(not evo.has(e, f1) and not evo.has(e, f2)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil) @@ -1713,29 +1713,29 @@ do do local e = evo.id() - assert(evo.set(e, f1, 41)) - assert(evo.set(e, f2, 42)) - assert(evo.set(e, f3, 43)) + evo.set(e, f1, 41) + evo.set(e, f2, 42) + evo.set(e, f3, 43) last_remove_entity = 0 - assert(evo.remove(e, f1, f2, f3)) + evo.remove(e, f1, f2, f3) assert(last_remove_entity == e) assert(not evo.has(e, f1) and not evo.has(e, f2) and not evo.has(e, f3)) end do local e = evo.id() - assert(evo.set(e, f1, 41)) - assert(evo.set(e, f2, 42)) - assert(evo.set(e, f3, 43)) + evo.set(e, f1, 41) + evo.set(e, f2, 42) + evo.set(e, f3, 43) last_remove_entity = 0 - assert(evo.remove(e, f3)) + evo.remove(e, f3) assert(last_remove_entity == e) assert(evo.has(e, f1) and evo.has(e, f2) and not evo.has(e, f3)) last_remove_entity = 0 - assert(evo.remove(e, f1, f2, f3)) + evo.remove(e, f1, f2, f3) assert(last_remove_entity == e) assert(not evo.has(e, f1) and not evo.has(e, f2) and not evo.has(e, f3)) end @@ -1744,10 +1744,11 @@ do do do local e = evo.id() - assert(evo.set(e, f1, 41)) + evo.set(e, f1, 41) last_remove_entity = 0 - assert(evo.clear(e) and evo.is_alive(e)) + evo.clear(e) + assert(evo.is_alive(e)) assert(last_remove_entity == e) assert(not evo.has(e, f1)) assert(evo.get(e, f1) == nil) @@ -1755,11 +1756,12 @@ do do local e = evo.id() - assert(evo.set(e, f1, 41)) - assert(evo.set(e, f2, 42)) + evo.set(e, f1, 41) + evo.set(e, f2, 42) last_remove_entity = 0 - assert(evo.clear(e) and evo.is_alive(e)) + evo.clear(e) + assert(evo.is_alive(e)) assert(last_remove_entity == e) assert(not evo.has(e, f1) and not evo.has(e, f2)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil) @@ -1767,12 +1769,13 @@ do do local e = evo.id() - assert(evo.set(e, f1, 41)) - assert(evo.set(e, f2, 42)) - assert(evo.set(e, f3, 43)) + evo.set(e, f1, 41) + evo.set(e, f2, 42) + evo.set(e, f3, 43) last_remove_entity = 0 - assert(evo.clear(e) and evo.is_alive(e)) + evo.clear(e) + assert(evo.is_alive(e)) assert(last_remove_entity == e) assert(not evo.has(e, f1) and not evo.has(e, f2) and not evo.has(e, f3)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil and evo.get(e, f3) == nil) @@ -1782,10 +1785,11 @@ do do do local e = evo.id() - assert(evo.set(e, f1, 41)) + evo.set(e, f1, 41) last_remove_entity = 0 - assert(evo.destroy(e) and not evo.is_alive(e)) + evo.destroy(e) + assert(not evo.is_alive(e)) assert(last_remove_entity == e) assert(not evo.has(e, f1)) assert(evo.get(e, f1) == nil) @@ -1793,11 +1797,12 @@ do do local e = evo.id() - assert(evo.set(e, f1, 41)) - assert(evo.set(e, f2, 42)) + evo.set(e, f1, 41) + evo.set(e, f2, 42) last_remove_entity = 0 - assert(evo.destroy(e) and not evo.is_alive(e)) + evo.destroy(e) + assert(not evo.is_alive(e)) assert(last_remove_entity == e) assert(not evo.has(e, f1) and not evo.has(e, f2)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil) @@ -1805,12 +1810,13 @@ do do local e = evo.id() - assert(evo.set(e, f1, 41)) - assert(evo.set(e, f2, 42)) - assert(evo.set(e, f3, 43)) + evo.set(e, f1, 41) + evo.set(e, f2, 42) + evo.set(e, f3, 43) last_remove_entity = 0 - assert(evo.destroy(e) and not evo.is_alive(e)) + evo.destroy(e) + assert(not evo.is_alive(e)) assert(last_remove_entity == e) assert(not evo.has(e, f1) and not evo.has(e, f2) and not evo.has(e, f3)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil and evo.get(e, f3) == nil) @@ -1829,38 +1835,38 @@ do do local e = evo.id() - assert(evo.batch_set(q, f1, 50)) + evo.batch_set(q, f1, 50) assert(not evo.has(e, f1)) assert(evo.get(e, f1) == nil) end do local e = evo.id() - assert(evo.set(e, f1, 41)) + evo.set(e, f1, 41) - assert(evo.batch_set(q, f1, 50)) + evo.batch_set(q, f1, 50) assert(evo.has(e, f1)) assert(evo.get(e, f1) == nil) end do local e1 = evo.id() - assert(evo.set(e1, f1, 41)) - assert(evo.set(e1, f2, 42)) + evo.set(e1, f1, 41) + evo.set(e1, f2, 42) local e2 = evo.id() - assert(evo.set(e2, f1, 41)) - assert(evo.set(e2, f2, 42)) - assert(evo.set(e2, f3, 43)) + evo.set(e2, f1, 41) + evo.set(e2, f2, 42) + evo.set(e2, f3, 43) - assert(evo.batch_set(q, f1, 50)) + evo.batch_set(q, f1, 50) assert(evo.has(e1, f1) and evo.has(e1, f2) and not evo.has(e1, f3)) assert(evo.has(e2, f1) and evo.has(e2, f2) and evo.has(e2, f3)) assert(evo.get(e1, f1) == nil and evo.get(e1, f2) == nil) assert(evo.get(e2, f1) == nil and evo.get(e2, f2) == nil and evo.get(e2, f3) == 43) evo.set(q, evo.INCLUDES, f1, f2, f3) - assert(evo.batch_set(q, f3, 51)) + evo.batch_set(q, f3, 51) assert(evo.has(e1, f1) and evo.has(e1, f2) and not evo.has(e1, f3)) assert(evo.has(e2, f1) and evo.has(e2, f2) and evo.has(e2, f3)) @@ -1881,19 +1887,19 @@ do do local e1 = evo.id() - assert(evo.set(e1, f1, 41)) - assert(evo.set(e1, f2, 42)) + evo.set(e1, f1, 41) + evo.set(e1, f2, 42) local e2 = evo.id() - assert(evo.set(e2, f1, 41)) + evo.set(e2, f1, 41) local e3 = evo.id() - assert(evo.set(e3, f1, 41)) - assert(evo.set(e3, f2, 42)) - assert(evo.set(e3, f3, 43)) + evo.set(e3, f1, 41) + evo.set(e3, f2, 42) + evo.set(e3, f3, 43) evo.set(q, evo.EXCLUDES, f3) - assert(evo.batch_set(q, f3, 50)) + evo.batch_set(q, f3, 50) assert(evo.has(e1, f1) and evo.has(e1, f2) and evo.has(e1, f3)) assert(evo.get(e1, f1) == nil and evo.get(e1, f2) == nil and evo.get(e1, f3) == 50) @@ -1929,18 +1935,18 @@ do do local e1 = evo.id() - assert(evo.set(e1, f1, 41)) - assert(evo.set(e1, f2, 42)) + evo.set(e1, f1, 41) + evo.set(e1, f2, 42) local e2 = evo.id() - assert(evo.set(e2, f1, 41)) + evo.set(e2, f1, 41) local e3 = evo.id() - assert(evo.set(e3, f1, 41)) - assert(evo.set(e3, f2, 42)) - assert(evo.set(e3, f3, 43)) + evo.set(e3, f1, 41) + evo.set(e3, f2, 42) + evo.set(e3, f3, 43) - assert(evo.batch_remove(q, f1)) + evo.batch_remove(q, f1) assert(not evo.has(e1, f1) and evo.has(e1, f2) and not evo.has(e1, f3)) assert(evo.has(e2, f1) and not evo.has(e2, f2) and not evo.has(e2, f3)) @@ -1980,18 +1986,18 @@ do do local e1 = evo.id() - assert(evo.set(e1, f1, 41)) - assert(evo.set(e1, f2, 42)) + evo.set(e1, f1, 41) + evo.set(e1, f2, 42) local e2 = evo.id() - assert(evo.set(e2, f1, 41)) + evo.set(e2, f1, 41) local e3 = evo.id() - assert(evo.set(e3, f1, 41)) - assert(evo.set(e3, f2, 42)) - assert(evo.set(e3, f3, 43)) + evo.set(e3, f1, 41) + evo.set(e3, f2, 42) + evo.set(e3, f3, 43) - assert(evo.batch_clear(q)) + evo.batch_clear(q) assert(evo.is_alive(e1)) assert(evo.is_alive(e2)) @@ -2025,18 +2031,18 @@ do do local e1 = evo.id() - assert(evo.set(e1, f1, 41)) - assert(evo.set(e1, f2, 42)) + evo.set(e1, f1, 41) + evo.set(e1, f2, 42) local e2 = evo.id() - assert(evo.set(e2, f1, 41)) + evo.set(e2, f1, 41) local e3 = evo.id() - assert(evo.set(e3, f1, 41)) - assert(evo.set(e3, f2, 42)) - assert(evo.set(e3, f3, 43)) + evo.set(e3, f1, 41) + evo.set(e3, f2, 42) + evo.set(e3, f3, 43) - assert(evo.batch_destroy(q)) + evo.batch_destroy(q) assert(not evo.is_alive(e1)) assert(evo.is_alive(e2)) @@ -2066,12 +2072,12 @@ do evo.set(q, evo.INCLUDES, f1) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) do assert(evo.defer()) - assert(not evo.batch_set(q, f1, 42)) + evo.batch_set(q, f1, 42) assert(evo.get(e1, f1) == 41) assert(evo.commit()) @@ -2081,7 +2087,7 @@ do do assert(evo.defer()) - assert(not evo.batch_set(q, f2, 43)) + evo.batch_set(q, f2, 43) assert(evo.get(e1, f2) == nil) assert(evo.commit()) @@ -2096,12 +2102,12 @@ do evo.set(q, evo.INCLUDES, f1) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) do assert(evo.defer()) - assert(not evo.batch_set(q, f1, 42)) + evo.batch_set(q, f1, 42) assert(evo.get(e1, f1) == 41) assert(evo.commit()) @@ -2113,7 +2119,7 @@ do do evo.set(q, evo.INCLUDES, f1, f2) - assert(not evo.batch_set(q, f2, 43)) + evo.batch_set(q, f2, 43) end assert(evo.get(e1, f2) == nil) @@ -2129,14 +2135,14 @@ do evo.set(q, evo.INCLUDES, f1) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) do assert(evo.defer()) do evo.set(q, evo.EXCLUDES, f1) - assert(not evo.batch_set(q, f1, 42)) + evo.batch_set(q, f1, 42) end assert(evo.get(e1, f1) == 41) @@ -2149,7 +2155,7 @@ do do evo.set(q, evo.EXCLUDES) - assert(not evo.batch_set(q, f2, 43)) + evo.batch_set(q, f2, 43) end assert(evo.get(e1, f2) == nil) @@ -2165,12 +2171,12 @@ do evo.set(q, evo.INCLUDES, f1) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) do assert(evo.defer()) - assert(not evo.batch_remove(q, f1)) + evo.batch_remove(q, f1) assert(evo.get(e1, f1) == 41) assert(evo.commit()) @@ -2185,7 +2191,7 @@ do evo.set(q, evo.INCLUDES, f1) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) do assert(evo.defer()) @@ -2207,7 +2213,7 @@ do evo.set(q, evo.INCLUDES, f1) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) do assert(evo.defer()) @@ -2230,10 +2236,10 @@ do evo.set(q, evo.INCLUDES, f2) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) local e2 = evo.id() - assert(evo.set(e2, f2, 42)) + evo.set(e2, f2, 42) do local iter, state = evo.execute(q) @@ -2255,12 +2261,12 @@ do evo.set(q, evo.INCLUDES, f1) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) - assert(evo.set(e1, f2, 42)) + evo.set(e1, f1, 41) + evo.set(e1, f2, 42) local e2 = evo.id() - assert(evo.set(e2, f1, 43)) - assert(evo.set(e2, f3, 44)) + evo.set(e2, f1, 43) + evo.set(e2, f3, 44) do local entity_sum = 0 @@ -2286,11 +2292,11 @@ do evo.set(q, evo.EXCLUDES, f2) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) local e2 = evo.id() - assert(evo.set(e2, f1, 43)) - assert(evo.set(e2, f2, 44)) + evo.set(e2, f1, 43) + evo.set(e2, f2, 44) do local iter, state = evo.execute(q) @@ -2327,11 +2333,11 @@ do local q = evo.id() local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) local e2 = evo.id() - assert(evo.set(e2, f1, 43)) - assert(evo.set(e2, f2, 44)) + evo.set(e2, f1, 43) + evo.set(e2, f2, 44) do local iter, state = evo.execute(q) @@ -2370,7 +2376,7 @@ do do local e = evo.id() - assert(evo.set(e, f1, 41)) + evo.set(e, f1, 41) local iter, state = evo.each(e) local fragment, component = iter(state) @@ -2382,8 +2388,8 @@ do do local e = evo.id() - assert(evo.set(e, f1, 41)) - assert(evo.set(e, f2, 42)) + evo.set(e, f1, 41) + evo.set(e, f2, 42) do local iter, state = evo.each(e) @@ -2416,8 +2422,8 @@ do evo.set(s, evo.TAG) local e = evo.id() - assert(evo.set(e, f1)) - assert(evo.set(e, s)) + evo.set(e, f1) + evo.set(e, s) do local iter, state = evo.each(e) @@ -2573,30 +2579,32 @@ do local e2 = evo.entity():set(f1, 42):set(f1, 41):build() assert(f1_assign_count == 0 and f1_insert_count == 2) - assert(evo.set(e1, f1, 42)) + evo.set(e1, f1, 42) assert(f1_assign_count == 1 and f1_insert_count == 2) - assert(evo.set(e2, f1, 42)) + evo.set(e2, f1, 42) assert(f1_assign_count == 2 and f1_insert_count == 2) assert(evo.get(e1, f1) == 42 and evo.get(e2, f1) == 42) - assert(evo.set(e1, f2, 81)) + evo.set(e1, f2, 81) assert(f2_set_count == 1) - assert(evo.set(e1, f2, 82)) + evo.set(e1, f2, 82) assert(f2_set_count == 2) - assert(evo.set(e2, f2, 81)) + evo.set(e2, f2, 81) assert(f2_set_count == 3) - assert(evo.set(e2, f2, 82)) + evo.set(e2, f2, 82) assert(f2_set_count == 4) assert(evo.get(e1, f2) == 82 and evo.get(e2, f2) == 82) - assert(evo.remove(e1, f1, f1, f2, f2) and evo.remove(e1, f1, f1, f2, f2)) + evo.remove(e1, f1, f1, f2, f2) + evo.remove(e1, f1, f1, f2, f2) assert(f2_remove_count == 1) - assert(evo.destroy(e2) and evo.destroy(e2)) + evo.destroy(e2) + evo.destroy(e2) assert(f2_remove_count == 2) end @@ -2605,26 +2613,26 @@ do do local e = evo.id() - assert(evo.multi_set(e, {})) - assert(evo.multi_set(e, {}, {})) - assert(evo.multi_set(e, {}, { 41 })) + evo.multi_set(e, {}) + evo.multi_set(e, {}, {}) + evo.multi_set(e, {}, { 41 }) assert(evo.is_alive(e) and evo.is_empty(e)) - assert(evo.multi_set(e, { f1 })) + evo.multi_set(e, { f1 }) assert(evo.has(e, f1) and evo.get(e, f1) == true) - assert(evo.multi_set(e, { f2 }, { 42, 43 })) + evo.multi_set(e, { f2 }, { 42, 43 }) assert(evo.has(e, f1) and evo.get(e, f1) == true) assert(evo.has(e, f2) and evo.get(e, f2) == 42) end do local e = evo.id() - assert(evo.multi_set(e, { f1, f2 }, { 41 })) + evo.multi_set(e, { f1, f2 }, { 41 }) assert(evo.has(e, f1) and evo.get(e, f1) == 41) assert(evo.has(e, f2) and evo.get(e, f2) == true) - assert(evo.multi_set(e, { f1, f3 }, { 20, 43 })) + evo.multi_set(e, { f1, f3 }, { 20, 43 }) assert(evo.has(e, f1) and evo.get(e, f1) == 20) assert(evo.has(e, f2) and evo.get(e, f2) == true) assert(evo.has(e, f3) and evo.get(e, f3) == 43) @@ -2636,16 +2644,16 @@ do do local e1 = evo.id() - assert(evo.multi_set(e1, { f1, f2 }, { 41, 42 })) + evo.multi_set(e1, { f1, f2 }, { 41, 42 }) assert(evo.has(e1, f1) and evo.get(e1, f1) == 41) assert(evo.has(e1, f2) and evo.get(e1, f2) == 42) local e2 = evo.id() - assert(evo.multi_set(e2, { f1, f2 }, { 43, 44 })) + evo.multi_set(e2, { f1, f2 }, { 43, 44 }) assert(evo.has(e2, f1) and evo.get(e2, f1) == 43) assert(evo.has(e2, f2) and evo.get(e2, f2) == 44) - assert(evo.multi_set(e1, { f3 })) + evo.multi_set(e1, { f3 }) do local chunk, entities = evo.chunk(f1, f2) assert(entities and #entities == 1 and entities[1] == e2) @@ -2697,13 +2705,13 @@ do do local e = evo.id() - assert(evo.multi_set(e, { f1, f2 }, { 41, 42 })) + evo.multi_set(e, { f1, f2 }, { 41, 42 }) assert(last_set_entity == e and last_set_component == 42) end do local e = evo.id() - assert(evo.multi_set(e, { f1, f2, f3 }, { 41, 42, 43 })) + evo.multi_set(e, { f1, f2, f3 }, { 41, 42, 43 }) assert(last_set_entity == e and last_set_component == nil) end end @@ -2713,21 +2721,21 @@ do do local e = evo.id() - assert(evo.multi_set(e, {})) - assert(evo.multi_set(e, {}, {})) - assert(evo.multi_set(e, {}, { 41 })) + evo.multi_set(e, {}) + evo.multi_set(e, {}, {}) + evo.multi_set(e, {}, { 41 }) assert(evo.is_alive(e) and evo.is_empty(e)) - assert(evo.multi_set(e, { f1 }, { 21 })) - assert(evo.multi_set(e, { f1 }, { 41 })) + evo.multi_set(e, { f1 }, { 21 }) + evo.multi_set(e, { f1 }, { 41 }) assert(evo.has(e, f1) and evo.get(e, f1) == 41) assert(not evo.has(e, f2) and evo.get(e, f2) == nil) - assert(evo.multi_set(e, { f2 }, { 22 })) - assert(evo.multi_set(e, { f2 })) + evo.multi_set(e, { f2 }, { 22 }) + evo.multi_set(e, { f2 }) assert(evo.has(e, f1) and evo.get(e, f1) == 41) assert(evo.has(e, f2) and evo.get(e, f2) == true) - assert(evo.multi_set(e, { f2 }, { 42, 43 })) + evo.multi_set(e, { f2 }, { 42, 43 }) assert(evo.has(e, f1) and evo.get(e, f1) == 41) assert(evo.has(e, f2) and evo.get(e, f2) == 42) end @@ -2780,20 +2788,20 @@ do do local e = evo.id() - assert(evo.multi_set(e, { f1, f2 }, { 21, 22 })) + evo.multi_set(e, { f1, f2 }, { 21, 22 }) assert(last_set_entity == e and last_set_component == 22) - assert(evo.multi_set(e, { f1, f2 }, { 41, 42 })) + evo.multi_set(e, { f1, f2 }, { 41, 42 }) assert(last_set_entity == e and last_set_component == 42) end do local e = evo.id() - assert(evo.multi_set(e, { f1, f2, f3 }, { 21, 22, 23 })) + evo.multi_set(e, { f1, f2, f3 }, { 21, 22, 23 }) assert(last_set_entity == e and last_set_component == nil) last_set_entity, last_set_component = 0, 0 - assert(evo.multi_set(e, { f1, f2, f3 }, { 41, 42, 43 })) + evo.multi_set(e, { f1, f2, f3 }, { 41, 42, 43 }) assert(last_set_entity == e and last_set_component == nil) assert(evo.has(e, f1) and evo.get(e, f1) == 41) assert(evo.has(e, f2) and evo.get(e, f2) == 42) @@ -2808,25 +2816,25 @@ do do local e = evo.id() - assert(evo.multi_set(e, { f1, f2, f3 }, { 41, 42, 43 })) + evo.multi_set(e, { f1, f2, f3 }, { 41, 42, 43 }) assert(evo.has_all(e, f1, f2, f3)) - assert(evo.multi_remove(e, {})) - assert(evo.multi_remove(e, { f4 })) + evo.multi_remove(e, {}) + evo.multi_remove(e, { f4 }) assert(evo.has_all(e, f1, f2, f3)) - assert(evo.multi_remove(e, { f3 })) + evo.multi_remove(e, { f3 }) assert(evo.has(e, f1) and evo.has(e, f2) and not evo.has(e, f3)) assert(evo.get(e, f1) == 41 and evo.get(e, f2) == 42 and evo.get(e, f3) == nil) - assert(evo.multi_remove(e, { f1, f2, f4 })) + evo.multi_remove(e, { f1, f2, f4 }) assert(not evo.has_any(e, f1, f2, f3)) assert(evo.get(e, f1) == nil and evo.get(e, f2) == nil and evo.get(e, f3) == nil) end do local e = evo.id() - assert(evo.multi_set(e, { f1, f2, f3 }, { 41, 42, 43 })) + evo.multi_set(e, { f1, f2, f3 }, { 41, 42, 43 }) assert(evo.has_all(e, f1, f2, f3)) evo.defer() evo.multi_remove(e, { f1, f2 }) @@ -2864,14 +2872,14 @@ do do local e = evo.id() - assert(evo.multi_remove(e, { f1, f2 })) + evo.multi_remove(e, { f1, f2 }) assert(last_remove_entity == 0 and last_remove_component == 0) - assert(evo.multi_set(e, { f1, f2, f3 }, { 41, 42 })) + evo.multi_set(e, { f1, f2, f3 }, { 41, 42 }) assert(last_remove_entity == 0 and last_remove_component == 0) - assert(evo.multi_remove(e, { f1, f2 })) + evo.multi_remove(e, { f1, f2 }) assert(last_remove_entity == e and last_remove_component == 42) - assert(evo.multi_remove(e, { f3 })) + evo.multi_remove(e, { f3 }) assert(last_remove_entity == e and last_remove_component == nil) end end @@ -2881,10 +2889,10 @@ do do local e1, e2 = evo.id(2) - assert(evo.multi_set(e1, { f1, f2, f3 }, { 41, 42, 43 })) - assert(evo.multi_set(e2, { f1, f2, f3 }, { 44, 45, 46 })) + evo.multi_set(e1, { f1, f2, f3 }, { 41, 42, 43 }) + evo.multi_set(e2, { f1, f2, f3 }, { 44, 45, 46 }) - assert(evo.multi_remove(e1, { f1, f2 })) + evo.multi_remove(e1, { f1, f2 }) do local chunk, entities = evo.chunk(f1, f2, f3) @@ -2909,34 +2917,34 @@ do do local e = evo.id() - assert(evo.multi_set(e, {})) - assert(evo.multi_set(e, {}, {})) - assert(evo.multi_set(e, {}, { 41 })) + evo.multi_set(e, {}) + evo.multi_set(e, {}, {}) + evo.multi_set(e, {}, { 41 }) assert(evo.is_alive(e) and evo.is_empty(e)) - assert(evo.multi_set(e, { f1 })) + evo.multi_set(e, { f1 }) assert(evo.has(e, f1) and evo.get(e, f1) == true) - assert(evo.multi_set(e, { f1 })) + evo.multi_set(e, { f1 }) assert(evo.has(e, f1) and evo.get(e, f1) == true) - assert(evo.multi_set(e, { f1 }, { 41 })) + evo.multi_set(e, { f1 }, { 41 }) assert(evo.has(e, f1) and evo.get(e, f1) == 41) - assert(evo.multi_set(e, { f2 }, { 42 })) + evo.multi_set(e, { f2 }, { 42 }) assert(evo.has(e, f1) and evo.get(e, f1) == 41) assert(evo.has(e, f2) and evo.get(e, f2) == 42) - assert(evo.multi_set(e, { f2 })) + evo.multi_set(e, { f2 }) assert(evo.has(e, f1) and evo.get(e, f1) == 41) assert(evo.has(e, f2) and evo.get(e, f2) == true) - assert(evo.multi_set(e, { f2, f3 }, { 42 })) + evo.multi_set(e, { f2, f3 }, { 42 }) assert(evo.has(e, f1) and evo.get(e, f1) == 41) assert(evo.has(e, f2) and evo.get(e, f2) == 42) assert(evo.has(e, f3) and evo.get(e, f3) == 43) - assert(evo.multi_set(e, { f3, f4 }, { 33, 44 })) + evo.multi_set(e, { f3, f4 }, { 33, 44 }) assert(evo.has(e, f1) and evo.get(e, f1) == 41) assert(evo.has(e, f2) and evo.get(e, f2) == 42) assert(evo.has(e, f3) and evo.get(e, f3) == 33) @@ -3001,21 +3009,21 @@ do last_insert_entity, last_insert_component = 0, 0 local e = evo.id() - assert(evo.multi_set(e, { f1 })) + evo.multi_set(e, { f1 }) assert(last_assign_entity == 0 and last_assign_old_component == 0 and last_assign_new_component == 0) assert(last_insert_entity == e and last_insert_component == true) last_assign_entity, last_assign_old_component, last_assign_new_component = 0, 0, 0 last_insert_entity, last_insert_component = 0, 0 - assert(evo.multi_set(e, { f1 }, { 41 })) + evo.multi_set(e, { f1 }, { 41 }) assert(last_assign_entity == e and last_assign_old_component == true and last_assign_new_component == 41) assert(last_insert_entity == 0 and last_insert_component == 0) last_assign_entity, last_assign_old_component, last_assign_new_component = 0, 0, 0 last_insert_entity, last_insert_component = 0, 0 - assert(evo.multi_set(e, { f1, f2 }, { 11 })) + evo.multi_set(e, { f1, f2 }, { 11 }) assert(last_assign_entity == e and last_assign_old_component == 41 and last_assign_new_component == 11) assert(last_insert_entity == e and last_insert_component == 42) end @@ -3054,7 +3062,7 @@ do insert_entity_sum, insert_component_sum = 0, 0 local e = evo.id() - assert(evo.multi_set(e, { f1, f1 }, { 41, 42 })) + evo.multi_set(e, { f1, f1 }, { 41, 42 }) assert(assign_entity_sum == e and assign_component_sum == 42) assert(insert_entity_sum == e and insert_component_sum == 41) @@ -3065,7 +3073,7 @@ do insert_entity_sum, insert_component_sum = 0, 0 local e = evo.id() - assert(evo.multi_set(e, { f1, f1, f1 }, { 41, 42, 43 })) + evo.multi_set(e, { f1, f1, f1 }, { 41, 42, 43 }) assert(assign_entity_sum == e + e and assign_component_sum == 42 + 43) assert(insert_entity_sum == e and insert_component_sum == 41) @@ -3076,8 +3084,8 @@ do insert_entity_sum, insert_component_sum = 0, 0 local e = evo.id() - assert(evo.set(e, f1, 41)) - assert(evo.multi_set(e, { f1, f1 }, { 42, 43 })) + evo.set(e, f1, 41) + evo.multi_set(e, { f1, f1 }, { 42, 43 }) assert(assign_entity_sum == e + e and assign_component_sum == 42 + 43) assert(insert_entity_sum == e and insert_component_sum == 41) @@ -3088,7 +3096,7 @@ do insert_entity_sum, insert_component_sum = 0, 0 local e = evo.id() - assert(evo.multi_set(e, { f1, f1 }, { 41, 42 })) + evo.multi_set(e, { f1, f1 }, { 41, 42 }) assert(insert_entity_sum == e and insert_component_sum == 41) end @@ -3097,8 +3105,8 @@ do remove_entity_sum, remove_component_sum = 0, 0 local e = evo.id() - assert(evo.set(e, f1, 41)) - assert(evo.multi_remove(e, { f1, f1 })) + evo.set(e, f1, 41) + evo.multi_remove(e, { f1, f1 }) assert(remove_entity_sum == e and remove_component_sum == 41) end @@ -3657,43 +3665,38 @@ do do assert(evo.defer()) - local e, d = evo.spawn_with() + local e = evo.spawn_with() assert(evo.is_alive(e) and evo.is_empty(e)) - assert(d) assert(evo.commit()) assert(evo.is_alive(e) and evo.is_empty(e)) end do assert(evo.defer()) - local e, d = evo.spawn_with({}) + local e = evo.spawn_with({}) assert(evo.is_alive(e) and evo.is_empty(e)) - assert(d) assert(evo.commit()) assert(evo.is_alive(e) and evo.is_empty(e)) end do assert(evo.defer()) - local e1, d1 = evo.spawn_with({ f1 }) + local e1 = evo.spawn_with({ f1 }) assert(evo.is_alive(e1) and evo.is_empty(e1)) - assert(not d1) assert(evo.commit()) assert(evo.is_alive(e1) and not evo.is_empty(e1)) assert(evo.has(e1, f1) and evo.get(e1, f1) == true) assert(evo.defer()) - local e2, d2 = evo.spawn_with({ f1 }, {}) + local e2 = evo.spawn_with({ f1 }, {}) assert(evo.is_alive(e2) and evo.is_empty(e2)) - assert(not d2) assert(evo.commit()) assert(evo.is_alive(e2) and not evo.is_empty(e2)) assert(evo.has(e2, f1) and evo.get(e2, f1) == true) assert(evo.defer()) - local e3, d3 = evo.spawn_with({ f1 }, { 41 }) + local e3 = evo.spawn_with({ f1 }, { 41 }) assert(evo.is_alive(e3) and evo.is_empty(e3)) - assert(not d3) assert(evo.commit()) assert(evo.is_alive(e3) and not evo.is_empty(e3)) assert(evo.has(e3, f1) and evo.get(e3, f1) == 41) @@ -3701,54 +3704,48 @@ do do assert(evo.defer()) - local e1, d1 = evo.spawn_with({ f1, f2 }) + local e1 = evo.spawn_with({ f1, f2 }) assert(evo.is_alive(e1) and evo.is_empty(e1)) - assert(not d1) assert(evo.commit()) assert(evo.is_alive(e1) and not evo.is_empty(e1)) assert(evo.has(e1, f1) and evo.get(e1, f1) == true) assert(evo.has(e1, f2) and evo.get(e1, f2) == true) assert(evo.defer()) - local e2, d2 = evo.spawn_with({ f1, f2 }, {}) + local e2 = evo.spawn_with({ f1, f2 }, {}) assert(evo.is_alive(e2) and evo.is_empty(e2)) - assert(not d2) assert(evo.commit()) assert(evo.is_alive(e2) and not evo.is_empty(e2)) assert(evo.has(e2, f1) and evo.get(e2, f1) == true) assert(evo.has(e2, f2) and evo.get(e2, f2) == true) assert(evo.defer()) - local e3, d3 = evo.spawn_with({ f1, f2 }, { 41 }) + local e3 = evo.spawn_with({ f1, f2 }, { 41 }) assert(evo.is_alive(e3) and evo.is_empty(e3)) - assert(not d3) assert(evo.commit()) assert(evo.is_alive(e3) and not evo.is_empty(e3)) assert(evo.has(e3, f1) and evo.get(e3, f1) == 41) assert(evo.has(e3, f2) and evo.get(e3, f2) == true) assert(evo.defer()) - local e4, d4 = evo.spawn_with({ f1, f2 }, { nil, 42 }) + local e4 = evo.spawn_with({ f1, f2 }, { nil, 42 }) assert(evo.is_alive(e4) and evo.is_empty(e4)) - assert(not d4) assert(evo.commit()) assert(evo.is_alive(e4) and not evo.is_empty(e4)) assert(evo.has(e4, f1) and evo.get(e4, f1) == true) assert(evo.has(e4, f2) and evo.get(e4, f2) == 42) assert(evo.defer()) - local e5, d5 = evo.spawn_with({ f1, f2 }, { 41, 42 }) + local e5 = evo.spawn_with({ f1, f2 }, { 41, 42 }) assert(evo.is_alive(e5) and evo.is_empty(e5)) - assert(not d5) assert(evo.commit()) assert(evo.is_alive(e5) and not evo.is_empty(e5)) assert(evo.has(e5, f1) and evo.get(e5, f1) == 41) assert(evo.has(e5, f2) and evo.get(e5, f2) == 42) assert(evo.defer()) - local e6, d6 = evo.spawn_with({ f1, f2 }, { 41, 42, 43 }) + local e6 = evo.spawn_with({ f1, f2 }, { 41, 42, 43 }) assert(evo.is_alive(e6) and evo.is_empty(e6)) - assert(not d6) assert(evo.commit()) assert(evo.is_alive(e6) and not evo.is_empty(e6)) assert(evo.has(e6, f1) and evo.get(e6, f1) == 41) @@ -3757,18 +3754,16 @@ do do assert(evo.defer()) - local e1, d1 = evo.spawn_with({ f3, f4 }) + local e1 = evo.spawn_with({ f3, f4 }) assert(evo.is_alive(e1) and evo.is_empty(e1)) - assert(not d1) assert(evo.commit()) assert(evo.is_alive(e1) and not evo.is_empty(e1)) assert(evo.has(e1, f3) and evo.get(e1, f3) == 3) assert(evo.has(e1, f4) and evo.get(e1, f4) == nil) assert(evo.defer()) - local e2, d2 = evo.spawn_with({ f3, f4 }, { 33, 44 }) + local e2 = evo.spawn_with({ f3, f4 }, { 33, 44 }) assert(evo.is_alive(e2) and evo.is_empty(e2)) - assert(not d2) assert(evo.commit()) assert(evo.is_alive(e2) and not evo.is_empty(e2)) assert(evo.has(e2, f3) and evo.get(e2, f3) == 33) @@ -3786,14 +3781,14 @@ do do local q = evo.query():include(f1):build() - assert(evo.batch_multi_remove(q, {})) - assert(evo.batch_multi_remove(q, { f5 })) + evo.batch_multi_remove(q, {}) + evo.batch_multi_remove(q, { f5 }) end do local q = evo.query():include(f3):build() - assert(evo.batch_multi_remove(q, { f4 })) + evo.batch_multi_remove(q, { f4 }) assert(evo.has_all(e4, f1, f2, f3) and not evo.has(e4, f4)) assert(evo.get(e4, f1) == 41) assert(evo.get(e4, f2) == 42) @@ -3824,7 +3819,7 @@ do do local q = evo.query():include(f2):build() - assert(evo.batch_multi_remove(q, { f1 })) + evo.batch_multi_remove(q, { f1 }) assert(evo.has_all(e1, f1) and not evo.has_any(e1, f2, f3, f4)) assert(evo.has_all(e2, f2) and not evo.has_any(e2, f1, f3, f4)) assert(evo.has_all(e3, f2, f3) and not evo.has_any(e3, f1, f4)) @@ -3834,7 +3829,7 @@ do assert(next(evo.components(chunk, f1)) == nil) end - assert(evo.batch_multi_remove(q, { f2, f3 })) + evo.batch_multi_remove(q, { f2, f3 }) assert(evo.has_all(e1, f1) and not evo.has_any(e1, f2, f3, f4)) assert(not evo.has_any(e2, f1, f2, f3, f4)) assert(not evo.has_any(e3, f1, f2, f3, f4)) @@ -3867,7 +3862,7 @@ do local q = evo.query():include(f1):build() assert(evo.defer()) - assert(not evo.batch_multi_remove(q, { f1 })) + evo.batch_multi_remove(q, { f1 }) assert(evo.has(e1, f1)) assert(evo.commit()) assert(not evo.has(e1, f1)) @@ -3907,7 +3902,7 @@ do local q = evo.query():include(f1):build() - assert(evo.batch_multi_remove(q, { f1, f1 })) + evo.batch_multi_remove(q, { f1, f1 }) assert(last_remove_entity == e2 and last_remove_component == 21) assert(sum_removed_components == 11 + 21) end @@ -3919,7 +3914,7 @@ do local q = evo.query():include(f2):build() - assert(evo.batch_multi_remove(q, { f2 })) + evo.batch_multi_remove(q, { f2 }) assert(last_remove_entity == e2 and last_remove_component == nil) assert(sum_removed_components == 0) end @@ -3940,18 +3935,18 @@ do do local q = evo.query():include(f1):build() - assert(evo.batch_multi_set(q, {})) + evo.batch_multi_set(q, {}) end do local q = evo.query():include(f1, f5):build() - assert(evo.batch_multi_set(q, { f5 })) + evo.batch_multi_set(q, { f5 }) end do local q = evo.query():include(f3, f4):build() - assert(evo.batch_multi_set(q, { f4 }, { 54 })) + evo.batch_multi_set(q, { f4 }, { 54 }) assert(evo.get(e3, f3) == 33 and evo.get(e3, f4) == nil) assert(evo.get(e4, f3) == 43 and evo.get(e4, f4) == 54) end @@ -3959,13 +3954,13 @@ do do local q = evo.query():include(f2):build() - assert(evo.batch_multi_set(q, { f1 }, { 51, 52 })) + evo.batch_multi_set(q, { f1 }, { 51, 52 }) assert(evo.get(e1, f1) == 11 and evo.get(e1, f2) == nil and evo.get(e1, f3) == nil) assert(evo.get(e2, f1) == 51 and evo.get(e2, f2) == 22 and evo.get(e2, f3) == nil) assert(evo.get(e3, f1) == 51 and evo.get(e3, f2) == 32 and evo.get(e3, f3) == 33) assert(evo.get(e4, f1) == 51 and evo.get(e4, f2) == 42 and evo.get(e4, f3) == 43 and evo.get(e4, f4) == 54) - assert(evo.batch_multi_set(q, { f2, f3 }, { 52, 53 })) + evo.batch_multi_set(q, { f2, f3 }, { 52, 53 }) assert(evo.get(e1, f1) == 11 and evo.get(e1, f2) == nil and evo.get(e1, f3) == nil) assert(evo.get(e2, f1) == 51 and evo.get(e2, f2) == 52 and evo.get(e2, f3) == 53) assert(evo.get(e3, f1) == 51 and evo.get(e3, f2) == 52 and evo.get(e3, f3) == 53) @@ -3991,14 +3986,14 @@ do do local q = evo.query():include(f1):build() - assert(evo.batch_multi_set(q, {})) - assert(evo.batch_multi_set(q, { f5 })) + evo.batch_multi_set(q, {}) + evo.batch_multi_set(q, { f5 }) end do local q = evo.query():include(f3, f4):build() - assert(evo.batch_multi_set(q, { f4 }, { 54 })) + evo.batch_multi_set(q, { f4 }, { 54 }) assert(evo.get(e1, f1) == 11 and evo.get(e1, f2) == nil and evo.get(e1, f3) == nil) assert(evo.get(e2, f1) == 21 and evo.get(e2, f2) == 22 and evo.get(e2, f3) == nil) assert(evo.get(e3, f1) == 31 and evo.get(e3, f2) == 32 and evo.get(e3, f3) == nil) @@ -4008,13 +4003,13 @@ do do local q = evo.query():include(f2):build() - assert(evo.batch_multi_set(q, { f1 }, { 51, 52 })) + evo.batch_multi_set(q, { f1 }, { 51, 52 }) assert(evo.get(e1, f1) == 11 and evo.get(e1, f2) == nil and evo.get(e1, f3) == nil) assert(evo.get(e2, f1) == 51 and evo.get(e2, f2) == 22 and evo.get(e2, f3) == nil) assert(evo.get(e3, f1) == 51 and evo.get(e3, f2) == 32 and evo.get(e3, f3) == nil) assert(evo.get(e4, f1) == 51 and evo.get(e4, f2) == 42 and evo.get(e4, f3) == nil and evo.get(e4, f4) == 54) - assert(evo.batch_multi_set(q, { f2, f3 }, { 52, 53 })) + evo.batch_multi_set(q, { f2, f3 }, { 52, 53 }) assert(evo.get(e1, f1) == 11 and evo.get(e1, f2) == nil and evo.get(e1, f3) == nil) assert(evo.get(e2, f1) == 51 and evo.get(e2, f2) == 52 and evo.get(e2, f3) == nil) assert(evo.get(e3, f1) == 51 and evo.get(e3, f2) == 52 and evo.get(e3, f3) == nil) @@ -4024,13 +4019,13 @@ do do local q = evo.query():include(f1):build() - assert(evo.batch_multi_set(q, { f1 })) + evo.batch_multi_set(q, { f1 }) assert(evo.get(e1, f1) == true and evo.get(e1, f2) == nil and evo.get(e1, f3) == nil) assert(evo.get(e2, f1) == true and evo.get(e2, f2) == 52 and evo.get(e2, f3) == nil) assert(evo.get(e3, f1) == true and evo.get(e3, f2) == 52 and evo.get(e3, f3) == nil) assert(evo.get(e4, f1) == true and evo.get(e4, f2) == 52 and evo.get(e4, f3) == nil and evo.get(e4, f4) == 54) - assert(evo.batch_multi_set(q, { f2 })) + evo.batch_multi_set(q, { f2 }) assert(evo.get(e1, f1) == true and evo.get(e1, f2) == 41 and evo.get(e1, f3) == nil) assert(evo.get(e2, f1) == true and evo.get(e2, f2) == 41 and evo.get(e2, f3) == nil) assert(evo.get(e3, f1) == true and evo.get(e3, f2) == 41 and evo.get(e3, f3) == nil) @@ -4085,7 +4080,7 @@ do last_assign_new_component = 0 last_assign_old_component = 0 - assert(evo.batch_multi_set(q, { f2 }, {})) + evo.batch_multi_set(q, { f2 }, {}) assert(sum_entity == e3) assert(last_assign_entity == e3) assert(last_assign_new_component == 42) @@ -4100,7 +4095,7 @@ do last_assign_new_component = 0 last_assign_old_component = 0 - assert(evo.batch_multi_set(q, { f1 }, { 51 })) + evo.batch_multi_set(q, { f1 }, { 51 }) assert(sum_entity == e1 + e2 + e3) assert(last_assign_entity == e3) assert(last_assign_new_component == 51) @@ -4115,7 +4110,7 @@ do last_assign_new_component = 0 last_assign_old_component = 0 - assert(evo.batch_multi_set(q, { f1, f1 }, { 61, 61 })) + evo.batch_multi_set(q, { f1, f1 }, { 61, 61 }) assert(sum_entity == e1 + e2 + e3 + e1 + e2 + e3) assert(last_assign_entity == e3) assert(last_assign_new_component == 61) @@ -4130,7 +4125,7 @@ do last_assign_new_component = 0 last_assign_old_component = 0 - assert(evo.batch_multi_set(q, { f3 }, { 63 })) + evo.batch_multi_set(q, { f3 }, { 63 }) assert(sum_entity == e3) assert(last_assign_entity == e3) assert(last_assign_new_component == nil) @@ -4149,13 +4144,13 @@ do do local q = evo.query():include(f1):build() - assert(evo.batch_multi_set(q, {})) + evo.batch_multi_set(q, {}) end do local q = evo.query():include(f3):exclude(f4):build() - assert(evo.batch_multi_set(q, { f4 })) + evo.batch_multi_set(q, { f4 }) assert(evo.get(e3, f1) == 31 and evo.get(e3, f2) == 32 and evo.get(e3, f3) == 33 and evo.get(e3, f4) == true) assert(evo.get(e4, f1) == 41 and evo.get(e4, f2) == 42 and evo.get(e4, f3) == 43 and evo.get(e4, f4) == 44) @@ -4178,7 +4173,7 @@ do do local q = evo.query():include(f1):exclude(f3, f4):build() - assert(evo.batch_multi_set(q, { f3, f4 }, { 53, 54 })) + evo.batch_multi_set(q, { f3, f4 }, { 53, 54 }) assert(evo.get(e1, f1) == 11 and evo.get(e1, f2) == nil and evo.get(e1, f3) == 53 and evo.get(e1, f4) == 54) assert(evo.get(e2, f1) == 21 and evo.get(e2, f2) == 22 and evo.get(e2, f3) == 53 and evo.get(e2, f4) == 54) assert(evo.get(e3, f1) == 31 and evo.get(e3, f2) == 32 and evo.get(e3, f3) == 33 and evo.get(e3, f4) == true) @@ -4234,12 +4229,12 @@ do do local q = evo.query():include(f1):build() - assert(evo.batch_multi_set(q, {})) + evo.batch_multi_set(q, {}) end do local q = evo.query():include(f1):exclude(f2):build() - assert(evo.batch_multi_set(q, { f2 })) + evo.batch_multi_set(q, { f2 }) assert(evo.get(e1, f1) == 11 and evo.get(e1, f2) == 41 and evo.get(e1, f3) == nil) assert(evo.get(e2, f1) == 21 and evo.get(e2, f2) == 22 and evo.get(e2, f3) == nil) @@ -4304,7 +4299,7 @@ do last_insert_entity = 0 last_insert_component = 0 - assert(evo.batch_multi_set(q, { f2 })) + evo.batch_multi_set(q, { f2 }) assert(sum_entity == e1) assert(last_insert_entity == e1) assert(last_insert_component == 42) @@ -4323,7 +4318,7 @@ do last_insert_entity = 0 last_insert_component = 0 - assert(evo.batch_multi_set(q, { f3 })) + evo.batch_multi_set(q, { f3 }) assert(sum_entity == e1 + e2) assert(last_insert_entity == e1) assert(last_insert_component == nil) @@ -4342,7 +4337,7 @@ do last_insert_entity = 0 last_insert_component = 0 - assert(evo.batch_multi_set(q, { f3, f4, f5, f5 }, { 53, 54, 55, 65 })) + evo.batch_multi_set(q, { f3, f4, f5, f5 }, { 53, 54, 55, 65 }) assert(sum_entity == e1 + e2 + e3 + e1 + e2 + e3) assert(last_insert_entity == e1) assert(last_insert_component == 55) @@ -4378,12 +4373,12 @@ do do local q = evo.query():include(f1):build() - assert(evo.batch_multi_set(q, {})) + evo.batch_multi_set(q, {}) end do local q = evo.query():include(f3):exclude(f4):build() - assert(evo.batch_multi_set(q, { f3 })) + evo.batch_multi_set(q, { f3 }) assert(evo.get(e1a, f1) == 11 and evo.get(e1a, f2) == nil and evo.get(e1a, f3) == nil) assert(evo.get(e1b, f1) == 11 and evo.get(e1b, f2) == nil and evo.get(e1b, f3) == nil) assert(evo.get(e2a, f1) == 21 and evo.get(e2a, f2) == 22 and evo.get(e2a, f3) == nil) @@ -4396,7 +4391,7 @@ do do local q = evo.query():include(f3):exclude(f4):build() - assert(evo.batch_multi_set(q, { f3 }, { 43, 44 })) + evo.batch_multi_set(q, { f3 }, { 43, 44 }) assert(evo.get(e1a, f1) == 11 and evo.get(e1a, f2) == nil and evo.get(e1a, f3) == nil) assert(evo.get(e1b, f1) == 11 and evo.get(e1b, f2) == nil and evo.get(e1b, f3) == nil) assert(evo.get(e2a, f1) == 21 and evo.get(e2a, f2) == 22 and evo.get(e2a, f3) == nil) @@ -4409,7 +4404,7 @@ do do local q = evo.query():include(f2):exclude(f3, f4):build() - assert(evo.batch_multi_set(q, { f2 }, {})) + evo.batch_multi_set(q, { f2 }, {}) assert(evo.get(e1a, f1) == 11 and evo.get(e1a, f2) == nil and evo.get(e1a, f3) == nil) assert(evo.get(e1b, f1) == 11 and evo.get(e1b, f2) == nil and evo.get(e1b, f3) == nil) assert(evo.get(e2a, f1) == 21 and evo.get(e2a, f2) == 52 and evo.get(e2a, f3) == nil) @@ -4422,7 +4417,7 @@ do do local q = evo.query():include(f2):exclude(f3, f4):build() - assert(evo.batch_multi_set(q, { f2 }, { 62, 63 })) + evo.batch_multi_set(q, { f2 }, { 62, 63 }) assert(evo.get(e1a, f1) == 11 and evo.get(e1a, f2) == nil and evo.get(e1a, f3) == nil) assert(evo.get(e1b, f1) == 11 and evo.get(e1b, f2) == nil and evo.get(e1b, f3) == nil) assert(evo.get(e2a, f1) == 21 and evo.get(e2a, f2) == 62 and evo.get(e2a, f3) == nil) @@ -4473,7 +4468,7 @@ do do local q = evo.query():include(f1):build() - assert(evo.batch_multi_set(q, {})) + evo.batch_multi_set(q, {}) end do @@ -4483,7 +4478,7 @@ do last_assign_entity = 0 last_assign_component = 0 - assert(evo.batch_multi_set(q, { f2 })) + evo.batch_multi_set(q, { f2 }) assert(sum_entity == e2a + e2b) assert(last_assign_entity == e2b) assert(last_assign_component == 52) @@ -4493,7 +4488,7 @@ do last_assign_entity = 0 last_assign_component = 0 - assert(evo.batch_multi_set(q, { f2, f2 })) + evo.batch_multi_set(q, { f2, f2 }) assert(sum_entity == e2a + e2b + e2a + e2b) assert(last_assign_entity == e2b) assert(last_assign_component == 52) @@ -4507,7 +4502,7 @@ do last_assign_entity = 0 last_assign_component = 0 - assert(evo.batch_multi_set(q, { f2 }, { 62, 63 })) + evo.batch_multi_set(q, { f2 }, { 62, 63 }) assert(sum_entity == e2a + e2b) assert(last_assign_entity == e2b) assert(last_assign_component == 62) @@ -4517,7 +4512,7 @@ do last_assign_entity = 0 last_assign_component = 0 - assert(evo.batch_multi_set(q, { f2, f2 }, { 62, 63 })) + evo.batch_multi_set(q, { f2, f2 }, { 62, 63 }) assert(sum_entity == e2a + e2b + e2a + e2b) assert(last_assign_entity == e2b) assert(last_assign_component == 63) @@ -4531,7 +4526,7 @@ do last_assign_entity = 0 last_assign_component = 0 - assert(evo.batch_multi_set(q, { f3 })) + evo.batch_multi_set(q, { f3 }) assert(sum_entity == e3a + e3b) assert(last_assign_entity == e3b) assert(last_assign_component == true) @@ -4545,7 +4540,7 @@ do last_assign_entity = 0 last_assign_component = 0 - assert(evo.batch_multi_set(q, { f4 }, { 62, 63 })) + evo.batch_multi_set(q, { f4 }, { 62, 63 }) assert(sum_entity == e4a + e4b) assert(last_assign_entity == e4b) assert(last_assign_component == nil) @@ -4556,7 +4551,7 @@ do last_assign_entity = 0 last_assign_component = 0 - assert(evo.batch_multi_set(q, { f4, f4 }, { 62, 63 })) + evo.batch_multi_set(q, { f4, f4 }, { 62, 63 }) assert(sum_entity == e4a + e4b + e4a + e4b) assert(last_assign_entity == e4b) assert(last_assign_component == nil) @@ -4581,7 +4576,7 @@ do do local q = evo.query():include(f2):exclude(f3, f4):build() - assert(evo.batch_multi_set(q, { f3 })) + evo.batch_multi_set(q, { f3 }) assert(evo.get(e2a, f1) == 21 and evo.get(e2a, f2) == 22 and evo.get(e2a, f3) == true) assert(evo.get(e2b, f1) == 21 and evo.get(e2b, f2) == 22 and evo.get(e2b, f3) == true) assert(evo.get(e3a, f1) == 31 and evo.get(e3a, f2) == 32 and evo.get(e3a, f3) == 33) @@ -4602,7 +4597,7 @@ do do local q = evo.query():include(f2, f3):exclude(f4):build() - assert(evo.batch_multi_set(q, { f2, f3, f4, f4 }, { 62, 63, 64, 65 })) + evo.batch_multi_set(q, { f2, f3, f4, f4 }, { 62, 63, 64, 65 }) assert(evo.has_all(e2a, f2, f3, f4) and evo.has_all(e2b, f2, f3, f4)) assert(evo.get(e2a, f1) == 21 and evo.get(e2a, f2) == 62 and evo.get(e2a, f3) == 63 and evo.get(e2a, f4) == nil) assert(evo.get(e2b, f1) == 21 and evo.get(e2b, f2) == 62 and evo.get(e2b, f3) == 63 and evo.get(e2b, f4) == nil) @@ -4612,7 +4607,7 @@ do do local q = evo.query():include(f1):exclude(f2, f3, f4):build() - assert(evo.batch_multi_set(q, { f2, f1 }, { nil, 71 })) + evo.batch_multi_set(q, { f2, f1 }, { nil, 71 }) assert(evo.get(e1a, f1) == 71 and evo.get(e1a, f2) == 52) assert(evo.get(e1b, f1) == 71 and evo.get(e1b, f2) == 52) do @@ -4678,7 +4673,7 @@ do last_assign_entity, last_assign_component = 0, 0 last_insert_entity, last_insert_component = 0, 0 - assert(evo.batch_multi_set(q, { f1, f2 }, { 51 })) + evo.batch_multi_set(q, { f1, f2 }, { 51 }) assert(sum_entity == e0a + e0b + e0a + e0b) assert(last_assign_entity == 0) assert(last_assign_component == 0) @@ -4691,7 +4686,7 @@ do last_assign_entity, last_assign_component = 0, 0 last_insert_entity, last_insert_component = 0, 0 - assert(evo.batch_multi_set(q, { f1, f3, f2 }, { 61 })) + evo.batch_multi_set(q, { f1, f3, f2 }, { 61 }) assert(sum_entity == e0a + e0b + e0a + e0b + e0a + e0b) assert(last_assign_entity == e0b) assert(last_assign_component == 52) @@ -4708,7 +4703,7 @@ do last_assign_entity, last_assign_component = 0, 0 last_insert_entity, last_insert_component = 0, 0 - assert(evo.batch_multi_set(q, { f3, f4 }, { 53, 54 })) + evo.batch_multi_set(q, { f3, f4 }, { 53, 54 }) assert(sum_entity == e3a + e3b + e3a + e3b) assert(last_assign_entity == e3b) assert(last_assign_component == 53) @@ -4730,11 +4725,11 @@ do do do local q = evo.query():include(f1):exclude(f2):build() - assert(not evo.batch_multi_set(q, { f2 }, { 42 })) + evo.batch_multi_set(q, { f2 }, { 42 }) end do local q = evo.query():include(f1, f3):build() - assert(not evo.batch_multi_set(q, { f3 }, { 43 })) + evo.batch_multi_set(q, { f3 }, { 43 }) end do local q = evo.query():include(f1):build() @@ -4754,7 +4749,7 @@ do do local q = evo.query():include(f2):build() do - assert(not evo.batch_multi_set(q, { f3, f4 }, { 53, 54 })) + evo.batch_multi_set(q, { f3, f4 }, { 53, 54 }) end end assert(evo.commit()) @@ -4816,27 +4811,27 @@ do local q = evo.query():include(f1):build() - assert(evo.set(q, evo.EXCLUDES, f2)) - assert(evo.batch_set(q, f2)) + evo.set(q, evo.EXCLUDES, f2) + evo.batch_set(q, f2) assert(evo.get(e1a, f1) == 11 and evo.get(e1a, f2) == 42) assert(evo.get(e1b, f1) == 11 and evo.get(e1b, f2) == 42) assert(evo.get(e2a, f1) == 11 and evo.get(e2a, f2) == 22) assert(evo.get(e2b, f1) == 11 and evo.get(e2b, f2) == 22) - assert(evo.set(q, evo.EXCLUDES)) - assert(evo.batch_set(q, f2)) + evo.set(q, evo.EXCLUDES) + evo.batch_set(q, f2) assert(evo.get(e1a, f1) == 11 and evo.get(e1a, f2) == 42) assert(evo.get(e1b, f1) == 11 and evo.get(e1b, f2) == 42) assert(evo.get(e2a, f1) == 11 and evo.get(e2a, f2) == 42) assert(evo.get(e2b, f1) == 11 and evo.get(e2b, f2) == 42) - assert(evo.batch_set(q, f1)) + evo.batch_set(q, f1) assert(evo.get(e1a, f1) == true and evo.get(e1a, f2) == 42) assert(evo.get(e1b, f1) == true and evo.get(e1b, f2) == 42) assert(evo.get(e2a, f1) == true and evo.get(e2a, f2) == 42) assert(evo.get(e2b, f1) == true and evo.get(e2b, f2) == 42) - assert(evo.batch_set(q, f3)) + evo.batch_set(q, f3) assert(evo.get(e1a, f1) == true and evo.get(e1a, f2) == 42 and evo.get(e1a, f3) == true) assert(evo.get(e1b, f1) == true and evo.get(e1b, f2) == 42 and evo.get(e1b, f3) == true) assert(evo.get(e2a, f1) == true and evo.get(e2a, f2) == 42 and evo.get(e2a, f3) == true) @@ -4890,7 +4885,7 @@ do last_insert_entity = 0 last_insert_component = 0 - assert(evo.batch_set(q, f2)) + evo.batch_set(q, f2) assert(evo.get(e1a, f1) == 11 and evo.get(e1a, f2) == 42) assert(evo.get(e1b, f1) == 11 and evo.get(e1b, f2) == 42) assert(evo.get(e2a, f1) == 11 and evo.get(e2a, f2) == 22) @@ -4908,7 +4903,7 @@ do last_insert_entity = 0 last_insert_component = 0 - assert(evo.batch_set(q, f3)) + evo.batch_set(q, f3) assert(evo.has_all(e1a, f1, f2, f3) and evo.has_all(e1b, f1, f2, f3)) assert(evo.has_all(e2a, f1, f2, f3) and evo.has_all(e2b, f1, f2, f3)) assert(evo.get(e1a, f1) == 11 and evo.get(e1a, f2) == 42 and evo.get(e1a, f3) == nil) @@ -4924,7 +4919,7 @@ do last_insert_entity = 0 last_insert_component = 0 - assert(evo.batch_set(q, f4)) + evo.batch_set(q, f4) assert(evo.has_all(e1a, f1, f2, f3, f4) and evo.has_all(e1b, f1, f2, f3, f4)) assert(evo.has_all(e2a, f1, f2, f3, f4) and evo.has_all(e2b, f1, f2, f3, f4)) assert(evo.get(e1a, f1) == 11 and evo.get(e1a, f2) == 42 and evo.get(e1a, f3) == nil and evo.get(e1a, f4) == true) @@ -4940,7 +4935,7 @@ do last_assign_entity = 0 last_assign_component = 0 - assert(evo.batch_set(q, f2)) + evo.batch_set(q, f2) assert(sum_entity == e1a + e1b + e2a + e2b) assert(last_assign_entity == e1b) assert(last_assign_component == 42) @@ -4949,7 +4944,7 @@ do last_assign_entity = 0 last_assign_component = 0 - assert(evo.batch_set(q, f1)) + evo.batch_set(q, f1) assert(sum_entity == e1a + e1b + e2a + e2b) assert(last_assign_entity == e1b) assert(last_assign_component == true) @@ -5026,33 +5021,36 @@ do local e = evo.id() - assert(evo.set(e, f1, 11)) - assert(evo.set(e, f1)) + evo.set(e, f1, 11) + evo.set(e, f1) - assert(evo.set(e, f2, 22)) - assert(evo.set(e, f2)) + evo.set(e, f2, 22) + evo.set(e, f2) assert(evo.get(e, f1) == true and evo.get(e, f2) == true) - assert(evo.destroy(e)) + evo.destroy(e) assert(not evo.has(e, f1) and not evo.has(e, f2)) assert(not evo.has_all(e, f1, f2) and not evo.has_any(e, f1, f2)) - assert(evo.remove(e, f1)) - assert(evo.clear(e)) + evo.remove(e, f1) + evo.clear(e) - assert(evo.multi_remove(e, { f1 })) + evo.multi_remove(e, { f1 }) end do local f1 = evo.id(2) local e = evo.id() - assert(evo.clear(e) and evo.clear(e)) - assert(evo.set(e, f1, 11)) - assert(evo.clear(e) and evo.clear(e)) - assert(evo.destroy(e) and evo.destroy(e)) - assert(evo.clear(e)) + evo.clear(e) + evo.clear(e) + evo.set(e, f1, 11) + evo.clear(e) + evo.clear(e) + evo.destroy(e) + evo.destroy(e) + evo.clear(e) end do @@ -5086,27 +5084,27 @@ do do local e = evo.id() - assert(evo.multi_set(e, { f1, f2, f3 }, { 11, 22 })) + evo.multi_set(e, { f1, f2, f3 }, { 11, 22 }) assert(evo.has_all(e, f1, f2, f3)) assert(evo.get(e, f1) == 11 and evo.get(e, f2) == 22 and evo.get(e, f3) == nil) assert(last_assign_f2_new_component == 0 and last_assign_f2_old_component == 0) - assert(evo.multi_set(e, { f1, f2, f3, f3 }, {})) + evo.multi_set(e, { f1, f2, f3, f3 }, {}) assert(evo.has_all(e, f1, f2, f3)) assert(evo.get(e, f1) == true and evo.get(e, f2) == 42 and evo.get(e, f3) == nil) assert(last_assign_f2_new_component == 42 and last_assign_f2_old_component == 22) assert(last_insert_f3_new_component == nil) - assert(evo.multi_set(e, { f1, f2, f3 }, { 11, 22, 33 })) + evo.multi_set(e, { f1, f2, f3 }, { 11, 22, 33 }) assert(evo.get(e, f1) == 11 and evo.get(e, f2) == 22 and evo.get(e, f3) == nil) - assert(evo.multi_set(e, { f1, f2, f3 }, {})) + evo.multi_set(e, { f1, f2, f3 }, {}) assert(evo.get(e, f1) == true and evo.get(e, f2) == 42 and evo.get(e, f3) == nil) end do local e = evo.id() - assert(evo.multi_set(e, { f1, f1, f3, f3 }, {})) + evo.multi_set(e, { f1, f1, f3, f3 }, {}) assert(evo.has_all(e, f1, f3)) assert(evo.get(e, f1) == true and evo.get(e, f3) == nil) end @@ -5114,7 +5112,7 @@ do do local e = evo.id() - assert(evo.multi_set(e, { f1, f1, f2, f2, f3 }, {})) + evo.multi_set(e, { f1, f1, f2, f2, f3 }, {}) assert(evo.has_all(e, f1, f2, f3)) assert(evo.get(e, f1) == true and evo.get(e, f2) == 42 and evo.get(e, f3) == nil) end @@ -5124,7 +5122,7 @@ do last_insert_f2_new_component = 0 - assert(evo.multi_set(e, { f2, f2 }, { nil, 22 })) + evo.multi_set(e, { f2, f2 }, { nil, 22 }) assert(evo.get(e, f2) == 22) assert(last_insert_f2_new_component == 42) end @@ -5138,11 +5136,11 @@ do do local e = evo.id() - assert(evo.multi_set(e, { f1, f2 })) + evo.multi_set(e, { f1, f2 }) assert(evo.get(e, f1) == 41 and evo.get(e, f2) == true) - assert(evo.multi_set(e, { f1, f2 }, { 11, 22 })) + evo.multi_set(e, { f1, f2 }, { 11, 22 }) assert(evo.get(e, f1) == 11 and evo.get(e, f2) == 22) - assert(evo.multi_set(e, { f1, f2 })) + evo.multi_set(e, { f1, f2 }) assert(evo.get(e, f1) == 41 and evo.get(e, f2) == true) end end @@ -5731,8 +5729,7 @@ do assert(evo.get(e, f1) == c) do - local s, d = evo.set(e, f2, c) - assert(s and not d) + evo.set(e, f2, c) end end) @@ -5742,8 +5739,7 @@ do assert(evo.get(e, f1) == c) do - local s, d = evo.set(e, f2, c) - assert(s and not d) + evo.set(e, f2, c) end end) @@ -5754,8 +5750,7 @@ do assert(evo.get(e, f1) == nil) do - local s, d = evo.remove(e, f2) - assert(s and not d) + evo.remove(e, f2) end end) end @@ -5790,17 +5785,17 @@ do local e = evo.id() - assert(evo.set(e, f1, 41)) + evo.set(e, f1, 41) assert(evo.get(e, f1) == 41) assert(evo.get(e, f2) == 41) assert(assign_count == 0 and insert_count == 2 and remove_count == 0) - assert(evo.set(e, f1, 51)) + evo.set(e, f1, 51) assert(evo.get(e, f1) == 51) assert(evo.get(e, f2) == 51) assert(assign_count == 2 and insert_count == 2 and remove_count == 0) - assert(evo.remove(e, f1)) + evo.remove(e, f1) assert(evo.get(e, f1) == nil) assert(evo.get(e, f2) == nil) assert(assign_count == 2 and insert_count == 2 and remove_count == 2) @@ -5813,17 +5808,17 @@ do local e = evo.id() - assert(evo.multi_set(e, { f1 }, { 41 })) + evo.multi_set(e, { f1 }, { 41 }) assert(evo.get(e, f1) == 41) assert(evo.get(e, f2) == 41) assert(assign_count == 0 and insert_count == 2 and remove_count == 0) - assert(evo.multi_set(e, { f1 }, { 51 })) + evo.multi_set(e, { f1 }, { 51 }) assert(evo.get(e, f1) == 51) assert(evo.get(e, f2) == 51) assert(assign_count == 2 and insert_count == 2 and remove_count == 0) - assert(evo.multi_remove(e, { f1 })) + evo.multi_remove(e, { f1 }) assert(evo.get(e, f1) == nil) assert(evo.get(e, f2) == nil) assert(assign_count == 2 and insert_count == 2 and remove_count == 2) @@ -5836,17 +5831,17 @@ do local e = evo.id() - assert(evo.set(e, f1, 41)) + evo.set(e, f1, 41) assert(evo.get(e, f1) == 41) assert(evo.get(e, f2) == 41) assert(assign_count == 0 and insert_count == 2 and remove_count == 0) - assert(evo.set(e, f1, 51)) + evo.set(e, f1, 51) assert(evo.get(e, f1) == 51) assert(evo.get(e, f2) == 51) assert(assign_count == 2 and insert_count == 2 and remove_count == 0) - assert(evo.remove(e, f1)) + evo.remove(e, f1) assert(evo.get(e, f1) == nil) assert(evo.get(e, f2) == nil) assert(assign_count == 2 and insert_count == 2 and remove_count == 2) @@ -5859,17 +5854,17 @@ do local e = evo.id() - assert(evo.multi_set(e, { f1 }, { 41 })) + evo.multi_set(e, { f1 }, { 41 }) assert(evo.get(e, f1) == 41) assert(evo.get(e, f2) == 41) assert(assign_count == 0 and insert_count == 2 and remove_count == 0) - assert(evo.multi_set(e, { f1 }, { 51 })) + evo.multi_set(e, { f1 }, { 51 }) assert(evo.get(e, f1) == 51) assert(evo.get(e, f2) == 51) assert(assign_count == 2 and insert_count == 2 and remove_count == 0) - assert(evo.multi_remove(e, { f1 })) + evo.multi_remove(e, { f1 }) assert(evo.get(e, f1) == nil) assert(evo.get(e, f2) == nil) assert(assign_count == 2 and insert_count == 2 and remove_count == 2) @@ -5882,12 +5877,12 @@ do local e = evo.id() - assert(evo.set(e, f1, 51)) + evo.set(e, f1, 51) assert(evo.get(e, f1) == 51) assert(evo.get(e, f2) == 51) assert(assign_count == 0 and insert_count == 2 and remove_count == 0) - assert(evo.clear(e)) + evo.clear(e) assert(assign_count == 0 and insert_count == 2 and remove_count == 2) end @@ -5898,12 +5893,12 @@ do local e = evo.id() - assert(evo.set(e, f1, 51)) + evo.set(e, f1, 51) assert(evo.get(e, f1) == 51) assert(evo.get(e, f2) == 51) assert(assign_count == 0 and insert_count == 2 and remove_count == 0) - assert(evo.destroy(e)) + evo.destroy(e) assert(assign_count == 0 and insert_count == 2 and remove_count == 2) end end @@ -5969,7 +5964,7 @@ do remove_count = 0 local e = evo.id() - assert(evo.multi_set(e, { f1, f2 }, { 41, 42 })) + evo.multi_set(e, { f1, f2 }, { 41, 42 }) assert(assign_count == 0 and insert_count == 2 and remove_count == 0) end @@ -5980,7 +5975,7 @@ do remove_count = 0 local e = evo.id() - assert(evo.multi_set(e, { f1, f2 }, { 41, 42 })) + evo.multi_set(e, { f1, f2 }, { 41, 42 }) assert(assign_count == 0 and insert_count == 2 and remove_count == 0) end @@ -5991,9 +5986,9 @@ do remove_count = 0 local e = evo.id() - assert(evo.multi_set(e, { f1, f2 }, { 41, 42 })) - assert(evo.multi_set(e, { f1, f2 }, { 51, 52 })) - assert(evo.multi_remove(e, { f1, f2 })) + evo.multi_set(e, { f1, f2 }, { 41, 42 }) + evo.multi_set(e, { f1, f2 }, { 51, 52 }) + evo.multi_remove(e, { f1, f2 }) assert(assign_count == 2 and insert_count == 2 and remove_count == 2) end @@ -6004,9 +5999,9 @@ do remove_count = 0 local e = evo.id() - assert(evo.multi_set(e, { f1, f2 }, { 41, 42 })) - assert(evo.multi_set(e, { f1, f2 }, { 51, 52 })) - assert(evo.clear(e)) + evo.multi_set(e, { f1, f2 }, { 41, 42 }) + evo.multi_set(e, { f1, f2 }, { 51, 52 }) + evo.clear(e) assert(assign_count == 2 and insert_count == 2 and remove_count == 2) end @@ -6017,9 +6012,9 @@ do remove_count = 0 local e = evo.id() - assert(evo.multi_set(e, { f1, f2 }, { 41, 42 })) - assert(evo.multi_set(e, { f1, f2 }, { 51, 52 })) - assert(evo.destroy(e)) + evo.multi_set(e, { f1, f2 }, { 41, 42 }) + evo.multi_set(e, { f1, f2 }, { 51, 52 }) + evo.destroy(e) assert(assign_count == 2 and insert_count == 2 and remove_count == 2) end @@ -6065,28 +6060,30 @@ do insert_count = 0 remove_count = 0 - assert(evo.set(e1, f0) and evo.set(e2, f0)) + evo.set(e1, f0) + evo.set(e2, f0) - assert(evo.batch_set(q0, f1, 41)) + evo.batch_set(q0, f1, 41) assert(assign_count == 0 and insert_count == 2 and remove_count == 0) - assert(evo.batch_set(q0, f1, 51)) + evo.batch_set(q0, f1, 51) assert(assign_count == 2 and insert_count == 2 and remove_count == 0) - assert(evo.batch_remove(q0, f1)) + evo.batch_remove(q0, f1) assert(assign_count == 2 and insert_count == 2 and remove_count == 2) - assert(evo.batch_set(q0, f1, 51)) + evo.batch_set(q0, f1, 51) assert(assign_count == 2 and insert_count == 4 and remove_count == 2) - assert(evo.batch_clear(q0)) + evo.batch_clear(q0) assert(assign_count == 2 and insert_count == 4 and remove_count == 4) - assert(evo.set(e1, f0) and evo.set(e2, f0)) - assert(evo.batch_set(q0, f1, 51)) + evo.set(e1, f0) + evo.set(e2, f0) + evo.batch_set(q0, f1, 51) assert(assign_count == 2 and insert_count == 6 and remove_count == 4) - assert(evo.batch_destroy(q0)) + evo.batch_destroy(q0) assert(assign_count == 2 and insert_count == 6 and remove_count == 6) end end @@ -6172,24 +6169,25 @@ do insert_count = 0 remove_count = 0 - assert(evo.set(e1, f0) and evo.set(e2, f0)) + evo.set(e1, f0) + evo.set(e2, f0) - assert(evo.batch_multi_set(q0, { f1, f2 }, { 41, 42 })) + evo.batch_multi_set(q0, { f1, f2 }, { 41, 42 }) assert(assign_count == 0 and insert_count == 4 and remove_count == 0) - assert(evo.batch_multi_set(q0, { f1, f2 }, { 51, 52 })) + evo.batch_multi_set(q0, { f1, f2 }, { 51, 52 }) assert(assign_count == 4 and insert_count == 4 and remove_count == 0) - assert(evo.batch_multi_remove(q0, { f1, f2 })) + evo.batch_multi_remove(q0, { f1, f2 }) assert(assign_count == 4 and insert_count == 4 and remove_count == 4) - assert(evo.batch_multi_set(q0, { f1, f2 }, { 41, 42 })) + evo.batch_multi_set(q0, { f1, f2 }, { 41, 42 }) assert(assign_count == 4 and insert_count == 8 and remove_count == 4) - assert(evo.batch_multi_set(q0, { f1, f2 }, { 51, 52 })) + evo.batch_multi_set(q0, { f1, f2 }, { 51, 52 }) assert(assign_count == 8 and insert_count == 8 and remove_count == 4) - assert(evo.batch_multi_remove(q0, { f1, f2 })) + evo.batch_multi_remove(q0, { f1, f2 }) assert(assign_count == 8 and insert_count == 8 and remove_count == 8) end end @@ -6204,19 +6202,19 @@ do end) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) local e12 = evo.id() - assert(evo.set(e12, f1, 41)) - assert(evo.set(e12, f2, 42)) + evo.set(e12, f1, 41) + evo.set(e12, f2, 42) local e35 = evo.id() - assert(evo.set(e35, f3, 43)) - assert(evo.set(e35, f5, 45)) + evo.set(e35, f3, 43) + evo.set(e35, f5, 45) local e34 = evo.id() - assert(evo.set(e34, f3, 43)) - assert(evo.set(e34, f4, 44)) + evo.set(e34, f3, 43) + evo.set(e34, f4, 44) evo.set(f1, evo.ON_ASSIGN, function() assign_count = assign_count + 1 @@ -6228,16 +6226,16 @@ do assert(assign_count == 0) - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) assert(assign_count == 1) - assert(evo.set(e12, f1, 42)) + evo.set(e12, f1, 42) assert(assign_count == 2) - assert(evo.set(e34, f3, 43)) + evo.set(e34, f3, 43) assert(assign_count == 3) - assert(evo.set(e35, f3, 43)) + evo.set(e35, f3, 43) assert(assign_count == 4) end @@ -6250,20 +6248,25 @@ do evo.set(f3, evo.ON_SET, function() set_count = set_count + 1 end) local e13 = evo.id() - assert(evo.set(e13, f1, 41) and evo.set(e13, f3, 43)) + evo.set(e13, f1, 41) + evo.set(e13, f3, 43) assert(set_count == 2) local e123 = evo.id() - assert(evo.set(e123, f1, 41) and evo.set(e123, f2, 42) and evo.set(e123, f3, 43)) + evo.set(e123, f1, 41) + evo.set(e123, f2, 42) + evo.set(e123, f3, 43) assert(set_count == 5) - assert(evo.set(e123, f1, 41) and evo.set(e123, f2, 42) and evo.set(e123, f3, 43)) + evo.set(e123, f1, 41) + evo.set(e123, f2, 42) + evo.set(e123, f3, 43) assert(set_count == 8) do set_count = 0 - assert(evo.remove(f1, evo.ON_SET)) + evo.remove(f1, evo.ON_SET) evo.set(e13, f1, 41) assert(set_count == 0) @@ -6281,7 +6284,7 @@ do do set_count = 0 - assert(evo.remove(f2, evo.ON_SET)) + evo.remove(f2, evo.ON_SET) evo.set(e13, f1, 41) assert(set_count == 0) @@ -6301,14 +6304,14 @@ do local f1, f2 = evo.id(2) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) - assert(evo.set(e1, f2, 42)) + evo.set(e1, f1, 41) + evo.set(e1, f2, 42) evo.set(f1, evo.DEFAULT, 51) evo.set(f2, evo.CONSTRUCT, function() return 52 end) - assert(evo.set(e1, f1)) - assert(evo.set(e1, f2)) + evo.set(e1, f1) + evo.set(e1, f2) assert(evo.get(e1, f1) == 51) assert(evo.get(e1, f2) == 52) @@ -6318,39 +6321,39 @@ do local f1, f2 = evo.id(2) local e1 = evo.id() - assert(evo.set(e1, f1, 41)) + evo.set(e1, f1, 41) local e2 = evo.id() - assert(evo.set(e2, f1, 41)) - assert(evo.set(e2, f2, 42)) + evo.set(e2, f1, 41) + evo.set(e2, f2, 42) assert(evo.get(e1, f1) == 41) assert(evo.get(e2, f1) == 41) assert(evo.get(e2, f2) == 42) - assert(evo.set(f1, evo.TAG)) + evo.set(f1, evo.TAG) assert(evo.get(e1, f1) == nil) assert(evo.get(e2, f1) == nil) assert(evo.get(e2, f2) == 42) - assert(evo.remove(f1, evo.TAG)) + evo.remove(f1, evo.TAG) assert(evo.get(e1, f1) == true) assert(evo.get(e2, f1) == true) assert(evo.get(e2, f2) == 42) - assert(evo.set(f2, evo.TAG)) + evo.set(f2, evo.TAG) assert(evo.get(e1, f1) == true) assert(evo.get(e2, f1) == true) assert(evo.get(e2, f2) == nil) - assert(evo.set(f2, evo.DEFAULT, 42)) - assert(evo.remove(f2, evo.TAG)) + evo.set(f2, evo.DEFAULT, 42) + evo.remove(f2, evo.TAG) assert(evo.get(e1, f1) == true) assert(evo.get(e2, f1) == true) assert(evo.get(e2, f2) == 42) - assert(evo.set(f1, evo.DEFAULT, 81)) - assert(evo.set(f2, evo.DEFAULT, 82)) + evo.set(f1, evo.DEFAULT, 81) + evo.set(f2, evo.DEFAULT, 82) assert(evo.get(e1, f1) == true) assert(evo.get(e2, f1) == true) assert(evo.get(e2, f2) == 42) @@ -6371,7 +6374,7 @@ do assert(evo.components(c1, f1)[1] == 1 and evo.components(c1, f1)[2] == 11) end - assert(evo.batch_set(q1, f2, 2)) + evo.batch_set(q1, f2, 2) do local c1, c1_es = evo.chunk(f1) @@ -6394,8 +6397,8 @@ do assert(evo.components(c1, f1)[1] == 111 and evo.components(c1, f1)[2] == 1111) end - assert(evo.set(q1, evo.EXCLUDES, f2)) - assert(evo.batch_set(q1, f2, 22)) + evo.set(q1, evo.EXCLUDES, f2) + evo.batch_set(q1, f2, 22) do local c1, c1_es = evo.chunk(f1) @@ -6429,7 +6432,7 @@ do assert(evo.components(c123, f3)[1] == 3 and evo.components(c123, f3)[2] == 33) end - assert(evo.batch_remove(q1, f2)) + evo.batch_remove(q1, f2) do local c13, c13_es = evo.chunk(f3, f1) @@ -6450,7 +6453,7 @@ do assert(evo.components(c3, f3)[1] == 3 and evo.components(c3, f3)[2] == 33) end - assert(evo.batch_remove(q1, f1)) + evo.batch_remove(q1, f1) do local c3, c3_es = evo.chunk(f3) @@ -6614,8 +6617,10 @@ do assert(c12_es[1] == e12a and c12_es[2] == e12b) end - assert(evo.remove(e12a, f1) and evo.remove(e12b, f1)) - assert(evo.set(e1a, f2, 7) and evo.set(e1b, f2, 8)) + evo.remove(e12a, f1) + evo.remove(e12b, f1) + evo.set(e1a, f2, 7) + evo.set(e1b, f2, 8) do local c1_es, c1_ec = evo.entities(c1) @@ -6634,8 +6639,8 @@ end do local f1, f2 = evo.id(2) local c1 = assert(evo.chunk(f1)) - assert(evo.set(f2, f1)) - assert(evo.destroy(f1)) + evo.set(f2, f1) + evo.destroy(f1) do assert(not evo.is_alive(f1)) assert(evo.is_alive(f2)) @@ -6649,8 +6654,8 @@ end do local f1 = evo.id() local c1 = assert(evo.chunk(f1)) - assert(evo.set(f1, f1)) - assert(evo.destroy(f1)) + evo.set(f1, f1) + evo.destroy(f1) do local c1_es, c1_ec = evo.entities(c1) assert(c1_es and #c1_es == 0 and c1_ec == 0) @@ -6662,10 +6667,10 @@ do local c1 = assert(evo.chunk(f1)) local c2 = assert(evo.chunk(f2)) local c12 = assert(evo.chunk(f1, f2)) - assert(evo.set(f1, evo.DESTROY_POLICY, evo.DESTROY_POLICY_REMOVE_FRAGMENT)) - assert(evo.set(f1, f1)) - assert(evo.set(f2, f1)) - assert(evo.set(f2, f2)) + evo.set(f1, evo.DESTROY_POLICY, evo.DESTROY_POLICY_REMOVE_FRAGMENT) + evo.set(f1, f1) + evo.set(f2, f1) + evo.set(f2, f2) do local c1_es, c1_ec = evo.entities(c1) assert(c1_es and #c1_es == 0 and c1_ec == 0) @@ -6677,7 +6682,7 @@ do assert(c12_es and #c12_es == 1 and c12_ec == 1) assert(c12_es[1] == f2) end - assert(evo.destroy(f1)) + evo.destroy(f1) do local c1_es, c1_ec = evo.entities(c1) assert(c1_es and #c1_es == 0 and c1_ec == 0) @@ -6696,10 +6701,10 @@ do local c1 = assert(evo.chunk(f1)) local c2 = assert(evo.chunk(f2)) local c12 = assert(evo.chunk(f1, f2)) - assert(evo.set(f1, evo.DESTROY_POLICY, evo.DESTROY_POLICY_DESTROY_ENTITY)) - assert(evo.set(f1, f1)) - assert(evo.set(f2, f1)) - assert(evo.set(f2, f2)) + evo.set(f1, evo.DESTROY_POLICY, evo.DESTROY_POLICY_DESTROY_ENTITY) + evo.set(f1, f1) + evo.set(f2, f1) + evo.set(f2, f2) do local c1_es, c1_ec = evo.entities(c1) assert(c1_es and #c1_es == 0 and c1_ec == 0) @@ -6711,7 +6716,7 @@ do assert(c12_es and #c12_es == 1 and c12_ec == 1) assert(c12_es[1] == f2) end - assert(evo.destroy(f1)) + evo.destroy(f1) do local c1_es, c1_ec = evo.entities(c1) assert(c1_es and #c1_es == 0 and c1_ec == 0) @@ -6728,8 +6733,8 @@ do local f1, f2, f3 = evo.id(3) local c1 = assert(evo.chunk(f1)) local c2 = assert(evo.chunk(f2)) - assert(evo.set(f2, f1)) - assert(evo.set(f3, f2)) + evo.set(f2, f1) + evo.set(f3, f2) do local c1_es, c1_ec = evo.entities(c1) assert(c1_es and #c1_es == 1 and c1_ec == 1) @@ -6739,7 +6744,7 @@ do assert(c2_es and #c2_es == 1 and c2_ec == 1) assert(c2_es[1] == f3) end - assert(evo.destroy(f1)) + evo.destroy(f1) do local c1_es, c1_ec = evo.entities(c1) assert(c1_es and #c1_es == 0 and c1_ec == 0) @@ -6754,9 +6759,9 @@ do local f1, f2, f3 = evo.id(3) local c1 = assert(evo.chunk(f1)) local c2 = assert(evo.chunk(f2)) - assert(evo.set(f1, evo.DESTROY_POLICY, evo.DESTROY_POLICY_REMOVE_FRAGMENT)) - assert(evo.set(f2, f1)) - assert(evo.set(f3, f2)) + evo.set(f1, evo.DESTROY_POLICY, evo.DESTROY_POLICY_REMOVE_FRAGMENT) + evo.set(f2, f1) + evo.set(f3, f2) do local c1_es, c1_ec = evo.entities(c1) assert(c1_es and #c1_es == 1 and c1_ec == 1) @@ -6766,7 +6771,7 @@ do assert(c2_es and #c2_es == 1 and c2_ec == 1) assert(c2_es[1] == f3) end - assert(evo.destroy(f1)) + evo.destroy(f1) do local c1_es, c1_ec = evo.entities(c1) assert(c1_es and #c1_es == 0 and c1_ec == 0) @@ -6781,9 +6786,9 @@ do local f1, f2, f3 = evo.id(3) local c1 = assert(evo.chunk(f1)) local c2 = assert(evo.chunk(f2)) - assert(evo.set(f1, evo.DESTROY_POLICY, evo.DESTROY_POLICY_DESTROY_ENTITY)) - assert(evo.set(f2, f1)) - assert(evo.set(f3, f2)) + evo.set(f1, evo.DESTROY_POLICY, evo.DESTROY_POLICY_DESTROY_ENTITY) + evo.set(f2, f1) + evo.set(f3, f2) do local c1_es, c1_ec = evo.entities(c1) assert(c1_es and #c1_es == 1 and c1_ec == 1) @@ -6793,7 +6798,7 @@ do assert(c2_es and #c2_es == 1 and c2_ec == 1) assert(c2_es[1] == f3) end - assert(evo.destroy(f1)) + evo.destroy(f1) do local c1_es, c1_ec = evo.entities(c1) assert(c1_es and #c1_es == 0 and c1_ec == 0) @@ -6805,10 +6810,10 @@ end do local f1, f2, f3, f4, ft = evo.id(5) - assert(evo.set(f1, ft)) - assert(evo.set(f2, ft)) - assert(evo.set(f3, ft)) - assert(evo.set(f3, evo.DESTROY_POLICY, evo.DESTROY_POLICY_DESTROY_ENTITY)) + evo.set(f1, ft) + evo.set(f2, ft) + evo.set(f3, ft) + evo.set(f3, evo.DESTROY_POLICY, evo.DESTROY_POLICY_DESTROY_ENTITY) local qt = evo.query():include(ft):build() local c4 = assert(evo.chunk(f4)) @@ -6822,7 +6827,7 @@ do local e234 = evo.entity():set(f2, 5):set(f3, 6):set(f4, 7):build() local e124 = evo.entity():set(f1, 8):set(f2, 6):set(f4, 9):build() - assert(evo.batch_destroy(qt)) + evo.batch_destroy(qt) do local c4_es, c4_ec = evo.entities(c4) @@ -6843,20 +6848,20 @@ end do local f1 = evo.id() - assert(evo.set(f1, evo.DESTROY_POLICY, evo.DESTROY_POLICY_DESTROY_ENTITY)) - assert(evo.set(f1, f1, f1)) + evo.set(f1, evo.DESTROY_POLICY, evo.DESTROY_POLICY_DESTROY_ENTITY) + evo.set(f1, f1, f1) local remove_count = 0 - assert(evo.set(f1, evo.ON_REMOVE, function(e, f, c) + evo.set(f1, evo.ON_REMOVE, function(e, f, c) assert(e == f1) assert(f == f1) assert(c == f1) remove_count = remove_count + 1 - end)) + end) local c1 = assert(evo.chunk(f1)) - assert(evo.destroy(f1)) + evo.destroy(f1) do assert(not evo.is_alive(f1)) @@ -6869,20 +6874,20 @@ end do local f1 = evo.id() - assert(evo.set(f1, evo.DESTROY_POLICY, evo.DESTROY_POLICY_REMOVE_FRAGMENT)) - assert(evo.set(f1, f1, f1)) + evo.set(f1, evo.DESTROY_POLICY, evo.DESTROY_POLICY_REMOVE_FRAGMENT) + evo.set(f1, f1, f1) local remove_count = 0 - assert(evo.set(f1, evo.ON_REMOVE, function(e, f, c) + evo.set(f1, evo.ON_REMOVE, function(e, f, c) assert(e == f1) assert(f == f1) assert(c == f1) remove_count = remove_count + 1 - end)) + end) local c1 = assert(evo.chunk(f1)) - assert(evo.destroy(f1)) + evo.destroy(f1) do assert(not evo.is_alive(f1)) @@ -6896,9 +6901,9 @@ end do local f1, f2, f3 = evo.id(3) - assert(evo.set(f1, evo.NAME, 'f1')) - assert(evo.set(f2, evo.NAME, 'f2')) - assert(evo.set(f3, evo.NAME, 'f3')) + evo.set(f1, evo.NAME, 'f1') + evo.set(f2, evo.NAME, 'f2') + evo.set(f3, evo.NAME, 'f3') local c1 = evo.chunk(f1) local c12 = evo.chunk(f1, f2) @@ -6914,7 +6919,7 @@ do local e123a = evo.entity():set(f1, 7):set(f2, 8):set(f3, 9):build() local e123b = evo.entity():set(f1, 10):set(f2, 11):set(f3, 12):build() - assert(evo.destroy(f2)) + evo.destroy(f2) do assert(c1 and c12 and c13 and c123) @@ -6953,7 +6958,7 @@ do evo.set(f1, f1) evo.set(f2, f1) evo.set(f1, evo.DESTROY_POLICY, evo.DESTROY_POLICY_DESTROY_ENTITY) - assert(evo.destroy(f1)) + evo.destroy(f1) assert(not evo.is_alive(f1)) assert(not evo.is_alive(f2)) end @@ -6963,7 +6968,7 @@ do evo.set(f1, f1) evo.set(f2, f1) evo.set(f1, evo.DESTROY_POLICY, evo.DESTROY_POLICY_REMOVE_FRAGMENT) - assert(evo.destroy(f1)) + evo.destroy(f1) assert(not evo.is_alive(f1)) assert(evo.is_alive(f2) and evo.is_empty(f2)) end @@ -6982,7 +6987,7 @@ do local e2b = evo.entity():set(f2, 6):build() local e_e2a_e2b = evo.entity():set(e2a, 55):set(e2b, 66):build() - assert(evo.destroy(f1)) + evo.destroy(f1) do assert(not evo.is_alive(e12a) and not evo.is_alive(e12b)) @@ -7027,7 +7032,7 @@ do local e2b = evo.entity():set(f2, 6):build() local e_e2a_e2b = evo.entity():set(e2a, 55):set(e2b, 66):build() - assert(evo.destroy(f1)) + evo.destroy(f1) do assert(evo.is_alive(e12a) and evo.is_alive(e12b)) @@ -7160,7 +7165,7 @@ do assert(matched_entity_count > 0) end - assert(evo.set(qe12, evo.EXCLUDES)) + evo.set(qe12, evo.EXCLUDES) do local matched_chunk_count = 0 @@ -7177,7 +7182,7 @@ do assert(matched_entity_count > 0) end - assert(evo.set(qe12, evo.INCLUDES, f1, f2)) + evo.set(qe12, evo.INCLUDES, f1, f2) do local iter, state = evo.execute(qe12) @@ -7192,8 +7197,8 @@ end do local f1, f2 = evo.id(2) - assert(evo.set(f1, evo.NAME, 'f1')) - assert(evo.set(f2, evo.NAME, 'f2')) + evo.set(f1, evo.NAME, 'f1') + evo.set(f2, evo.NAME, 'f2') local old_c1 = assert(evo.chunk(f1)) local old_c12 = assert(evo.chunk(f1, f2)) @@ -7226,8 +7231,8 @@ do assert(new_c12_es[1] == e12) end - assert(evo.destroy(e1)) - assert(evo.destroy(e12)) + evo.destroy(e1) + evo.destroy(e12) evo.collect_garbage() @@ -7250,7 +7255,7 @@ do assert(evo.defer()) - assert(not evo.collect_garbage()) + evo.collect_garbage() assert(evo.is_alive(old_c1)) assert(old_c1 == evo.chunk(f1)) @@ -7266,10 +7271,10 @@ do local f1 = evo.id() local e1, e2 = evo.id(2) - assert(evo.set(e1, f1, f1)) - assert(evo.set(e2, f1, f1)) + evo.set(e1, f1, f1) + evo.set(e2, f1, f1) - assert(evo.clear(e1, e2)) + evo.clear(e1, e2) assert(evo.is_alive(e1) and evo.is_empty(e1)) assert(evo.is_alive(e2) and evo.is_empty(e2)) @@ -7279,13 +7284,13 @@ do local f1 = evo.id() local e1, e2, e3, e4, e5 = evo.id(5) - assert(evo.set(e1, f1, f1)) - assert(evo.set(e2, f1, f1)) - assert(evo.set(e3, f1, f1)) - assert(evo.set(e4, f1, f1)) - assert(evo.set(e5, f1, f1)) + evo.set(e1, f1, f1) + evo.set(e2, f1, f1) + evo.set(e3, f1, f1) + evo.set(e4, f1, f1) + evo.set(e5, f1, f1) - assert(evo.clear(e1, e2, e3, e4, e5)) + evo.clear(e1, e2, e3, e4, e5) assert(evo.is_alive(e1) and evo.is_empty(e1)) assert(evo.is_alive(e2) and evo.is_empty(e2)) @@ -7300,13 +7305,13 @@ do local f1 = evo.id() local e1, e2, e3 = evo.id(3) - assert(evo.set(e1, f1, f1)) - assert(evo.set(e2, f1, f1)) - assert(evo.set(e3, f1, f1)) + evo.set(e1, f1, f1) + evo.set(e2, f1, f1) + evo.set(e3, f1, f1) assert(evo.defer()) do - assert(not evo.clear(e1, e2, e3)) + evo.clear(e1, e2, e3) assert(evo.is_alive(e1) and not evo.is_empty(e1)) assert(evo.is_alive(e2) and not evo.is_empty(e2)) assert(evo.is_alive(e3) and not evo.is_empty(e3)) @@ -7322,15 +7327,15 @@ do local f1 = evo.id() local e1, e2, e3, e4, e5 = evo.id(5) - assert(evo.set(e1, f1, f1)) - assert(evo.set(e2, f1, f1)) - assert(evo.set(e3, f1, f1)) - assert(evo.set(e4, f1, f1)) - assert(evo.set(e5, f1, f1)) + evo.set(e1, f1, f1) + evo.set(e2, f1, f1) + evo.set(e3, f1, f1) + evo.set(e4, f1, f1) + evo.set(e5, f1, f1) assert(evo.defer()) do - assert(not evo.clear(e1, e2, e3, e4, e5)) + evo.clear(e1, e2, e3, e4, e5) assert(evo.is_alive(e1) and not evo.is_empty(e1)) assert(evo.is_alive(e2) and not evo.is_empty(e2)) assert(evo.is_alive(e3) and not evo.is_empty(e3)) @@ -7352,10 +7357,10 @@ do local f1 = evo.id() local e1, e2 = evo.id(2) - assert(evo.set(e1, f1, f1)) - assert(evo.set(e2, f1, f1)) + evo.set(e1, f1, f1) + evo.set(e2, f1, f1) - assert(evo.destroy(e1, e2)) + evo.destroy(e1, e2) assert(not evo.is_alive(e1) and evo.is_empty(e1)) assert(not evo.is_alive(e2) and evo.is_empty(e2)) @@ -7365,13 +7370,13 @@ do local f1 = evo.id() local e1, e2, e3, e4, e5 = evo.id(5) - assert(evo.set(e1, f1, f1)) - assert(evo.set(e2, f1, f1)) - assert(evo.set(e3, f1, f1)) - assert(evo.set(e4, f1, f1)) - assert(evo.set(e5, f1, f1)) + evo.set(e1, f1, f1) + evo.set(e2, f1, f1) + evo.set(e3, f1, f1) + evo.set(e4, f1, f1) + evo.set(e5, f1, f1) - assert(evo.destroy(e1, e2, e3, e4, e5)) + evo.destroy(e1, e2, e3, e4, e5) assert(not evo.is_alive(e1) and evo.is_empty(e1)) assert(not evo.is_alive(e2) and evo.is_empty(e2)) @@ -7386,13 +7391,13 @@ do local f1 = evo.id() local e1, e2, e3 = evo.id(3) - assert(evo.set(e1, f1, f1)) - assert(evo.set(e2, f1, f1)) - assert(evo.set(e3, f1, f1)) + evo.set(e1, f1, f1) + evo.set(e2, f1, f1) + evo.set(e3, f1, f1) assert(evo.defer()) do - assert(not evo.destroy(e1, e2, e3)) + evo.destroy(e1, e2, e3) assert(evo.is_alive(e1) and not evo.is_empty(e1)) assert(evo.is_alive(e2) and not evo.is_empty(e2)) assert(evo.is_alive(e3) and not evo.is_empty(e3)) @@ -7408,15 +7413,15 @@ do local f1 = evo.id() local e1, e2, e3, e4, e5 = evo.id(5) - assert(evo.set(e1, f1, f1)) - assert(evo.set(e2, f1, f1)) - assert(evo.set(e3, f1, f1)) - assert(evo.set(e4, f1, f1)) - assert(evo.set(e5, f1, f1)) + evo.set(e1, f1, f1) + evo.set(e2, f1, f1) + evo.set(e3, f1, f1) + evo.set(e4, f1, f1) + evo.set(e5, f1, f1) assert(evo.defer()) do - assert(not evo.destroy(e1, e2, e3, e4, e5)) + evo.destroy(e1, e2, e3, e4, e5) assert(evo.is_alive(e1) and not evo.is_empty(e1)) assert(evo.is_alive(e2) and not evo.is_empty(e2)) assert(evo.is_alive(e3) and not evo.is_empty(e3)) @@ -7436,9 +7441,9 @@ end do local f1 = evo.id() local e1, e2 = evo.id(2) - assert(evo.set(e1, f1, f1)) - assert(evo.set(e2, f1, f1)) - assert(evo.clear(e1, e2, e1, e1)) + evo.set(e1, f1, f1) + evo.set(e2, f1, f1) + evo.clear(e1, e2, e1, e1) assert(evo.is_alive(e1) and evo.is_empty(e1)) assert(evo.is_alive(e2) and evo.is_empty(e2)) end @@ -7446,9 +7451,9 @@ end do local f1 = evo.id() local e1, e2 = evo.id(2) - assert(evo.set(e1, f1, f1)) - assert(evo.set(e2, f1, f1)) - assert(evo.destroy(e1, e2, e1, e1)) + evo.set(e1, f1, f1) + evo.set(e2, f1, f1) + evo.destroy(e1, e2, e1, e1) assert(not evo.is_alive(e1) and evo.is_empty(e1)) assert(not evo.is_alive(e2) and evo.is_empty(e2)) end @@ -7457,19 +7462,19 @@ do local f1, f2 = evo.id(2) local q1, q2 = evo.id(2) - assert(evo.set(q1, evo.INCLUDES, f1)) - assert(evo.set(q2, evo.INCLUDES, f2)) + evo.set(q1, evo.INCLUDES, f1) + evo.set(q2, evo.INCLUDES, f2) local e1, e2 = evo.id(2) - assert(evo.set(e1, f1, f1)) - assert(evo.set(e2, f2, f2)) + evo.set(e1, f1, f1) + evo.set(e2, f2, f2) - assert(evo.batch_clear()) + evo.batch_clear() assert(evo.is_alive(e1) and not evo.is_empty(e1)) assert(evo.is_alive(e2) and not evo.is_empty(e2)) - assert(evo.batch_clear(q1, q2, q1, q1)) + evo.batch_clear(q1, q2, q1, q1) assert(evo.is_alive(e1) and evo.is_empty(e1)) assert(evo.is_alive(e2) and evo.is_empty(e2)) @@ -7479,16 +7484,16 @@ do local f1, f2 = evo.id(2) local q1, q2 = evo.id(2) - assert(evo.set(q1, evo.INCLUDES, f1)) - assert(evo.set(q2, evo.INCLUDES, f2)) + evo.set(q1, evo.INCLUDES, f1) + evo.set(q2, evo.INCLUDES, f2) local e1, e2 = evo.id(2) - assert(evo.set(e1, f1, f1)) - assert(evo.set(e2, f2, f2)) + evo.set(e1, f1, f1) + evo.set(e2, f2, f2) assert(evo.defer()) do - assert(not evo.batch_clear(q2, q1, q2, q2)) + evo.batch_clear(q2, q1, q2, q2) assert(evo.is_alive(e1) and not evo.is_empty(e1)) assert(evo.is_alive(e2) and not evo.is_empty(e2)) end @@ -7502,19 +7507,19 @@ do local f1, f2 = evo.id(2) local q1, q2 = evo.id(2) - assert(evo.set(q1, evo.INCLUDES, f1)) - assert(evo.set(q2, evo.INCLUDES, f2)) + evo.set(q1, evo.INCLUDES, f1) + evo.set(q2, evo.INCLUDES, f2) local e1, e2 = evo.id(2) - assert(evo.set(e1, f1, f1)) - assert(evo.set(e2, f2, f2)) + evo.set(e1, f1, f1) + evo.set(e2, f2, f2) - assert(evo.batch_destroy()) + evo.batch_destroy() assert(evo.is_alive(e1) and not evo.is_empty(e1)) assert(evo.is_alive(e2) and not evo.is_empty(e2)) - assert(evo.batch_destroy(q1, q2, q1, q1)) + evo.batch_destroy(q1, q2, q1, q1) assert(not evo.is_alive(e1) and evo.is_empty(e1)) assert(not evo.is_alive(e2) and evo.is_empty(e2)) @@ -7524,16 +7529,16 @@ do local f1, f2 = evo.id(2) local q1, q2 = evo.id(2) - assert(evo.set(q1, evo.INCLUDES, f1)) - assert(evo.set(q2, evo.INCLUDES, f2)) + evo.set(q1, evo.INCLUDES, f1) + evo.set(q2, evo.INCLUDES, f2) local e1, e2 = evo.id(2) - assert(evo.set(e1, f1, f1)) - assert(evo.set(e2, f2, f2)) + evo.set(e1, f1, f1) + evo.set(e2, f2, f2) assert(evo.defer()) do - assert(not evo.batch_destroy(q2, q1, q2, q2)) + evo.batch_destroy(q2, q1, q2, q2) assert(evo.is_alive(e1) and not evo.is_empty(e1)) assert(evo.is_alive(e2) and not evo.is_empty(e2)) end @@ -7562,7 +7567,7 @@ do assert(evo.is_alive_any(a1, a2, a3, a4, a5)) local d1, d2 = evo.id(2) - assert(evo.destroy(d1, d2)) + evo.destroy(d1, d2) assert(not evo.is_alive(d1)) assert(not evo.is_alive_all(d1)) @@ -7603,7 +7608,7 @@ do assert(evo.is_empty_any(e1, e2, e3, e4, e5)) local d1, d2 = evo.id(2) - assert(evo.destroy(d1, d2)) + evo.destroy(d1, d2) assert(evo.is_empty(d1)) assert(evo.is_empty_all(d1)) @@ -7625,7 +7630,8 @@ do assert(evo.is_empty_any(d1, e1, e2, d2, e3, d1)) local f1, f2 = evo.id(2) - assert(evo.set(f1, f1) and evo.set(f2, f2)) + evo.set(f1, f1) + evo.set(f2, f2) assert(not evo.is_empty(f1)) assert(not evo.is_empty_all(f1)) @@ -7714,10 +7720,10 @@ do local e1 = evo.spawn_at(c1) assert(evo.is_alive(c1) and not evo.is_empty(c1)) - assert(evo.destroy(e1)) + evo.destroy(e1) assert(evo.is_alive(c1) and evo.is_empty(c1)) - assert(evo.collect_garbage()) + evo.collect_garbage() assert(not evo.is_alive(c1) and evo.is_empty(c1)) end @@ -7765,7 +7771,7 @@ do assert(evo.is_empty_any(c1)) assert(evo.is_empty_any(c1, c12)) - assert(evo.remove(e12, f2)) + evo.remove(e12, f2) assert(evo.is_alive(c1)) assert(evo.is_alive(c12)) @@ -7785,7 +7791,7 @@ do assert(not evo.is_empty_any(c1)) assert(evo.is_empty_any(c1, c12)) - assert(evo.collect_garbage()) + evo.collect_garbage() assert(evo.is_alive(c1)) assert(not evo.is_alive(c12)) @@ -7805,7 +7811,7 @@ do assert(not evo.is_empty_any(c1)) assert(evo.is_empty_any(c1, c12)) - assert(evo.remove(e12, f1)) + evo.remove(e12, f1) assert(evo.is_alive(c1)) assert(not evo.is_alive(c12)) @@ -7825,7 +7831,7 @@ do assert(evo.is_empty_any(c1)) assert(evo.is_empty_any(c1, c12)) - assert(evo.collect_garbage()) + evo.collect_garbage() assert(not evo.is_alive(c1)) assert(not evo.is_alive(c12)) @@ -7870,7 +7876,7 @@ do assert(evo.has_any(c12, f1)) assert(evo.has_any(c12, f1, f2)) - assert(evo.collect_garbage()) + evo.collect_garbage() assert(not evo.is_alive_any(c1, c12)) assert(evo.has(c1, f1)) diff --git a/evolved.lua b/evolved.lua index c7547c8..899b3ad 100644 --- a/evolved.lua +++ b/evolved.lua @@ -4508,7 +4508,6 @@ end ---@param entity evolved.entity ---@param fragment evolved.fragment ---@param ... any component arguments ----@return boolean set_or_deferred __evolved_set = function(entity, fragment, ...) if __debug_mode then __debug_fns.validate_entity(entity) @@ -4517,7 +4516,7 @@ __evolved_set = function(entity, fragment, ...) if __defer_depth > 0 then __defer_set(entity, fragment, ...) - return false + return end local entity_index = entity % 0x100000 @@ -4531,7 +4530,7 @@ __evolved_set = function(entity, fragment, ...) local new_chunk = __chunk_with_fragment(old_chunk, fragment) if not new_chunk then - return true + return end __evolved_defer() @@ -4664,29 +4663,27 @@ __evolved_set = function(entity, fragment, ...) end __evolved_commit() - return true end ---@param entity evolved.entity ---@param ... evolved.fragment fragments ----@return boolean removed_or_deferred __evolved_remove = function(entity, ...) local fragment_count = __lua_select('#', ...) if fragment_count == 0 then - return true + return end local entity_index = entity % 0x100000 if __freelist_ids[entity_index] ~= entity then -- this entity is not alive, nothing to remove - return true + return end if __defer_depth > 0 then __defer_remove(entity, ...) - return false + return end local entity_chunks = __entity_chunks @@ -4698,7 +4695,7 @@ __evolved_remove = function(entity, ...) local new_chunk = __chunk_without_fragments(old_chunk, ...) if old_chunk == new_chunk then - return true + return end __evolved_defer() @@ -4772,21 +4769,19 @@ __evolved_remove = function(entity, ...) end __evolved_commit() - return true end ---@param ... evolved.entity entities ----@return boolean cleared_or_deferred __evolved_clear = function(...) local argument_count = __lua_select('#', ...) if argument_count == 0 then - return true + return end if __defer_depth > 0 then __defer_clear(...) - return false + return end __evolved_defer() @@ -4845,21 +4840,19 @@ __evolved_clear = function(...) end __evolved_commit() - return true end ---@param ... evolved.entity entities ----@return boolean destroyed_or_deferred __evolved_destroy = function(...) local argument_count = __lua_select('#', ...) if argument_count == 0 then - return true + return end if __defer_depth > 0 then __defer_destroy(...) - return false + return end __evolved_defer() @@ -4933,18 +4926,16 @@ __evolved_destroy = function(...) end __evolved_commit() - return true end ---@param entity evolved.entity ---@param fragments evolved.fragment[] ---@param components? evolved.component[] ----@return boolean set_or_deferred __evolved_multi_set = function(entity, fragments, components) local fragment_count = #fragments if fragment_count == 0 then - return true + return end if not components then @@ -4958,7 +4949,7 @@ __evolved_multi_set = function(entity, fragments, components) if __defer_depth > 0 then __defer_multi_set(entity, fragments, fragment_count, components, #components) - return false + return end local entity_index = entity % 0x100000 @@ -4972,7 +4963,7 @@ __evolved_multi_set = function(entity, fragments, components) local new_chunk = __chunk_with_fragment_list(old_chunk, fragments, fragment_count) if not new_chunk then - return true + return end __evolved_defer() @@ -5163,29 +5154,27 @@ __evolved_multi_set = function(entity, fragments, components) end __evolved_commit() - return true end ---@param entity evolved.entity ---@param fragments evolved.fragment[] ----@return boolean removed_or_deferred __evolved_multi_remove = function(entity, fragments) local fragment_count = #fragments if fragment_count == 0 then - return true + return end local entity_index = entity % 0x100000 if __freelist_ids[entity_index] ~= entity then -- this entity is not alive, nothing to remove - return true + return end if __defer_depth > 0 then __defer_multi_remove(entity, fragments, fragment_count) - return false + return end local entity_chunks = __entity_chunks @@ -5197,7 +5186,7 @@ __evolved_multi_remove = function(entity, fragments) local new_chunk = __chunk_without_fragment_list(old_chunk, fragments, fragment_count) if old_chunk == new_chunk then - return true + return end __evolved_defer() @@ -5270,13 +5259,11 @@ __evolved_multi_remove = function(entity, fragments) end __evolved_commit() - return true end ---@param query evolved.query ---@param fragment evolved.fragment ---@param ... any component arguments ----@return boolean set_or_deferred __evolved_batch_set = function(query, fragment, ...) if __debug_mode then __debug_fns.validate_query(query) @@ -5285,7 +5272,7 @@ __evolved_batch_set = function(query, fragment, ...) if __defer_depth > 0 then __defer_batch_set(query, fragment, ...) - return false + return end __evolved_defer() @@ -5309,29 +5296,27 @@ __evolved_batch_set = function(query, fragment, ...) end __evolved_commit() - return true end ---@param query evolved.query ---@param ... evolved.fragment fragments ----@return boolean removed_or_deferred __evolved_batch_remove = function(query, ...) local fragment_count = select('#', ...) if fragment_count == 0 then - return true + return end local query_index = query % 0x100000 if __freelist_ids[query_index] ~= query then -- this query is not alive, nothing to remove - return true + return end if __defer_depth > 0 then __defer_batch_remove(query, ...) - return false + return end __evolved_defer() @@ -5355,21 +5340,19 @@ __evolved_batch_remove = function(query, ...) end __evolved_commit() - return true end ---@param ... evolved.query queries ----@return boolean cleared_or_deferred __evolved_batch_clear = function(...) local argument_count = select('#', ...) if argument_count == 0 then - return true + return end if __defer_depth > 0 then __defer_batch_clear(...) - return false + return end __evolved_defer() @@ -5403,21 +5386,19 @@ __evolved_batch_clear = function(...) end __evolved_commit() - return true end ---@param ... evolved.query queries ----@return boolean destroyed_or_deferred __evolved_batch_destroy = function(...) local argument_count = select('#', ...) if argument_count == 0 then - return true + return end if __defer_depth > 0 then __defer_batch_destroy(...) - return false + return end __evolved_defer() @@ -5451,18 +5432,16 @@ __evolved_batch_destroy = function(...) end __evolved_commit() - return true end ---@param query evolved.query ---@param fragments evolved.fragment[] ---@param components? evolved.component[] ----@return boolean set_or_deferred __evolved_batch_multi_set = function(query, fragments, components) local fragment_count = #fragments if fragment_count == 0 then - return true + return end if not components then @@ -5476,7 +5455,7 @@ __evolved_batch_multi_set = function(query, fragments, components) if __defer_depth > 0 then __defer_batch_multi_set(query, fragments, fragment_count, components, #components) - return false + return end __evolved_defer() @@ -5500,29 +5479,27 @@ __evolved_batch_multi_set = function(query, fragments, components) end __evolved_commit() - return true end ---@param query evolved.query ---@param fragments evolved.fragment[] ----@return boolean removed_or_deferred __evolved_batch_multi_remove = function(query, fragments) local fragment_count = #fragments if fragment_count == 0 then - return true + return end local query_index = query % 0x100000 if __freelist_ids[query_index] ~= query then -- this query is not alive, nothing to remove - return true + return end if __defer_depth > 0 then __defer_batch_multi_remove(query, fragments, fragment_count) - return false + return end __evolved_defer() @@ -5546,7 +5523,6 @@ __evolved_batch_multi_remove = function(query, fragments) end __evolved_commit() - return true end --- @@ -5767,7 +5743,6 @@ end ---@param fragments? evolved.fragment[] ---@param components? evolved.component[] ---@return evolved.entity entity ----@return boolean spawned_or_deferred __evolved_spawn_at = function(chunk, fragments, components) if not fragments then fragments = __safe_tbls.__EMPTY_FRAGMENT_LIST @@ -5788,14 +5763,14 @@ __evolved_spawn_at = function(chunk, fragments, components) local entity = __acquire_id() if not chunk then - return entity, true + return entity end if __defer_depth > 0 then __defer_spawn_entity_at(entity, chunk, fragments, fragment_count, components, component_count) - return entity, false + return entity end __evolved_defer() @@ -5804,13 +5779,12 @@ __evolved_spawn_at = function(chunk, fragments, components) end __evolved_commit() - return entity, true + return entity end ---@param fragments? evolved.fragment[] ---@param components? evolved.component[] ---@return evolved.entity entity ----@return boolean spawned_or_deferred __evolved_spawn_with = function(fragments, components) if not fragments then fragments = __safe_tbls.__EMPTY_FRAGMENT_LIST @@ -5830,14 +5804,14 @@ __evolved_spawn_with = function(fragments, components) local entity, chunk = __acquire_id(), __chunk_fragment_list(fragments, fragment_count) if not chunk then - return entity, true + return entity end if __defer_depth > 0 then __defer_spawn_entity_with(entity, chunk, fragments, fragment_count, components, component_count) - return entity, false + return entity end __evolved_defer() @@ -5846,7 +5820,7 @@ __evolved_spawn_with = function(fragments, components) end __evolved_commit() - return entity, true + return entity end --- @@ -5860,12 +5834,10 @@ __evolved_debug_mode = function(yesno) __debug_mode = yesno end ----@return boolean is_collected ----@return boolean is_deferred __evolved_collect_garbage = function() if __defer_depth > 0 then __defer_call_hook(__evolved_collect_garbage) - return false, true + return end __evolved_defer() @@ -5922,7 +5894,6 @@ __evolved_collect_garbage = function() end __evolved_commit() - return true, false end --- @@ -6036,7 +6007,6 @@ function __builder_fns.entity_builder:set(fragment, ...) end ---@return evolved.entity entity ----@return boolean spawned_or_deferred function __builder_fns.entity_builder:build() local fragment_list = self.__fragment_list local component_list = self.__component_list @@ -6047,18 +6017,18 @@ function __builder_fns.entity_builder:build() self.__component_count = nil if component_count == 0 then - return __evolved_id(), false + return __evolved_id() end ---@cast fragment_list -? ---@cast component_list -? - local entity, spawned_or_deferred = __evolved_spawn_with(fragment_list, component_list) + local entity = __evolved_spawn_with(fragment_list, component_list) __release_table(__table_pool_tag.fragment_list, fragment_list) __release_table(__table_pool_tag.component_list, component_list) - return entity, spawned_or_deferred + return entity end --- @@ -6143,7 +6113,6 @@ function __builder_fns.fragment_builder:destroy_policy(destroy_policy) end ---@return evolved.fragment fragment ----@return boolean spawned_or_deferred function __builder_fns.fragment_builder:build() local tag = self.__tag local name = self.__name @@ -6233,12 +6202,12 @@ function __builder_fns.fragment_builder:build() component_list[component_count] = destroy_policy end - local spawned_or_deferred = __evolved_multi_set(fragment, fragment_list, component_list) + __evolved_multi_set(fragment, fragment_list, component_list) __release_table(__table_pool_tag.fragment_list, fragment_list) __release_table(__table_pool_tag.component_list, component_list) - return fragment, spawned_or_deferred + return fragment end --- @@ -6322,7 +6291,6 @@ function __builder_fns.query_builder:exclude(...) end ---@return evolved.query query ----@return boolean spawned_or_deferred function __builder_fns.query_builder:build() local name = self.__name local single = self.__single @@ -6364,12 +6332,12 @@ function __builder_fns.query_builder:build() component_list[component_count] = exclude_list end - local spawner_or_deferred = __evolved_multi_set(query, fragment_list, component_list) + __evolved_multi_set(query, fragment_list, component_list) __release_table(__table_pool_tag.fragment_list, fragment_list) __release_table(__table_pool_tag.component_list, component_list) - return query, spawner_or_deferred + return query end --- @@ -6452,7 +6420,6 @@ function __builder_fns.group_builder:epilogue(epilogue) end ---@return evolved.group group ----@return boolean spawned_or_deferred function __builder_fns.group_builder:build() local name = self.__name local single = self.__single @@ -6518,12 +6485,12 @@ function __builder_fns.group_builder:build() component_list[component_count] = epilogue end - local spawner_or_deferred = __evolved_multi_set(group, fragment_list, component_list) + __evolved_multi_set(group, fragment_list, component_list) __release_table(__table_pool_tag.fragment_list, fragment_list) __release_table(__table_pool_tag.component_list, component_list) - return group, spawner_or_deferred + return group end --- @@ -6573,7 +6540,6 @@ function __builder_fns.phase_builder:epilogue(epilogue) end ---@return evolved.phase phase ----@return boolean spawned_or_deferred function __builder_fns.phase_builder:build() local name = self.__name local single = self.__single @@ -6623,12 +6589,12 @@ function __builder_fns.phase_builder:build() component_list[component_count] = epilogue end - local spawned_or_deferred = __evolved_multi_set(phase, fragment_list, component_list) + __evolved_multi_set(phase, fragment_list, component_list) __release_table(__table_pool_tag.fragment_list, fragment_list) __release_table(__table_pool_tag.component_list, component_list) - return phase, spawned_or_deferred + return phase end --- @@ -6699,7 +6665,6 @@ function __builder_fns.system_builder:epilogue(epilogue) end ---@return evolved.system system ----@return boolean spawned_or_deferred function __builder_fns.system_builder:build() local name = self.__name local single = self.__single @@ -6773,12 +6738,12 @@ function __builder_fns.system_builder:build() component_list[component_count] = epilogue end - local spawned_or_deferred = __evolved_multi_set(system, fragment_list, component_list) + __evolved_multi_set(system, fragment_list, component_list) __release_table(__table_pool_tag.fragment_list, fragment_list) __release_table(__table_pool_tag.component_list, component_list) - return system, spawned_or_deferred + return system end --- @@ -6817,15 +6782,15 @@ local function __update_fragment_hooks(fragment) __trace_fragment_chunks(fragment, __update_chunk_caches_trace, fragment) end -assert(__evolved_set(__ON_SET, __ON_INSERT, __update_fragment_hooks)) -assert(__evolved_set(__ON_ASSIGN, __ON_INSERT, __update_fragment_hooks)) -assert(__evolved_set(__ON_INSERT, __ON_INSERT, __update_fragment_hooks)) -assert(__evolved_set(__ON_REMOVE, __ON_INSERT, __update_fragment_hooks)) +__evolved_set(__ON_SET, __ON_INSERT, __update_fragment_hooks) +__evolved_set(__ON_ASSIGN, __ON_INSERT, __update_fragment_hooks) +__evolved_set(__ON_INSERT, __ON_INSERT, __update_fragment_hooks) +__evolved_set(__ON_REMOVE, __ON_INSERT, __update_fragment_hooks) -assert(__evolved_set(__ON_SET, __ON_REMOVE, __update_fragment_hooks)) -assert(__evolved_set(__ON_ASSIGN, __ON_REMOVE, __update_fragment_hooks)) -assert(__evolved_set(__ON_INSERT, __ON_REMOVE, __update_fragment_hooks)) -assert(__evolved_set(__ON_REMOVE, __ON_REMOVE, __update_fragment_hooks)) +__evolved_set(__ON_SET, __ON_REMOVE, __update_fragment_hooks) +__evolved_set(__ON_ASSIGN, __ON_REMOVE, __update_fragment_hooks) +__evolved_set(__ON_INSERT, __ON_REMOVE, __update_fragment_hooks) +__evolved_set(__ON_REMOVE, __ON_REMOVE, __update_fragment_hooks) --- --- @@ -6900,14 +6865,14 @@ local function __update_fragment_constructs(fragment) __trace_fragment_chunks(fragment, __update_chunk_caches_trace, fragment) end -assert(__evolved_set(__TAG, __ON_INSERT, __update_fragment_tags)) -assert(__evolved_set(__TAG, __ON_REMOVE, __update_fragment_tags)) +__evolved_set(__TAG, __ON_INSERT, __update_fragment_tags) +__evolved_set(__TAG, __ON_REMOVE, __update_fragment_tags) -assert(__evolved_set(__DEFAULT, __ON_INSERT, __update_fragment_defaults)) -assert(__evolved_set(__DEFAULT, __ON_REMOVE, __update_fragment_defaults)) +__evolved_set(__DEFAULT, __ON_INSERT, __update_fragment_defaults) +__evolved_set(__DEFAULT, __ON_REMOVE, __update_fragment_defaults) -assert(__evolved_set(__CONSTRUCT, __ON_INSERT, __update_fragment_constructs)) -assert(__evolved_set(__CONSTRUCT, __ON_REMOVE, __update_fragment_constructs)) +__evolved_set(__CONSTRUCT, __ON_INSERT, __update_fragment_constructs) +__evolved_set(__CONSTRUCT, __ON_REMOVE, __update_fragment_constructs) --- --- @@ -6915,35 +6880,35 @@ assert(__evolved_set(__CONSTRUCT, __ON_REMOVE, __update_fragment_constructs)) --- --- -assert(__evolved_set(__TAG, __NAME, 'TAG')) +__evolved_set(__TAG, __NAME, 'TAG') -assert(__evolved_set(__NAME, __NAME, 'NAME')) -assert(__evolved_set(__DEFAULT, __NAME, 'DEFAULT')) -assert(__evolved_set(__CONSTRUCT, __NAME, 'CONSTRUCT')) +__evolved_set(__NAME, __NAME, 'NAME') +__evolved_set(__DEFAULT, __NAME, 'DEFAULT') +__evolved_set(__CONSTRUCT, __NAME, 'CONSTRUCT') -assert(__evolved_set(__INCLUDES, __NAME, 'INCLUDES')) -assert(__evolved_set(__EXCLUDES, __NAME, 'EXCLUDES')) +__evolved_set(__INCLUDES, __NAME, 'INCLUDES') +__evolved_set(__EXCLUDES, __NAME, 'EXCLUDES') -assert(__evolved_set(__ON_SET, __NAME, 'ON_SET')) -assert(__evolved_set(__ON_ASSIGN, __NAME, 'ON_ASSIGN')) -assert(__evolved_set(__ON_INSERT, __NAME, 'ON_INSERT')) -assert(__evolved_set(__ON_REMOVE, __NAME, 'ON_REMOVE')) +__evolved_set(__ON_SET, __NAME, 'ON_SET') +__evolved_set(__ON_ASSIGN, __NAME, 'ON_ASSIGN') +__evolved_set(__ON_INSERT, __NAME, 'ON_INSERT') +__evolved_set(__ON_REMOVE, __NAME, 'ON_REMOVE') -assert(__evolved_set(__PHASE, __NAME, 'PHASE')) -assert(__evolved_set(__GROUP, __NAME, 'GROUP')) -assert(__evolved_set(__AFTER, __NAME, 'AFTER')) +__evolved_set(__PHASE, __NAME, 'PHASE') +__evolved_set(__GROUP, __NAME, 'GROUP') +__evolved_set(__AFTER, __NAME, 'AFTER') -assert(__evolved_set(__QUERY, __NAME, 'QUERY')) -assert(__evolved_set(__EXECUTE, __NAME, 'EXECUTE')) +__evolved_set(__QUERY, __NAME, 'QUERY') +__evolved_set(__EXECUTE, __NAME, 'EXECUTE') -assert(__evolved_set(__PROLOGUE, __NAME, 'PROLOGUE')) -assert(__evolved_set(__EPILOGUE, __NAME, 'EPILOGUE')) +__evolved_set(__PROLOGUE, __NAME, 'PROLOGUE') +__evolved_set(__EPILOGUE, __NAME, 'EPILOGUE') -assert(__evolved_set(__DISABLED, __NAME, 'DISABLED')) +__evolved_set(__DISABLED, __NAME, 'DISABLED') -assert(__evolved_set(__DESTROY_POLICY, __NAME, 'DESTROY_POLICY')) -assert(__evolved_set(__DESTROY_POLICY_DESTROY_ENTITY, __NAME, 'DESTROY_POLICY_DESTROY_ENTITY')) -assert(__evolved_set(__DESTROY_POLICY_REMOVE_FRAGMENT, __NAME, 'DESTROY_POLICY_REMOVE_FRAGMENT')) +__evolved_set(__DESTROY_POLICY, __NAME, 'DESTROY_POLICY') +__evolved_set(__DESTROY_POLICY_DESTROY_ENTITY, __NAME, 'DESTROY_POLICY_DESTROY_ENTITY') +__evolved_set(__DESTROY_POLICY_REMOVE_FRAGMENT, __NAME, 'DESTROY_POLICY_REMOVE_FRAGMENT') --- --- @@ -6951,14 +6916,14 @@ assert(__evolved_set(__DESTROY_POLICY_REMOVE_FRAGMENT, __NAME, 'DESTROY_POLICY_R --- --- -assert(__evolved_set(__TAG, __TAG)) +__evolved_set(__TAG, __TAG) -assert(__evolved_set(__INCLUDES, __CONSTRUCT, __component_list)) -assert(__evolved_set(__EXCLUDES, __CONSTRUCT, __component_list)) +__evolved_set(__INCLUDES, __CONSTRUCT, __component_list) +__evolved_set(__EXCLUDES, __CONSTRUCT, __component_list) -assert(__evolved_set(__AFTER, __CONSTRUCT, __component_list)) +__evolved_set(__AFTER, __CONSTRUCT, __component_list) -assert(__evolved_set(__DISABLED, __TAG)) +__evolved_set(__DISABLED, __TAG) --- --- @@ -6968,7 +6933,7 @@ assert(__evolved_set(__DISABLED, __TAG)) ---@param query evolved.query ---@param include_list evolved.fragment[] -assert(__evolved_set(__INCLUDES, __ON_SET, function(query, _, include_list) +__evolved_set(__INCLUDES, __ON_SET, function(query, _, include_list) local include_count = #include_list if include_count == 0 then @@ -6985,11 +6950,11 @@ assert(__evolved_set(__INCLUDES, __ON_SET, function(query, _, include_list) __assoc_list_sort(sorted_includes) __query_sorted_includes[query] = sorted_includes -end)) +end) -assert(__evolved_set(__INCLUDES, __ON_REMOVE, function(query) +__evolved_set(__INCLUDES, __ON_REMOVE, function(query) __query_sorted_includes[query] = nil -end)) +end) --- --- @@ -6999,7 +6964,7 @@ end)) ---@param query evolved.query ---@param exclude_list evolved.fragment[] -assert(__evolved_set(__EXCLUDES, __ON_SET, function(query, _, exclude_list) +__evolved_set(__EXCLUDES, __ON_SET, function(query, _, exclude_list) local exclude_count = #exclude_list if exclude_count == 0 then @@ -7016,11 +6981,11 @@ assert(__evolved_set(__EXCLUDES, __ON_SET, function(query, _, exclude_list) __assoc_list_sort(sorted_excludes) __query_sorted_excludes[query] = sorted_excludes -end)) +end) -assert(__evolved_set(__EXCLUDES, __ON_REMOVE, function(query) +__evolved_set(__EXCLUDES, __ON_REMOVE, function(query) __query_sorted_excludes[query] = nil -end)) +end) --- --- @@ -7031,7 +6996,7 @@ end)) ---@param group evolved.group ---@param new_phase evolved.phase ---@param old_phase? evolved.phase -assert(__evolved_set(__PHASE, __ON_SET, function(group, _, new_phase, old_phase) +__evolved_set(__PHASE, __ON_SET, function(group, _, new_phase, old_phase) if new_phase == old_phase then return end @@ -7056,11 +7021,11 @@ assert(__evolved_set(__PHASE, __ON_SET, function(group, _, new_phase, old_phase) end __assoc_list_insert(new_phase_groups, group) -end)) +end) ---@param group evolved.group ---@param old_phase evolved.phase -assert(__evolved_set(__PHASE, __ON_REMOVE, function(group, _, old_phase) +__evolved_set(__PHASE, __ON_REMOVE, function(group, _, old_phase) local old_phase_groups = __phase_groups[old_phase] if old_phase_groups then @@ -7070,7 +7035,7 @@ assert(__evolved_set(__PHASE, __ON_REMOVE, function(group, _, old_phase) __phase_groups[old_phase] = nil end end -end)) +end) --- --- @@ -7081,7 +7046,7 @@ end)) ---@param system evolved.system ---@param new_group evolved.group ---@param old_group? evolved.group -assert(__evolved_set(__GROUP, __ON_SET, function(system, _, new_group, old_group) +__evolved_set(__GROUP, __ON_SET, function(system, _, new_group, old_group) if new_group == old_group then return end @@ -7106,11 +7071,11 @@ assert(__evolved_set(__GROUP, __ON_SET, function(system, _, new_group, old_group end __assoc_list_insert(new_group_systems, system) -end)) +end) ---@param system evolved.system ---@param old_group evolved.group -assert(__evolved_set(__GROUP, __ON_REMOVE, function(system, _, old_group) +__evolved_set(__GROUP, __ON_REMOVE, function(system, _, old_group) local old_group_systems = __group_systems[old_group] if old_group_systems then @@ -7120,7 +7085,7 @@ assert(__evolved_set(__GROUP, __ON_REMOVE, function(system, _, old_group) __group_systems[old_group] = nil end end -end)) +end) --- --- @@ -7130,7 +7095,7 @@ end)) ---@param group evolved.group ---@param new_after_list evolved.group[] -assert(__evolved_set(__AFTER, __ON_SET, function(group, _, new_after_list) +__evolved_set(__AFTER, __ON_SET, function(group, _, new_after_list) local new_after_count = #new_after_list if new_after_count == 0 then @@ -7146,12 +7111,12 @@ assert(__evolved_set(__AFTER, __ON_SET, function(group, _, new_after_list) end __group_dependencies[group] = new_dependencies -end)) +end) ---@param group evolved.group -assert(__evolved_set(__AFTER, __ON_REMOVE, function(group) +__evolved_set(__AFTER, __ON_REMOVE, function(group) __group_dependencies[group] = nil -end)) +end) --- ---