/*
- * Copyright 2016 Facebook, Inc.
+ * Copyright 2017 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
do { \
switch ((type)) { \
case NULLT: \
- apply(void*); \
+ apply(std::nullptr_t); \
break; \
case ARRAY: \
apply(Array); \
explicit TypeError(const std::string& expected, dynamic::Type actual);
explicit TypeError(const std::string& expected,
dynamic::Type actual1, dynamic::Type actual2);
- ~TypeError();
+ ~TypeError() override;
};
template<class T> static void destroy(T* t) { t->~T(); }
};
- /*
- * The enable_if junk here is necessary to avoid ambiguous
- * conversions relating to bool and double when you implicitly
- * convert an int or long to a dynamic.
- */
- template<class T, class Enable = void> struct ConversionHelper;
- template<class T>
- struct ConversionHelper<
- T,
- typename std::enable_if<
- std::is_integral<T>::value && !std::is_same<T,bool>::value
- >::type
- > {
- typedef int64_t type;
- };
- template <>
- struct ConversionHelper<float> {
- typedef double type;
- };
- template <class T>
- struct ConversionHelper<
- T,
- typename std::enable_if<
- (!std::is_integral<T>::value || std::is_same<T, bool>::value) &&
- !std::is_same<T, float>::value &&
- !std::is_same<T, std::nullptr_t>::value>::type> {
- typedef T type;
- };
- template<class T>
- struct ConversionHelper<
- T,
- typename std::enable_if<
- std::is_same<T,std::nullptr_t>::value
- >::type
- > {
- typedef void* type;
- };
-
/*
* Helper for implementing numeric conversions in operators on
* numbers. Just promotes to double when one of the arguments is
friend struct dynamic;
explicit ObjectMaker() : val_(dynamic::object) {}
- explicit ObjectMaker(dynamic const& key, dynamic val)
- : val_(dynamic::object)
- {
- val_.insert(key, std::move(val));
- }
- explicit ObjectMaker(dynamic&& key, dynamic val)
+ explicit ObjectMaker(dynamic key, dynamic val)
: val_(dynamic::object)
{
val_.insert(std::move(key), std::move(val));
ObjectMaker& operator=(ObjectMaker const&) = delete;
ObjectMaker& operator=(ObjectMaker&&) = delete;
- // These return rvalue-references instead of lvalue-references to allow
- // constructs like this to moved instead of copied:
+ // This returns an rvalue-reference instead of an lvalue-reference
+ // to allow constructs like this to moved instead of copied:
// dynamic a = dynamic::object("a", "b")("c", "d")
- ObjectMaker&& operator()(dynamic const& key, dynamic val) {
- val_.insert(key, std::move(val));
- return std::move(*this);
- }
-
- ObjectMaker&& operator()(dynamic&& key, dynamic val) {
+ ObjectMaker&& operator()(dynamic key, dynamic val) {
val_.insert(std::move(key), std::move(val));
return std::move(*this);
}
template <class... Args>
inline dynamic dynamic::array(Args&& ...args) {
- return dynamic(Array{std::forward<Args>(args)...}, PrivateTag());
+ return dynamic(Array{std::forward<Args>(args)...});
}
-// This looks like a case for perfect forwarding, but our use of
-// std::initializer_list for constructing dynamic arrays makes it less
-// functional than doing this manually.
-
-// TODO(ott, 10300209): When the initializer_list constructor is gone,
-// simplify this.
inline dynamic::ObjectMaker dynamic::object() { return ObjectMaker(); }
-inline dynamic::ObjectMaker dynamic::object(dynamic&& a, dynamic&& b) {
+inline dynamic::ObjectMaker dynamic::object(dynamic a, dynamic b) {
return ObjectMaker(std::move(a), std::move(b));
}
-inline dynamic::ObjectMaker dynamic::object(dynamic const& a, dynamic&& b) {
- return ObjectMaker(a, std::move(b));
-}
-inline dynamic::ObjectMaker dynamic::object(dynamic&& a, dynamic const& b) {
- return ObjectMaker(std::move(a), b);
-}
-inline dynamic::ObjectMaker
-dynamic::object(dynamic const& a, dynamic const& b) {
- return ObjectMaker(a, b);
-}
//////////////////////////////////////////////////////////////////////
+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 {
//////////////////////////////////////////////////////////////////////
+inline dynamic::dynamic() : dynamic(nullptr) {}
+
+inline dynamic::dynamic(std::nullptr_t) : type_(NULLT) {}
+
inline dynamic::dynamic(void (*)(EmptyArrayTag))
: type_(ARRAY)
{
new (&u_.string) std::string(s);
}
-inline dynamic::dynamic(std::string const& s)
+inline dynamic::dynamic(std::string s)
: type_(STRING)
{
- new (&u_.string) std::string(s);
-}
-
-inline dynamic::dynamic(std::string&& s) : type_(STRING) {
new (&u_.string) std::string(std::move(s));
}
-inline dynamic::dynamic(std::initializer_list<dynamic> il)
- : dynamic(Array(std::move(il)), PrivateTag()) {}
-
-inline dynamic& dynamic::operator=(std::initializer_list<dynamic> il) {
- (*this) = dynamic(Array(std::move(il)), PrivateTag());
- return *this;
-}
-
inline dynamic::dynamic(ObjectMaker&& maker)
: type_(OBJECT)
{
inline dynamic::~dynamic() noexcept { destroy(); }
-template<class T>
+// Integral types except bool convert to int64_t, float types to double.
+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 <>
+struct dynamic::NumericTypeHelper<bool> {
+ using type = bool;
+};
+template <>
+struct dynamic::NumericTypeHelper<float> {
+ using type = double;
+};
+template <>
+struct dynamic::NumericTypeHelper<double> {
+ using type = double;
+};
+
+template<class T, class NumericType /* = typename NumericTypeHelper<T>::type */>
dynamic::dynamic(T t) {
- typedef typename detail::ConversionHelper<T>::type U;
- type_ = TypeInfo<U>::type;
- new (getAddress<U>()) U(std::move(t));
+ type_ = TypeInfo<NumericType>::type;
+ new (getAddress<NumericType>()) NumericType(NumericType(t));
}
-template<class Iterator>
+template <class Iterator>
dynamic::dynamic(Iterator first, Iterator last)
: type_(ARRAY)
{
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>();
+ return get_nothrow<std::string>() != nullptr;
+}
+inline bool dynamic::isObject() const {
+ return get_nothrow<ObjectImpl>() != nullptr;
+}
+inline bool dynamic::isBool() const {
+ return get_nothrow<bool>() != nullptr;
+}
+inline bool dynamic::isArray() const {
+ return get_nothrow<Array>() != nullptr;
+}
+inline bool dynamic::isDouble() const {
+ return get_nothrow<double>() != nullptr;
+}
+inline bool dynamic::isInt() const {
+ return get_nothrow<int64_t>() != nullptr;
+}
+inline bool dynamic::isNull() const {
+ return get_nothrow<std::nullptr_t>() != nullptr;
+}
+inline bool dynamic::isNumber() const {
+ return isInt() || isDouble();
}
-inline bool dynamic::isObject() const { return get_nothrow<ObjectImpl>(); }
-inline bool dynamic::isBool() const { return get_nothrow<bool>(); }
-inline bool dynamic::isArray() const { return get_nothrow<Array>(); }
-inline bool dynamic::isDouble() const { return get_nothrow<double>(); }
-inline bool dynamic::isInt() const { return get_nothrow<int64_t>(); }
-inline bool dynamic::isNull() const { return get_nothrow<void*>(); }
-inline bool dynamic::isNumber() const { return isInt() || isDouble(); }
inline dynamic::Type dynamic::type() const {
return type_;
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) {
}
inline std::size_t dynamic::count(dynamic const& key) const {
- return find(key) != items().end();
+ return find(key) != items().end() ? 1u : 0u;
}
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) {
auto& obj = get<ObjectImpl>();
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) {
//////////////////////////////////////////////////////////////////////
-inline dynamic::dynamic(Array&& r, PrivateTag) : type_(ARRAY) {
+inline dynamic::dynamic(Array&& r) : type_(ARRAY) {
new (&u_.array) Array(std::move(r));
}
}; \
//
-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(std::string, "string", dynamic::STRING)
FOLLY_DYNAMIC_DEC_TYPEINFO(dynamic::Array, "array", dynamic::ARRAY)
FOLLY_DYNAMIC_DEC_TYPEINFO(double, "double", dynamic::DOUBLE)
FOLLY_DYNAMIC_DEC_TYPEINFO(int64_t, "int64", dynamic::INT64)
}
template<class T> struct dynamic::GetAddrImpl {};
-template<> struct dynamic::GetAddrImpl<void*> {
- static void** get(Data& d) noexcept { return &d.nul; }
+template<> struct dynamic::GetAddrImpl<std::nullptr_t> {
+ static std::nullptr_t* get(Data& d) noexcept { return &d.nul; }
};
template<> struct dynamic::GetAddrImpl<dynamic::Array> {
static Array* get(Data& d) noexcept { return &d.array; }
};
// 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";
}
};
projects / folly.git / blobdiff