#pragma once
#include <functional>
+
#include <boost/iterator/iterator_adaptor.hpp>
#include <boost/iterator/iterator_facade.hpp>
-#include <folly/Likely.h>
+
#include <folly/Conv.h>
#include <folly/Format.h>
+#include <folly/Likely.h>
//////////////////////////////////////////////////////////////////////
namespace std {
-template<>
-struct hash< ::folly::dynamic> {
+template <>
+struct hash<::folly::dynamic> {
size_t operator()(::folly::dynamic const& d) const {
return d.hash();
}
};
-}
+} // namespace std
//////////////////////////////////////////////////////////////////////
do { \
switch ((type)) { \
case NULLT: \
- apply(void*); \
+ apply(std::nullptr_t); \
break; \
case ARRAY: \
apply(Array); \
struct TypeError : std::runtime_error {
explicit TypeError(const std::string& expected, dynamic::Type actual);
- explicit TypeError(const std::string& expected,
- dynamic::Type actual1, dynamic::Type actual2);
- ~TypeError();
+ explicit TypeError(
+ const std::string& expected,
+ dynamic::Type actual1,
+ dynamic::Type actual2);
+ ~TypeError() override;
};
+[[noreturn]] void throwTypeError_(
+ std::string const& expected,
+ dynamic::Type actual);
+[[noreturn]] void throwTypeError_(
+ std::string const& expected,
+ dynamic::Type actual1,
+ dynamic::Type actual2);
//////////////////////////////////////////////////////////////////////
namespace detail {
- // This helper is used in destroy() to be able to run destructors on
- // types like "int64_t" without a compiler error.
- struct Destroy {
- template<class T> static void destroy(T* t) { t->~T(); }
- };
-
- /*
- * Helper for implementing numeric conversions in operators on
- * numbers. Just promotes to double when one of the arguments is
- * double, or throws if either is not a numeric type.
- */
- template<template<class> class Op>
- dynamic numericOp(dynamic const& a, dynamic const& b) {
- if (!a.isNumber() || !b.isNumber()) {
- throw TypeError("numeric", a.type(), b.type());
- }
- if (a.type() != b.type()) {
- auto& integ = a.isInt() ? a : b;
- auto& nonint = a.isInt() ? b : a;
- return Op<double>()(to<double>(integ.asInt()), nonint.asDouble());
- }
- if (a.isDouble()) {
- return Op<double>()(a.asDouble(), b.asDouble());
- }
- return Op<int64_t>()(a.asInt(), b.asInt());
+// This helper is used in destroy() to be able to run destructors on
+// types like "int64_t" without a compiler error.
+struct Destroy {
+ template <class T>
+ static void destroy(T* t) {
+ t->~T();
}
+};
+/*
+ * Helper for implementing numeric conversions in operators on
+ * numbers. Just promotes to double when one of the arguments is
+ * double, or throws if either is not a numeric type.
+ */
+template <template <class> class Op>
+dynamic numericOp(dynamic const& a, dynamic const& b) {
+ if (!a.isNumber() || !b.isNumber()) {
+ throwTypeError_("numeric", a.type(), b.type());
+ }
+ if (a.type() != b.type()) {
+ auto& integ = a.isInt() ? a : b;
+ auto& nonint = a.isInt() ? b : a;
+ return Op<double>()(to<double>(integ.asInt()), nonint.asDouble());
+ }
+ if (a.isDouble()) {
+ return Op<double>()(a.asDouble(), b.asDouble());
+ }
+ return Op<int64_t>()(a.asInt(), b.asInt());
}
+} // namespace detail
+
//////////////////////////////////////////////////////////////////////
/*
return std::move(*this);
}
-private:
+ private:
dynamic val_;
};
//////////////////////////////////////////////////////////////////////
+struct dynamic::item_iterator : boost::iterator_adaptor<
+ dynamic::item_iterator,
+ dynamic::ObjectImpl::iterator> {
+ /* implicit */ item_iterator(base_type b) : iterator_adaptor_(b) {}
+
+ using object_type = dynamic::ObjectImpl;
+
+ private:
+ friend class boost::iterator_core_access;
+};
+
+struct dynamic::value_iterator : boost::iterator_adaptor<
+ dynamic::value_iterator,
+ dynamic::ObjectImpl::iterator,
+ dynamic> {
+ /* implicit */ value_iterator(base_type b) : iterator_adaptor_(b) {}
+
+ using object_type = dynamic::ObjectImpl;
+
+ private:
+ dynamic& dereference() const {
+ return base_reference()->second;
+ }
+ friend class boost::iterator_core_access;
+};
+
struct dynamic::const_item_iterator
: boost::iterator_adaptor<dynamic::const_item_iterator,
dynamic::ObjectImpl::const_iterator> {
/* implicit */ const_item_iterator(base_type b) : iterator_adaptor_(b) { }
+ /* implicit */ const_item_iterator(item_iterator i)
+ : iterator_adaptor_(i.base()) {}
+ /* implicit */ const_item_iterator(dynamic::ObjectImpl::iterator i)
+ : iterator_adaptor_(i) {}
+
+ using object_type = dynamic::ObjectImpl const;
private:
friend class boost::iterator_core_access;
dynamic const> {
/* implicit */ const_key_iterator(base_type b) : iterator_adaptor_(b) { }
+ using object_type = dynamic::ObjectImpl const;
+
private:
dynamic const& dereference() const {
return base_reference()->first;
dynamic::ObjectImpl::const_iterator,
dynamic const> {
/* implicit */ const_value_iterator(base_type b) : iterator_adaptor_(b) { }
+ /* implicit */ const_value_iterator(value_iterator i)
+ : iterator_adaptor_(i.base()) {}
+ /* implicit */ const_value_iterator(dynamic::ObjectImpl::iterator i)
+ : iterator_adaptor_(i) {}
+
+ using object_type = dynamic::ObjectImpl const;
private:
dynamic const& dereference() const {
template <class T>
struct dynamic::NumericTypeHelper<
T, typename std::enable_if<std::is_integral<T>::value>::type> {
+ static_assert(
+ !kIsObjC || sizeof(T) > sizeof(char),
+ "char-sized types are ambiguous in objc; cast to bool or wider type");
using type = int64_t;
};
template <>
using type = double;
};
-template<class T, class NumericType /* = typename NumericTypeHelper<T>::type */>
+template <
+ class T,
+ class NumericType /* = typename NumericTypeHelper<T>::type */>
dynamic::dynamic(T t) {
type_ = TypeInfo<NumericType>::type;
new (getAddress<NumericType>()) NumericType(NumericType(t));
return get<Array>().end();
}
+inline dynamic::iterator dynamic::begin() {
+ return get<Array>().begin();
+}
+inline dynamic::iterator dynamic::end() {
+ return get<Array>().end();
+}
+
template <class It>
struct dynamic::IterableProxy {
- typedef It const_iterator;
+ typedef It iterator;
typedef typename It::value_type value_type;
+ typedef typename It::object_type object_type;
- /* implicit */ IterableProxy(const dynamic::ObjectImpl* o) : o_(o) { }
+ /* implicit */ IterableProxy(object_type* o) : o_(o) {}
It begin() const {
return o_->begin();
}
private:
- const dynamic::ObjectImpl* o_;
+ object_type* o_;
};
inline dynamic::IterableProxy<dynamic::const_key_iterator> dynamic::keys()
return &(get<ObjectImpl>());
}
+inline dynamic::IterableProxy<dynamic::value_iterator> dynamic::values() {
+ return &(get<ObjectImpl>());
+}
+
+inline dynamic::IterableProxy<dynamic::item_iterator> dynamic::items() {
+ return &(get<ObjectImpl>());
+}
+
inline bool dynamic::isString() const {
return get_nothrow<std::string>() != nullptr;
}
return get_nothrow<int64_t>() != nullptr;
}
inline bool dynamic::isNull() const {
- return get_nothrow<void*>() != nullptr;
+ return get_nothrow<std::nullptr_t>() != nullptr;
}
inline bool dynamic::isNumber() const {
return isInt() || isDouble();
return get<std::string>();
}
-template<class T>
+template <class T>
struct dynamic::CompareOp {
static bool comp(T const& a, T const& b) { return a < b; }
};
-template<>
+template <>
struct dynamic::CompareOp<dynamic::ObjectImpl> {
static bool comp(ObjectImpl const&, ObjectImpl const&) {
// This code never executes; it is just here for the compiler.
return false;
}
};
+template <>
+struct dynamic::CompareOp<std::nullptr_t> {
+ static bool comp(std::nullptr_t const&, std::nullptr_t const&) {
+ return true;
+ }
+};
inline dynamic& dynamic::operator+=(dynamic const& o) {
if (type() == STRING && o.type() == STRING) {
return *this;
}
-#define FB_DYNAMIC_INTEGER_OP(op) \
- inline dynamic& dynamic::operator op(dynamic const& o) { \
- if (!isInt() || !o.isInt()) { \
- throw TypeError("int64", type(), o.type()); \
- } \
- *getAddress<int64_t>() op o.asInt(); \
- return *this; \
+#define FB_DYNAMIC_INTEGER_OP(op) \
+ inline dynamic& dynamic::operator op(dynamic const& o) { \
+ if (!isInt() || !o.isInt()) { \
+ throwTypeError_("int64", type(), o.type()); \
+ } \
+ *getAddress<int64_t>() op o.asInt(); \
+ return *this; \
}
FB_DYNAMIC_INTEGER_OP(%=)
return std::move((*this)[idx]);
}
-template<class K, class V> inline dynamic& dynamic::setDefault(K&& k, V&& v) {
+template <class K, class V> inline dynamic& dynamic::setDefault(K&& k, V&& v) {
auto& obj = get<ObjectImpl>();
return obj.insert(std::make_pair(std::forward<K>(k),
std::forward<V>(v))).first->second;
}
-template<class K> inline dynamic& dynamic::setDefault(K&& k, dynamic&& v) {
+template <class K> inline dynamic& dynamic::setDefault(K&& k, dynamic&& v) {
auto& obj = get<ObjectImpl>();
return obj.insert(std::make_pair(std::forward<K>(k),
std::move(v))).first->second;
}
-template<class K> inline dynamic& dynamic::setDefault(K&& k, const dynamic& v) {
+template <class K> inline dynamic& dynamic::setDefault(K&& k, const dynamic& v) {
auto& obj = get<ObjectImpl>();
return obj.insert(std::make_pair(std::forward<K>(k), v)).first->second;
}
inline dynamic::const_item_iterator dynamic::find(dynamic const& key) const {
return get<ObjectImpl>().find(key);
}
+inline dynamic::item_iterator dynamic::find(dynamic const& key) {
+ return get<ObjectImpl>().find(key);
+}
-template<class K, class V> inline void dynamic::insert(K&& key, V&& val) {
+template <class K, class V> inline void dynamic::insert(K&& key, V&& val) {
auto& obj = get<ObjectImpl>();
auto rv = obj.insert({ std::forward<K>(key), nullptr });
rv.first->second = std::forward<V>(val);
inline void dynamic::update(const dynamic& mergeObj) {
if (!isObject() || !mergeObj.isObject()) {
- throw TypeError("object", type(), mergeObj.type());
+ throwTypeError_("object", type(), mergeObj.type());
}
for (const auto& pair : mergeObj.items()) {
inline void dynamic::update_missing(const dynamic& mergeObj1) {
if (!isObject() || !mergeObj1.isObject()) {
- throw TypeError("object", type(), mergeObj1.type());
+ throwTypeError_("object", type(), mergeObj1.type());
}
// Only add if not already there
return obj.erase(key);
}
-inline dynamic::const_iterator dynamic::erase(const_iterator it) {
+inline dynamic::iterator dynamic::erase(const_iterator it) {
auto& arr = get<Array>();
// std::vector doesn't have an erase method that works on const iterators,
// even though the standard says it should, so this hack converts to a
return const_key_iterator(get<ObjectImpl>().erase(it.base()));
}
-inline dynamic::const_key_iterator dynamic::erase(const_key_iterator first,
- const_key_iterator last) {
+inline dynamic::const_key_iterator dynamic::erase(
+ const_key_iterator first,
+ const_key_iterator last) {
return const_key_iterator(get<ObjectImpl>().erase(first.base(),
last.base()));
}
-inline dynamic::const_value_iterator dynamic::erase(const_value_iterator it) {
- return const_value_iterator(get<ObjectImpl>().erase(it.base()));
+inline dynamic::value_iterator dynamic::erase(const_value_iterator it) {
+ return value_iterator(get<ObjectImpl>().erase(it.base()));
}
-inline dynamic::const_value_iterator dynamic::erase(const_value_iterator first,
- const_value_iterator last) {
- return const_value_iterator(get<ObjectImpl>().erase(first.base(),
- last.base()));
+inline dynamic::value_iterator dynamic::erase(
+ const_value_iterator first,
+ const_value_iterator last) {
+ return value_iterator(get<ObjectImpl>().erase(first.base(), last.base()));
}
-inline dynamic::const_item_iterator dynamic::erase(const_item_iterator it) {
- return const_item_iterator(get<ObjectImpl>().erase(it.base()));
+inline dynamic::item_iterator dynamic::erase(const_item_iterator it) {
+ return item_iterator(get<ObjectImpl>().erase(it.base()));
}
-inline dynamic::const_item_iterator dynamic::erase(const_item_iterator first,
- const_item_iterator last) {
- return const_item_iterator(get<ObjectImpl>().erase(first.base(),
- last.base()));
+inline dynamic::item_iterator dynamic::erase(
+ const_item_iterator first,
+ const_item_iterator last) {
+ return item_iterator(get<ObjectImpl>().erase(first.base(), last.base()));
}
inline void dynamic::resize(std::size_t sz, dynamic const& c) {
}; \
//
-FOLLY_DYNAMIC_DEC_TYPEINFO(void*, "null", dynamic::NULLT)
+FOLLY_DYNAMIC_DEC_TYPEINFO(std::nullptr_t, "null", dynamic::NULLT)
FOLLY_DYNAMIC_DEC_TYPEINFO(bool, "boolean", dynamic::BOOL)
FOLLY_DYNAMIC_DEC_TYPEINFO(std::string, "string", dynamic::STRING)
FOLLY_DYNAMIC_DEC_TYPEINFO(dynamic::Array, "array", dynamic::ARRAY)
#undef FOLLY_DYNAMIC_DEC_TYPEINFO
-template<class T>
+template <class T>
T dynamic::asImpl() const {
switch (type()) {
case INT64: return to<T>(*get_nothrow<int64_t>());
case STRING:
return to<T>(*get_nothrow<std::string>());
default:
- throw TypeError("int/double/bool/string", type());
+ throwTypeError_("int/double/bool/string", type());
}
}
// Return a T* to our type, or null if we're not that type.
-template<class T>
+template <class T>
T* dynamic::get_nothrow() & noexcept {
if (type_ != TypeInfo<T>::type) {
return nullptr;
return getAddress<T>();
}
-template<class T>
+template <class T>
T const* dynamic::get_nothrow() const& noexcept {
return const_cast<dynamic*>(this)->get_nothrow<T>();
}
// Return T* for where we can put a T, without type checking. (Memory
// might be uninitialized, even.)
-template<class T>
+template <class T>
T* dynamic::getAddress() noexcept {
return GetAddrImpl<T>::get(u_);
}
-template<class T>
+template <class T>
T const* dynamic::getAddress() const noexcept {
return const_cast<dynamic*>(this)->getAddress<T>();
}
-template<class T> struct dynamic::GetAddrImpl {};
-template<> struct dynamic::GetAddrImpl<void*> {
- static void** get(Data& d) noexcept { return &d.nul; }
+template <class T> struct dynamic::GetAddrImpl {};
+template <> struct dynamic::GetAddrImpl<std::nullptr_t> {
+ static std::nullptr_t* get(Data& d) noexcept { return &d.nul; }
};
-template<> struct dynamic::GetAddrImpl<dynamic::Array> {
+template <> struct dynamic::GetAddrImpl<dynamic::Array> {
static Array* get(Data& d) noexcept { return &d.array; }
};
-template<> struct dynamic::GetAddrImpl<bool> {
+template <> struct dynamic::GetAddrImpl<bool> {
static bool* get(Data& d) noexcept { return &d.boolean; }
};
-template<> struct dynamic::GetAddrImpl<int64_t> {
+template <> struct dynamic::GetAddrImpl<int64_t> {
static int64_t* get(Data& d) noexcept { return &d.integer; }
};
-template<> struct dynamic::GetAddrImpl<double> {
+template <> struct dynamic::GetAddrImpl<double> {
static double* get(Data& d) noexcept { return &d.doubl; }
};
template <>
return &d.string;
}
};
-template<> struct dynamic::GetAddrImpl<dynamic::ObjectImpl> {
+template <> struct dynamic::GetAddrImpl<dynamic::ObjectImpl> {
static_assert(sizeof(ObjectImpl) <= sizeof(Data::objectBuffer),
"In your implementation, std::unordered_map<> apparently takes different"
" amount of space depending on its template parameters. This is "
}
};
-template<class T>
+template <class T>
T& dynamic::get() {
if (auto* p = get_nothrow<T>()) {
return *p;
}
- throw TypeError(TypeInfo<T>::name, type());
+ throwTypeError_(TypeInfo<T>::name, type());
}
-template<class T>
+template <class T>
T const& dynamic::get() const {
return const_cast<dynamic*>(this)->get<T>();
}
* Helper for implementing operator<<. Throws if the type shouldn't
* support it.
*/
-template<class T>
+template <class T>
struct dynamic::PrintImpl {
static void print(dynamic const&, std::ostream& out, T const& t) {
out << t;
};
// Otherwise, null, being (void*)0, would print as 0.
template <>
-struct dynamic::PrintImpl<void*> {
+struct dynamic::PrintImpl<std::nullptr_t> {
static void print(dynamic const& /* d */,
std::ostream& out,
- void* const& nul) {
- DCHECK_EQ((void*)0, nul);
+ std::nullptr_t const&) {
out << "null";
}
};
-template<>
+template <>
struct dynamic::PrintImpl<dynamic::ObjectImpl> {
static void print(dynamic const& d,
std::ostream& out,
d.print_as_pseudo_json(out);
}
};
-template<>
+template <>
struct dynamic::PrintImpl<dynamic::Array> {
static void print(dynamic const& d,
std::ostream& out,
const detail::DefaultValueWrapper<dynamic, V>& val_;
};
-} // namespaces
+} // namespace folly
#undef FB_DYNAMIC_APPLY
projects / folly.git / blobdiff