/*
- * 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.
#include <boost/algorithm/string.hpp>
#include <folly/Conv.h>
+#include <folly/Portability.h>
#include <folly/Range.h>
#include <folly/String.h>
#include <folly/Unicode.h>
+#include <folly/portability/Constexpr.h>
namespace folly {
}
struct Printer {
- explicit Printer(fbstring& out,
- unsigned* indentLevel,
- serialization_opts const* opts)
- : out_(out)
- , indentLevel_(indentLevel)
- , opts_(*opts)
- {}
+ explicit Printer(
+ std::string& out,
+ unsigned* indentLevel,
+ serialization_opts const* opts)
+ : out_(out), indentLevel_(indentLevel), opts_(*opts) {}
void operator()(dynamic const& v) const {
switch (v.type()) {
void newline() const {
if (indentLevel_) {
- out_ += to<fbstring>('\n', fbstring(*indentLevel_ * 2, ' '));
+ out_ += to<std::string>('\n', std::string(*indentLevel_ * 2, ' '));
}
}
}
private:
- fbstring& out_;
- unsigned* const indentLevel_;
- serialization_opts const& opts_;
+ std::string& out_;
+ unsigned* const indentLevel_;
+ serialization_opts const& opts_;
};
//////////////////////////////////////////////////////////////////////
return opts_;
}
-private:
+ void incrementRecursionLevel() {
+ if (currentRecursionLevel_ > opts_.recursion_limit) {
+ error("recursion limit exceeded");
+ }
+ currentRecursionLevel_++;
+ }
+
+ void decrementRecursionLevel() {
+ currentRecursionLevel_--;
+ }
+
+ private:
void storeCurrent() {
current_ = range_.empty() ? EOF : range_.front();
}
json::serialization_opts const& opts_;
unsigned lineNum_;
int current_;
+ unsigned int currentRecursionLevel_{0};
+};
+
+class RecursionGuard {
+ public:
+ explicit RecursionGuard(Input& in) : in_(in) {
+ in_.incrementRecursionLevel();
+ }
+
+ ~RecursionGuard() {
+ in_.decrementRecursionLevel();
+ }
+
+ private:
+ Input& in_;
};
dynamic parseValue(Input& in);
-fbstring parseString(Input& in);
+std::string parseString(Input& in);
dynamic parseNumber(Input& in);
dynamic parseObject(Input& in) {
assert(*in == '[');
++in;
- dynamic ret = {};
+ dynamic ret = dynamic::array;
in.skipWhitespace();
if (*in == ']') {
dynamic parseNumber(Input& in) {
bool const negative = (*in == '-');
- if (negative) {
- if (in.consume("-Infinity")) {
+ if (negative && in.consume("-Infinity")) {
+ if (in.getOpts().parse_numbers_as_strings) {
+ return "-Infinity";
+ } else {
return -std::numeric_limits<double>::infinity();
}
}
auto const wasE = *in == 'e' || *in == 'E';
constexpr const char* maxInt = "9223372036854775807";
- constexpr const char* minInt = "9223372036854775808";
- constexpr auto maxIntLen = __builtin_strlen(maxInt);
+ constexpr const char* minInt = "-9223372036854775808";
+ constexpr auto maxIntLen = constexpr_strlen(maxInt);
+ constexpr auto minIntLen = constexpr_strlen(minInt);
+
+ if (*in != '.' && !wasE && in.getOpts().parse_numbers_as_strings) {
+ return integral;
+ }
if (*in != '.' && !wasE) {
if (LIKELY(!in.getOpts().double_fallback || integral.size() < maxIntLen) ||
- (integral.size() == maxIntLen &&
- (integral <= maxInt || (integral == minInt && negative)))) {
+ (!negative && integral.size() == maxIntLen && integral <= maxInt) ||
+ (negative && integral.size() == minIntLen && integral <= minInt)) {
auto val = to<int64_t>(integral);
in.skipWhitespace();
return val;
end = expPart.end();
}
auto fullNum = range(integral.begin(), end);
-
+ if (in.getOpts().parse_numbers_as_strings) {
+ return fullNum;
+ }
auto val = to<double>(fullNum);
return val;
}
-fbstring decodeUnicodeEscape(Input& in) {
- auto hexVal = [&] (char c) -> unsigned {
+std::string decodeUnicodeEscape(Input& in) {
+ auto hexVal = [&] (int c) -> uint16_t {
return c >= '0' && c <= '9' ? c - '0' :
c >= 'a' && c <= 'f' ? c - 'a' + 10 :
c >= 'A' && c <= 'F' ? c - 'A' + 10 :
return codePointToUtf8(codePoint);
}
-fbstring parseString(Input& in) {
+std::string parseString(Input& in) {
assert(*in == '\"');
++in;
- fbstring ret;
+ std::string ret;
for (;;) {
auto range = in.skipWhile(
[] (char c) { return c != '\"' && c != '\\'; }
case 'r': ret.push_back('\r'); ++in; break;
case 't': ret.push_back('\t'); ++in; break;
case 'u': ++in; ret += decodeUnicodeEscape(in); break;
- default: in.error(to<fbstring>("unknown escape ", *in,
- " in string").c_str());
+ default:
+ in.error(to<std::string>("unknown escape ", *in, " in string").c_str());
}
continue;
}
in.error("null byte in string");
}
- ret.push_back(*in);
+ ret.push_back(char(*in));
++in;
}
}
dynamic parseValue(Input& in) {
+ RecursionGuard guard(in);
+
in.skipWhitespace();
return *in == '[' ? parseArray(in) :
*in == '{' ? parseObject(in) :
in.consume("true") ? true :
in.consume("false") ? false :
in.consume("null") ? nullptr :
- in.consume("Infinity") ? std::numeric_limits<double>::infinity() :
- in.consume("NaN") ? std::numeric_limits<double>::quiet_NaN() :
+ in.consume("Infinity") ?
+ (in.getOpts().parse_numbers_as_strings ? (dynamic)"Infinity" :
+ (dynamic)std::numeric_limits<double>::infinity()) :
+ in.consume("NaN") ?
+ (in.getOpts().parse_numbers_as_strings ? (dynamic)"NaN" :
+ (dynamic)std::numeric_limits<double>::quiet_NaN()) :
in.error("expected json value");
}
//////////////////////////////////////////////////////////////////////
-fbstring serialize(dynamic const& dyn, serialization_opts const& opts) {
- fbstring ret;
+std::string serialize(dynamic const& dyn, serialization_opts const& opts) {
+ std::string ret;
unsigned indentLevel = 0;
Printer p(ret, opts.pretty_formatting ? &indentLevel : nullptr, &opts);
p(dyn);
}
// Escape a string so that it is legal to print it in JSON text.
-void escapeString(StringPiece input,
- fbstring& out,
- const serialization_opts& opts) {
+void escapeString(
+ StringPiece input,
+ std::string& out,
+ const serialization_opts& opts) {
auto hexDigit = [] (int c) -> char {
return c < 10 ? c + '0' : c - 10 + 'a';
};
- out.reserve(out.size() + input.size() + 2);
out.push_back('\"');
auto* p = reinterpret_cast<const unsigned char*>(input.begin());
// checking that utf8 encodings are valid
char32_t v = decodeUtf8(q, e, opts.skip_invalid_utf8);
if (opts.skip_invalid_utf8 && v == U'\ufffd') {
- out.append("\ufffd");
+ out.append(u8"\ufffd");
p = q;
continue;
}
out.push_back('\"');
}
-fbstring stripComments(StringPiece jsonC) {
- fbstring result;
+std::string stripComments(StringPiece jsonC) {
+ std::string result;
enum class State {
None,
InString,
return ret;
}
-fbstring toJson(dynamic const& dyn) {
+std::string toJson(dynamic const& dyn) {
return json::serialize(dyn, json::serialization_opts());
}
-fbstring toPrettyJson(dynamic const& dyn) {
+std::string toPrettyJson(dynamic const& dyn) {
json::serialization_opts opts;
opts.pretty_formatting = true;
return json::serialize(dyn, opts);
out << json::serialize(*this, opts);
}
+void PrintTo(const dynamic& dyn, std::ostream* os) {
+ json::serialization_opts opts;
+ opts.allow_nan_inf = true;
+ opts.allow_non_string_keys = true;
+ opts.pretty_formatting = true;
+ opts.sort_keys = true;
+ *os << json::serialize(dyn, opts);
+}
+
//////////////////////////////////////////////////////////////////////
}