#define FOLLY_RANGE_CHECK_STRINGIZE(x) #x
#define FOLLY_RANGE_CHECK_STRINGIZE2(x) FOLLY_RANGE_CHECK_STRINGIZE(x)
-#define FOLLY_RANGE_CHECK(condition, message) \
+#define FOLLY_RANGE_CHECK(condition, message, src) \
((condition) ? (void)0 : throw std::range_error( \
(std::string(__FILE__ "(" FOLLY_RANGE_CHECK_STRINGIZE2(__LINE__) "): ") \
- + (message)).c_str()))
+ + (message) + ": '" + (src) + "'").c_str()))
+
+#define FOLLY_RANGE_CHECK_BEGIN_END(condition, message, b, e) \
+ FOLLY_RANGE_CHECK(condition, message, std::string((b), (e) - (b)))
+
+#define FOLLY_RANGE_CHECK_STRINGPIECE(condition, message, sp) \
+ FOLLY_RANGE_CHECK(condition, message, std::string((sp).data(), (sp).size()))
namespace folly {
< std::numeric_limits<Src>::max()) {
FOLLY_RANGE_CHECK(
(!greater_than<Tgt, std::numeric_limits<Tgt>::max()>(value)),
- "Overflow"
+ "Overflow", std::to_string(value)
);
}
/* static */ if (std::is_signed<Src>::value &&
(!std::is_signed<Tgt>::value || sizeof(Src) > sizeof(Tgt))) {
FOLLY_RANGE_CHECK(
(!less_than<Tgt, std::numeric_limits<Tgt>::min()>(value)),
- "Negative overflow"
+ "Negative overflow", std::to_string(value)
);
}
return static_cast<Tgt>(value);
/* static */ if (std::numeric_limits<Tgt>::max() <
std::numeric_limits<Src>::max()) {
FOLLY_RANGE_CHECK(value <= std::numeric_limits<Tgt>::max(),
- "Overflow");
+ "Overflow", std::to_string(value));
FOLLY_RANGE_CHECK(value >= -std::numeric_limits<Tgt>::max(),
- "Negative overflow");
+ "Negative overflow", std::to_string(value));
}
return boost::implicit_cast<Tgt>(value);
}
if (*b != '0') return digits_to<Tgt>(b, e);
}
}
- FOLLY_RANGE_CHECK(size == std::numeric_limits<Tgt>::digits10 + 1 &&
- strncmp(b, detail::MaxString<Tgt>::value, size) <= 0,
- "Numeric overflow upon conversion");
+ FOLLY_RANGE_CHECK_BEGIN_END(
+ size == std::numeric_limits<Tgt>::digits10 + 1 &&
+ strncmp(b, detail::MaxString<Tgt>::value, size) <= 0,
+ "Numeric overflow upon conversion", b, e);
}
// Here we know that the number won't overflow when
}
assert(b == e);
- FOLLY_RANGE_CHECK(size > 0, "Found no digits to convert in input");
+ FOLLY_RANGE_CHECK_BEGIN_END(size > 0,
+ "Found no digits to convert in input", b, e);
return result;
}
std::is_integral<Tgt>::value && std::is_signed<Tgt>::value,
Tgt>::type
to(const char * b, const char * e) {
- FOLLY_RANGE_CHECK(b < e, "Empty input string in conversion to integral");
+ FOLLY_RANGE_CHECK(b < e, "Empty input string in conversion to integral",
+ to<std::string>("b: ", intptr_t(b), " e: ", intptr_t(e)));
if (!isdigit(*b)) {
if (*b == '-') {
Tgt result = -to<typename std::make_unsigned<Tgt>::type>(b + 1, e);
- FOLLY_RANGE_CHECK(result <= 0, "Negative overflow.");
+ FOLLY_RANGE_CHECK_BEGIN_END(result <= 0, "Negative overflow.", b, e);
return result;
}
- FOLLY_RANGE_CHECK(*b == '+', "Invalid lead character");
+ FOLLY_RANGE_CHECK_BEGIN_END(*b == '+', "Invalid lead character", b, e);
++b;
}
Tgt result = to<typename std::make_unsigned<Tgt>::type>(b, e);
- FOLLY_RANGE_CHECK(result >= 0, "Overflow.");
+ FOLLY_RANGE_CHECK_BEGIN_END(result >= 0, "Overflow", b, e);
return result;
}
auto b = src->data(), past = src->data() + src->size();
for (;; ++b) {
- FOLLY_RANGE_CHECK(b < past, "No digits found in input string");
+ FOLLY_RANGE_CHECK_STRINGPIECE(b < past,
+ "No digits found in input string", *src);
if (!isspace(*b)) break;
}
if (*m == '-') {
negative = true;
} else {
- FOLLY_RANGE_CHECK(*m == '+', "Invalid leading character in conversion"
- " to integral");
+ FOLLY_RANGE_CHECK_STRINGPIECE(*m == '+', "Invalid leading character in "
+ "conversion to integral", *src);
}
++b;
++m;
}
}
- FOLLY_RANGE_CHECK(m < past, "No digits found in input string");
- FOLLY_RANGE_CHECK(isdigit(*m), "Non-digit character found");
+ FOLLY_RANGE_CHECK_STRINGPIECE(m < past, "No digits found in input string",
+ *src);
+ FOLLY_RANGE_CHECK_STRINGPIECE(isdigit(*m), "Non-digit character found", *src);
m = detail::findFirstNonDigit<Tgt>(m + 1, past);
Tgt result;
auto t = detail::digits_to<typename std::make_unsigned<Tgt>::type>(b, m);
if (negative) {
result = -t;
- FOLLY_RANGE_CHECK(is_non_positive(result), "Negative overflow");
+ FOLLY_RANGE_CHECK_STRINGPIECE(is_non_positive(result),
+ "Negative overflow", *src);
} else {
result = t;
- FOLLY_RANGE_CHECK(is_non_negative(result), "Overflow");
+ FOLLY_RANGE_CHECK_STRINGPIECE(is_non_negative(result), "Overflow", *src);
}
}
src->advance(m - src->data());
*/
inline void enforceWhitespace(const char* b, const char* e) {
for (; b != e; ++b) {
- FOLLY_RANGE_CHECK(isspace(*b), to<std::string>("Non-whitespace: ", *b));
+ FOLLY_RANGE_CHECK_BEGIN_END(isspace(*b),
+ to<std::string>("Non-whitespace: ", *b),
+ b, e);
}
}
std::numeric_limits<double>::quiet_NaN(),
nullptr, nullptr);
- FOLLY_RANGE_CHECK(!src->empty(), "No digits found in input string");
+ FOLLY_RANGE_CHECK_STRINGPIECE(!src->empty(),
+ "No digits found in input string", *src);
int length;
auto result = conv.StringToDouble(src->data(),
// to avoid defining this global macro name in other files that include Conv.h.
#ifndef FOLLY_CONV_INTERNAL
#undef FOLLY_RANGE_CHECK
-#undef FOLLY_RANGE_CHECK_STRINGIZE2
+#undef FOLLY_RANGE_CHECK_BEGIN_END
+#undef FOLLY_RANGE_CHECK_STRINGPIECE
#undef FOLLY_RANGE_CHECK_STRINGIZE
+#undef FOLLY_RANGE_CHECK_STRINGIZE2
#endif
#endif /* FOLLY_BASE_CONV_H_ */