MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-29 20:28:52 +02:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:state: Make each() into test() protocol.

Browse source
This commit is contained in:
Jason Volk 2018-02-10 00:38:36 -08:00
parent 00ed883f22
commit 98d3b8bc65
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/ircd/m/state.h
View file

@ -59,8 +59,8 @@ namespace ircd::m::state
bool dfs(const string_view &root, const json::array &key, const search_closure &);
bool dfs(const string_view &root, const search_closure &);
bool each(const string_view &root, const iter_bool_closure &);
bool each(const string_view &root, const string_view &type, const iter_bool_closure &);
bool test(const string_view &root, const iter_bool_closure &);
bool test(const string_view &root, const string_view &type, const iter_bool_closure &);
size_t count(const string_view &root, const iter_bool_closure &);
size_t count(const string_view &root);

22
ircd/m/state.cc
View file

@ -107,25 +107,25 @@ ircd::m::state::count(const string_view &root,
const iter_bool_closure &closure)
{
size_t ret{0};
each(root, [&ret, &closure]
test(root, [&ret, &closure]
(const json::array &key, const string_view &val)
{
ret += closure(key, val);
return true;
return false;
});
return ret;
}
bool
ircd::m::state::each(const string_view &root,
ircd::m::state::test(const string_view &root,
const iter_bool_closure &closure)
{
return each(root, string_view{}, closure);
return test(root, string_view{}, closure);
}
bool
ircd::m::state::each(const string_view &root,
ircd::m::state::test(const string_view &root,
const string_view &type,
const iter_bool_closure &closure)
{
@ -188,15 +188,15 @@ ircd::m::state::_dfs_recurse(const search_closure &closure,
{
if(!empty(rep.chld[pos]))
{
bool ret{true};
bool ret{false};
get_node(rep.chld[pos], [&closure, &key, &depth, &ret]
(const auto &node)
{
ret = _dfs_recurse(closure, node, key, depth);
});
if(!ret)
return ret;
if(ret)
return true;
}
if(rep.kn <= pos)
@ -205,11 +205,11 @@ ircd::m::state::_dfs_recurse(const search_closure &closure,
if(!empty(key) && !prefix_eq(key, rep.keys[pos]))
break;
if(!closure(rep.keys[pos], rep.vals[pos], depth, pos))
return false;
if(closure(rep.keys[pos], rep.vals[pos], depth, pos))
return true;
}
return true;
return false;
}
// Internal insertion operations