/*
- * Copyright 2015 Facebook, Inc.
+ * Copyright 2016 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* limitations under the License.
*/
-#ifndef FOLLY_DYNAMIC_INL_H_
-#define FOLLY_DYNAMIC_INL_H_
+#pragma once
#include <functional>
#include <boost/iterator/iterator_adaptor.hpp>
// This is a higher-order preprocessor macro to aid going from runtime
// types to the compile time type system.
-#define FB_DYNAMIC_APPLY(type, apply) do { \
- switch ((type)) { \
- case NULLT: apply(void*); break; \
- case ARRAY: apply(Array); break; \
- case BOOL: apply(bool); break; \
- case DOUBLE: apply(double); break; \
- case INT64: apply(int64_t); break; \
- case OBJECT: apply(ObjectImpl); break; \
- case STRING: apply(fbstring); break; \
- default: CHECK(0); abort(); \
- } \
-} while (0)
+#define FB_DYNAMIC_APPLY(type, apply) \
+ do { \
+ switch ((type)) { \
+ case NULLT: \
+ apply(void*); \
+ break; \
+ case ARRAY: \
+ apply(Array); \
+ break; \
+ case BOOL: \
+ apply(bool); \
+ break; \
+ case DOUBLE: \
+ apply(double); \
+ break; \
+ case INT64: \
+ apply(int64_t); \
+ break; \
+ case OBJECT: \
+ apply(ObjectImpl); \
+ break; \
+ case STRING: \
+ apply(std::string); \
+ break; \
+ default: \
+ CHECK(0); \
+ abort(); \
+ } \
+ } while (0)
//////////////////////////////////////////////////////////////////////
> {
typedef int64_t type;
};
- template<class T>
+ 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,std::nullptr_t>::value
- >::type
- > {
+ 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>
dynamic val_;
};
+inline void dynamic::array(EmptyArrayTag) {}
+
+template <class... Args>
+inline dynamic dynamic::array(Args&& ...args) {
+ return dynamic(Array{std::forward<Args>(args)...}, PrivateTag());
+}
+
// 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) {
return ObjectMaker(std::move(a), std::move(b));
//////////////////////////////////////////////////////////////////////
+inline dynamic::dynamic(void (*)(EmptyArrayTag))
+ : type_(ARRAY)
+{
+ new (&u_.array) Array();
+}
+
inline dynamic::dynamic(ObjectMaker (*)())
: type_(OBJECT)
{
inline dynamic::dynamic(StringPiece s)
: type_(STRING)
{
- new (&u_.string) fbstring(s.data(), s.size());
+ new (&u_.string) std::string(s.data(), s.size());
}
inline dynamic::dynamic(char const* s)
: type_(STRING)
{
- new (&u_.string) fbstring(s);
+ new (&u_.string) std::string(s);
}
inline dynamic::dynamic(std::string const& s)
: type_(STRING)
{
- new (&u_.string) fbstring(s);
+ new (&u_.string) std::string(s);
}
-inline dynamic::dynamic(fbstring const& s)
- : type_(STRING)
-{
- new (&u_.string) fbstring(s);
+inline dynamic::dynamic(std::string&& s) : type_(STRING) {
+ new (&u_.string) std::string(std::move(s));
}
-inline dynamic::dynamic(fbstring&& s)
- : type_(STRING)
-{
- new (&u_.string) fbstring(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(il);
+ (*this) = dynamic(Array(std::move(il)), PrivateTag());
return *this;
}
-inline dynamic::dynamic(std::initializer_list<dynamic> il)
- : type_(ARRAY)
-{
- new (&u_.array) Array(il.begin(), il.end());
-}
-
inline dynamic::dynamic(ObjectMaker&& maker)
: type_(OBJECT)
{
return &(get<ObjectImpl>());
}
-inline bool dynamic::isString() const { return get_nothrow<fbstring>(); }
+inline bool dynamic::isString() const {
+ return get_nothrow<std::string>();
+}
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>(); }
return type_;
}
-inline fbstring dynamic::asString() const { return asImpl<fbstring>(); }
-inline double dynamic::asDouble() const { return asImpl<double>(); }
-inline int64_t dynamic::asInt() const { return asImpl<int64_t>(); }
-inline bool dynamic::asBool() const { return asImpl<bool>(); }
+inline std::string dynamic::asString() const {
+ return asImpl<std::string>();
+}
+inline double dynamic::asDouble() const {
+ return asImpl<double>();
+}
+inline int64_t dynamic::asInt() const {
+ return asImpl<int64_t>();
+}
+inline bool dynamic::asBool() const {
+ return asImpl<bool>();
+}
-inline const fbstring& dynamic::getString() const& { return get<fbstring>(); }
+inline const std::string& dynamic::getString() const& {
+ return get<std::string>();
+}
inline double dynamic::getDouble() const& { return get<double>(); }
inline int64_t dynamic::getInt() const& { return get<int64_t>(); }
inline bool dynamic::getBool() const& { return get<bool>(); }
-inline fbstring& dynamic::getString() & { return get<fbstring>(); }
+inline std::string& dynamic::getString()& {
+ return get<std::string>();
+}
inline double& dynamic::getDouble() & { return get<double>(); }
inline int64_t& dynamic::getInt() & { return get<int64_t>(); }
inline bool& dynamic::getBool() & { return get<bool>(); }
-inline fbstring dynamic::getString() && { return std::move(get<fbstring>()); }
+inline std::string dynamic::getString()&& {
+ return std::move(get<std::string>());
+}
inline double dynamic::getDouble() && { return get<double>(); }
inline int64_t dynamic::getInt() && { return get<int64_t>(); }
inline bool dynamic::getBool() && { return get<bool>(); }
-inline const char* dynamic::data() const& { return get<fbstring>().data(); }
-inline const char* dynamic::c_str() const& { return get<fbstring>().c_str(); }
-inline StringPiece dynamic::stringPiece() const { return get<fbstring>(); }
+inline const char* dynamic::data() const& {
+ return get<std::string>().data();
+}
+inline const char* dynamic::c_str() const& {
+ return get<std::string>().c_str();
+}
+inline StringPiece dynamic::stringPiece() const {
+ return get<std::string>();
+}
template<class T>
struct dynamic::CompareOp {
inline dynamic& dynamic::operator+=(dynamic const& o) {
if (type() == STRING && o.type() == STRING) {
- *getAddress<fbstring>() += *o.getAddress<fbstring>();
+ *getAddress<std::string>() += *o.getAddress<std::string>();
return *this;
}
*this = detail::numericOp<std::plus>(*this, o);
std::forward<V>(v))).first->second;
}
+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) {
+ auto& obj = get<ObjectImpl>();
+ return obj.insert(std::make_pair(std::forward<K>(k), v)).first->second;
+}
+
inline dynamic* dynamic::get_ptr(dynamic const& idx) & {
return const_cast<dynamic*>(const_cast<dynamic const*>(this)->get_ptr(idx));
}
}
inline void dynamic::resize(std::size_t sz, dynamic const& c) {
- auto& arr
ay = get<Array>();
- array.resize(sz, c);
+ auto& arr = get<Array>();
+ arr.resize(sz, c);
}
inline void dynamic::push_back(dynamic const& v) {
- auto& arr
ay = get<Array>();
- array.push_back(v);
+ auto& arr = get<Array>();
+ arr.push_back(v);
}
inline void dynamic::push_back(dynamic&& v) {
- auto& arr
ay = get<Array>();
- array.push_back(std::move(v));
+ auto& arr = get<Array>();
+ arr.push_back(std::move(v));
}
inline void dynamic::pop_back() {
- auto& arr
ay = get<Array>();
- array.pop_back();
+ auto& arr = get<Array>();
+ arr.pop_back();
}
//////////////////////////////////////////////////////////////////////
+inline dynamic::dynamic(Array&& r, PrivateTag) : type_(ARRAY) {
+ new (&u_.array) Array(std::move(r));
+}
+
#define FOLLY_DYNAMIC_DEC_TYPEINFO(T, str, val) \
template <> struct dynamic::TypeInfo<T> { \
static constexpr const char* name = str; \
FOLLY_DYNAMIC_DEC_TYPEINFO(void*, "null", dynamic::NULLT)
FOLLY_DYNAMIC_DEC_TYPEINFO(bool, "boolean", dynamic::BOOL)
-FOLLY_DYNAMIC_DEC_TYPEINFO(fbstring, "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)
case INT64: return to<T>(*get_nothrow<int64_t>());
case DOUBLE: return to<T>(*get_nothrow<double>());
case BOOL: return to<T>(*get_nothrow<bool>());
- case STRING: return to<T>(*get_nothrow<fbstring>());
+ case STRING:
+ return to<T>(*get_nothrow<std::string>());
default:
throw TypeError("int/double/bool/string", type());
}
template<> struct dynamic::GetAddrImpl<double> {
static double* get(Data& d) noexcept { return &d.doubl; }
};
-template<> struct dynamic::GetAddrImpl<fbstring> {
- static fbstring* get(Data& d) noexcept { return &d.string; }
+template <>
+struct dynamic::GetAddrImpl<std::string> {
+ static std::string* get(Data& d) noexcept {
+ return &d.string;
+ }
};
template<> struct dynamic::GetAddrImpl<dynamic::ObjectImpl> {
static_assert(sizeof(ObjectImpl) <= sizeof(Data::objectBuffer),
// Otherwise, null, being (void*)0, would print as 0.
template <>
struct dynamic::PrintImpl<void*> {
- static void print(dynamic const& d, std::ostream& out, void* const& nul) {
+ static void print(dynamic const& /* d */,
+ std::ostream& out,
+ void* const& nul) {
DCHECK_EQ((void*)0, nul);
out << "null";
}
FormatValue<int64_t>(val_.asInt()).format(arg, cb);
break;
case dynamic::STRING:
- FormatValue<fbstring>(val_.asString()).format(arg, cb);
+ FormatValue<std::string>(val_.asString()).format(arg, cb);
break;
case dynamic::DOUBLE:
FormatValue<double>(val_.asDouble()).format(arg, cb);
FormatValue(val_.at(arg.splitIntKey())).format(arg, cb);
break;
case dynamic::OBJECT:
- FormatValue(val_.at(arg.splitKey().toFbstring())).format(arg, cb);
+ FormatValue(val_.at(arg.splitKey().toString())).format(arg, cb);
break;
}
}
} // namespaces
#undef FB_DYNAMIC_APPLY
-
-#endif
projects / folly.git / blobdiff