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

ircd:Ⓜ️:state: Strictly use name:: references for all property access.

Browse source
This commit is contained in:
Jason Volk 2018-02-24 19:47:30 -08:00
parent 114bee0381
commit 4818409b51
2 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -82,10 +82,10 @@ namespace ircd::m::state
/// JSON property name strings specifically for use in m::state /// JSON property name strings specifically for use in m::state
namespace ircd::m::state::name namespace ircd::m::state::name
{ {
constexpr const char *const k {"k"}; constexpr const char *const key {"k"};
constexpr const char *const v {"v"}; constexpr const char *const val {"v"};
constexpr const char *const c {"c"}; constexpr const char *const child {"c"};
constexpr const char *const n {"n"}; constexpr const char *const count {"n"};
} }
#pragma GCC diagnostic push #pragma GCC diagnostic push
@ -137,10 +137,10 @@ namespace ircd::m::state::name
struct ircd::m::state::node struct ircd::m::state::node
:json::tuple :json::tuple
< <
json::property<name::k, json::array>, json::property<name::key, json::array>,
json::property<name::v, json::array>, json::property<name::val, json::array>,
json::property<name::c, json::array>, json::property<name::child, json::array>,
json::property<name::n, json::array> json::property<name::count, json::array>
> >
{ {
struct rep; struct rep;

34
ircd/m/state.cc
View file

@ -878,10 +878,10 @@ ircd::m::state::node::rep::write(const mutable_buffer &out)
json::iov iov; json::iov iov;
const json::iov::push push[] const json::iov::push push[]
{ {
{ iov, { "k"_sv, { keys, kn } } }, { iov, { name::key, { keys, kn } } },
{ iov, { "v"_sv, { vals, vn } } }, { iov, { name::val, { vals, vn } } },
{ iov, { "c"_sv, { chld, cn } } }, { iov, { name::child, { chld, cn } } },
{ iov, { "n"_sv, { cnts, nn } } }, { iov, { name::count, { cnts, nn } } },
}; };
return { data(out), json::print(out, iov) }; return { data(out), json::print(out, iov) };
@ -1021,7 +1021,7 @@ ircd::m::state::node::find(const json::array &parts)
const const
{ {
size_t ret{0}; size_t ret{0};
for(const json::array key : json::get<"k"_>(*this)) for(const json::array key : json::get<name::key>(*this))
if(keycmp(parts, key) <= 0) if(keycmp(parts, key) <= 0)
return ret; return ret;
else else
@ -1036,7 +1036,7 @@ ircd::m::state::node::counts(size_t *const &out,
const const
{ {
size_t i(0); size_t i(0);
for(const string_view &c : json::get<"n"_>(*this)) for(const string_view &c : json::get<name::count>(*this))
if(likely(i < max)) if(likely(i < max))
out[i++] = lex_cast<size_t>(c); out[i++] = lex_cast<size_t>(c);
@ -1049,7 +1049,7 @@ ircd::m::state::node::childs(state::id *const &out,
const const
{ {
size_t i(0); size_t i(0);
for(const string_view &c : json::get<"c"_>(*this)) for(const string_view &c : json::get<name::child>(*this))
if(likely(i < max)) if(likely(i < max))
out[i++] = unquote(c); out[i++] = unquote(c);
@ -1062,7 +1062,7 @@ ircd::m::state::node::vals(string_view *const &out,
const const
{ {
size_t i(0); size_t i(0);
for(const string_view &v : json::get<"v"_>(*this)) for(const string_view &v : json::get<name::val>(*this))
if(likely(i < max)) if(likely(i < max))
out[i++] = unquote(v); out[i++] = unquote(v);
@ -1075,7 +1075,7 @@ ircd::m::state::node::keys(json::array *const &out,
const const
{ {
size_t i(0); size_t i(0);
for(const json::array &k : json::get<"k"_>(*this)) for(const json::array &k : json::get<name::key>(*this))
if(likely(i < max)) if(likely(i < max))
out[i++] = k; out[i++] = k;
@ -1088,7 +1088,7 @@ const
{ {
const json::array &counts const json::array &counts
{ {
json::get<"n"_>(*this, json::empty_array) json::get<name::count>(*this, json::empty_array)
}; };
return counts.at<size_t>(pos); return counts.at<size_t>(pos);
@ -1100,7 +1100,7 @@ const
{ {
const json::array &children const json::array &children
{ {
json::get<"c"_>(*this, json::empty_array) json::get<name::child>(*this, json::empty_array)
}; };
return unquote(children[pos]); return unquote(children[pos]);
@ -1113,7 +1113,7 @@ const
{ {
const json::array &values const json::array &values
{ {
json::get<"v"_>(*this, json::empty_array) json::get<name::val>(*this, json::empty_array)
}; };
return unquote(values[pos]); return unquote(values[pos]);
@ -1126,7 +1126,7 @@ const
{ {
const json::array &keys const json::array &keys
{ {
json::get<"k"_>(*this, json::empty_array) json::get<name::key>(*this, json::empty_array)
}; };
return keys[pos]; return keys[pos];
@ -1146,7 +1146,7 @@ ircd::m::state::node::counts()
const const
{ {
size_t ret(0); size_t ret(0);
for(const auto &c : json::get<"n"_>(*this)) for(const auto &c : json::get<name::count>(*this))
ret += lex_cast<size_t>(c); ret += lex_cast<size_t>(c);
return ret; return ret;
@ -1158,7 +1158,7 @@ ircd::m::state::node::childs()
const const
{ {
size_t ret(0); size_t ret(0);
for(const auto &c : json::get<"c"_>(*this)) for(const auto &c : json::get<name::child>(*this))
ret += !empty(c) && c != json::empty_string; ret += !empty(c) && c != json::empty_string;
return ret; return ret;
@ -1169,7 +1169,7 @@ size_t
ircd::m::state::node::vals() ircd::m::state::node::vals()
const const
{ {
return json::get<"v"_>(*this).count(); return json::get<name::val>(*this).count();
} }
/// Count keys in node /// Count keys in node
@ -1177,5 +1177,5 @@ size_t
ircd::m::state::node::keys() ircd::m::state::node::keys()
const const
{ {
return json::get<"k"_>(*this).count(); return json::get<name::key>(*this).count();
} }