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

ircd::json::array: Deinline various.

Browse source
This commit is contained in:
Jason Volk 2019-02-21 14:00:00 -08:00
parent d064b9492c
commit 0cb852e732
2 changed files with 154 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
include/ircd/json/array.h
View file

@ -121,14 +121,6 @@ struct ircd::json::array::const_iterator
friend bool operator>(const const_iterator &, const const_iterator &);
};
inline ircd::string_view
ircd::json::array::operator[](const size_t &i)
const
{
const auto it(find(i));
return it != end()? *it : string_view{};
}
template<class T>
T
ircd::json::array::at(const size_t &i)
@ -143,103 +135,3 @@ catch(const bad_lex_cast &e)
"indice %zu must cast to type %s", i, typeid(T).name()
};
}
inline ircd::string_view
ircd::json::array::at(const size_t &i)
const
{
const auto it(find(i));
if(it == end())
throw not_found
{
"indice %zu", i
};
return *it;
}
inline ircd::json::array::const_iterator
ircd::json::array::find(size_t i)
const
{
auto it(begin());
for(; it != end() && i; ++it, i--);
return it;
}
inline size_t
ircd::json::size(const array &array)
{
return array.size();
}
inline size_t
ircd::json::array::size()
const
{
return count();
}
inline size_t
ircd::json::array::count()
const
{
return std::distance(begin(), end());
}
inline bool
ircd::json::operator!(const array &array)
{
return empty(array);
}
inline bool
ircd::json::empty(const array &array)
{
return array.empty();
}
inline bool
ircd::json::array::empty()
const
{
const string_view &sv{*this};
assert(sv.size() > 2 || (sv.empty() || sv == empty_array));
return sv.size() <= 2;
}
inline bool
ircd::json::operator==(const array::const_iterator &a, const array::const_iterator &b)
{
return a.start == b.start;
}
inline bool
ircd::json::operator!=(const array::const_iterator &a, const array::const_iterator &b)
{
return a.start != b.start;
}
inline bool
ircd::json::operator<=(const array::const_iterator &a, const array::const_iterator &b)
{
return a.start <= b.start;
}
inline bool
ircd::json::operator>=(const array::const_iterator &a, const array::const_iterator &b)
{
return a.start >= b.start;
}
inline bool
ircd::json::operator<(const array::const_iterator &a, const array::const_iterator &b)
{
return a.start < b.start;
}
inline bool
ircd::json::operator>(const array::const_iterator &a, const array::const_iterator &b)
{
return a.start > b.start;
}

191
ircd/json.cc
View file

@ -2266,6 +2266,13 @@ ircd::json::array::max_recursion_depth
32
};
std::ostream &
ircd::json::operator<<(std::ostream &s, const array &a)
{
s << json::strung(a);
return s;
}
ircd::string_view
ircd::json::stringify(mutable_buffer &buf,
const array &v)
@ -2319,6 +2326,28 @@ ircd::json::serialized(const string_view *const &b,
return array::serialized(b, e);
}
size_t
ircd::json::size(const array &array)
{
return array.size();
}
bool
ircd::json::operator!(const array &array)
{
return empty(array);
}
bool
ircd::json::empty(const array &array)
{
return array.empty();
}
//
// array::array
//
template<class it>
ircd::string_view
ircd::json::array::stringify(mutable_buffer &buf,
@ -2361,43 +2390,6 @@ ircd::json::array::serialized(const it &b,
});
}
std::ostream &
ircd::json::operator<<(std::ostream &s, const array &a)
{
s << json::strung(a);
return s;
}
ircd::json::array::const_iterator &
ircd::json::array::const_iterator::operator++()
try
{
static const auto &ws
{
parser.ws
};
static const parser::rule<string_view> value
{
raw[parser.value(0)]
,"array element"
};
static const parser::rule<string_view> parse_next
{
(parser.array_end | (parser.value_sep >> -ws >> value)) >> -ws
,"next array element or end"
};
state = string_view{};
qi::parse(start, stop, eps > parse_next, state);
return *this;
}
catch(const qi::expectation_failure<const char *> &e)
{
throw expectation_failure(start, e);
}
ircd::json::array::operator std::string()
const
{
@ -2447,6 +2439,131 @@ const
return { string_view::end(), string_view::end() };
}
ircd::string_view
ircd::json::array::operator[](const size_t &i)
const
{
const auto it(find(i));
return it != end()? *it : string_view{};
}
ircd::string_view
ircd::json::array::at(const size_t &i)
const
{
const auto it(find(i));
if(it == end())
throw not_found
{
"indice %zu", i
};
return *it;
}
ircd::json::array::const_iterator
ircd::json::array::find(size_t i)
const
{
auto it(begin());
for(; it != end() && i; ++it, i--);
return it;
}
size_t
ircd::json::array::size()
const
{
return count();
}
size_t
ircd::json::array::count()
const
{
return std::distance(begin(), end());
}
bool
ircd::json::array::empty()
const
{
const string_view &sv{*this};
assert(sv.size() > 2 || (sv.empty() || sv == empty_array));
return sv.size() <= 2;
}
//
// array::const_iterator
//
ircd::json::array::const_iterator &
ircd::json::array::const_iterator::operator++()
try
{
static const auto &ws
{
parser.ws
};
static const parser::rule<string_view> value
{
raw[parser.value(0)]
,"array element"
};
static const parser::rule<string_view> parse_next
{
(parser.array_end | (parser.value_sep >> -ws >> value)) >> -ws
,"next array element or end"
};
state = string_view{};
qi::parse(start, stop, eps > parse_next, state);
return *this;
}
catch(const qi::expectation_failure<const char *> &e)
{
throw expectation_failure(start, e);
}
bool
ircd::json::operator==(const array::const_iterator &a, const array::const_iterator &b)
{
return a.start == b.start;
}
bool
ircd::json::operator!=(const array::const_iterator &a, const array::const_iterator &b)
{
return a.start != b.start;
}
bool
ircd::json::operator<=(const array::const_iterator &a, const array::const_iterator &b)
{
return a.start <= b.start;
}
bool
ircd::json::operator>=(const array::const_iterator &a, const array::const_iterator &b)
{
return a.start >= b.start;
}
bool
ircd::json::operator<(const array::const_iterator &a, const array::const_iterator &b)
{
return a.start < b.start;
}
bool
ircd::json::operator>(const array::const_iterator &a, const array::const_iterator &b)
{
return a.start > b.start;
}
///////////////////////////////////////////////////////////////////////////////
//
// json/member.h