From 6198439f59be82dd82e102a0c07bfe1c5bb48f5d Mon Sep 17 00:00:00 2001
From: Mihai STAN <mstan@bitdefender.com>
Date: Tue, 3 Jan 2017 00:49:33 +0200
Subject: [PATCH] fix #414 - comparing to 0 literal
Overload comparison operators for all types that could be converted
to nullptr.
---
src/json.hpp | 1403 +++++++++++-----------------------
src/json.hpp.re2c | 65 +-
test/src/unit-regression.cpp | 18 +
3 files changed, 490 insertions(+), 996 deletions(-)
diff --git a/src/json.hpp b/src/json.hpp
index 9d48e7a6..a0f57a18 100644
--- a/src/json.hpp
+++ b/src/json.hpp
@@ -5625,36 +5625,23 @@ class basic_json
return false;
}
- /*!
- @brief comparison: equal
-
- The functions compares the given JSON value against a null pointer. As the
- null pointer can be used to initialize a JSON value to null, a comparison
- of JSON value @a v with a null pointer should be equivalent to call
- `v.is_null()`.
-
- @param[in] v JSON value to consider
- @return whether @a v is null
-
- @complexity Constant.
-
- @liveexample{The example compares several JSON types to the null pointer.
- ,operator__equal__nullptr_t}
-
- @since version 1.0.0
+ /*!@brief comparison: equal
+ @copydoc operator==(const_reference, const_reference)
*/
- friend bool operator==(const_reference v, std::nullptr_t) noexcept
- {
- return v.is_null();
+ template<typename ScalarType, typename std::enable_if<
+ std::is_scalar<ScalarType>::value, int>::type = 0>
+ friend bool operator==(const_reference lhs, const ScalarType rhs) noexcept {
+ return (lhs == basic_json(rhs));
}
/*!
@brief comparison: equal
- @copydoc operator==(const_reference, std::nullptr_t)
+ @copydoc operator==(const_reference, const_reference)
*/
- friend bool operator==(std::nullptr_t, const_reference v) noexcept
- {
- return v.is_null();
+ template<typename ScalarType, typename std::enable_if<
+ std::is_scalar<ScalarType>::value, int>::type = 0>
+ friend bool operator==(const ScalarType lhs, const_reference rhs) noexcept {
+ return (basic_json(lhs) == rhs);
}
/*!
@@ -5680,34 +5667,24 @@ class basic_json
/*!
@brief comparison: not equal
-
- The functions compares the given JSON value against a null pointer. As the
- null pointer can be used to initialize a JSON value to null, a comparison
- of JSON value @a v with a null pointer should be equivalent to call
- `not v.is_null()`.
-
- @param[in] v JSON value to consider
- @return whether @a v is not null
-
- @complexity Constant.
-
- @liveexample{The example compares several JSON types to the null pointer.
- ,operator__notequal__nullptr_t}
-
- @since version 1.0.0
+ @copydoc operator!=(const_reference, const_reference)
*/
- friend bool operator!=(const_reference v, std::nullptr_t) noexcept
+ template<typename ScalarType, typename std::enable_if<
+ std::is_scalar<ScalarType>::value, int>::type = 0>
+ friend bool operator!=(const_reference lhs, const ScalarType rhs) noexcept
{
- return not v.is_null();
+ return (lhs != basic_json(rhs));
}
/*!
@brief comparison: not equal
- @copydoc operator!=(const_reference, std::nullptr_t)
+ @copydoc operator!=(const_reference, const_reference)
*/
- friend bool operator!=(std::nullptr_t, const_reference v) noexcept
+ template<typename ScalarType, typename std::enable_if<
+ std::is_scalar<ScalarType>::value, int>::type = 0>
+ friend bool operator!=(const ScalarType lhs, const_reference rhs) noexcept
{
- return not v.is_null();
+ return (basic_json(lhs) != rhs);
}
/*!
@@ -9249,915 +9226,437 @@ class basic_json
m_start = m_cursor;
assert(m_start != nullptr);
-
- {
- lexer_char_t yych;
- unsigned int yyaccept = 0;
- static const unsigned char yybm[] =
- {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 32, 32, 0, 0, 32, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 160, 128, 0, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 192, 192, 192, 192, 192, 192, 192, 192,
- 192, 192, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 0, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- };
- if ((m_limit - m_cursor) < 5)
- {
- fill_line_buffer(5); // LCOV_EXCL_LINE
- }
- yych = *m_cursor;
- if (yybm[0 + yych] & 32)
- {
- goto basic_json_parser_6;
- }
- if (yych <= '[')
- {
- if (yych <= '-')
- {
- if (yych <= '"')
- {
- if (yych <= 0x00)
- {
- goto basic_json_parser_2;
- }
- if (yych <= '!')
- {
- goto basic_json_parser_4;
- }
- goto basic_json_parser_9;
- }
- else
- {
- if (yych <= '+')
- {
- goto basic_json_parser_4;
- }
- if (yych <= ',')
- {
- goto basic_json_parser_10;
- }
- goto basic_json_parser_12;
- }
- }
- else
- {
- if (yych <= '9')
- {
- if (yych <= '/')
- {
- goto basic_json_parser_4;
- }
- if (yych <= '0')
- {
- goto basic_json_parser_13;
- }
- goto basic_json_parser_15;
- }
- else
- {
- if (yych <= ':')
- {
- goto basic_json_parser_17;
- }
- if (yych <= 'Z')
- {
- goto basic_json_parser_4;
- }
- goto basic_json_parser_19;
- }
- }
- }
- else
- {
- if (yych <= 'n')
- {
- if (yych <= 'e')
- {
- if (yych == ']')
- {
- goto basic_json_parser_21;
- }
- goto basic_json_parser_4;
- }
- else
- {
- if (yych <= 'f')
- {
- goto basic_json_parser_23;
- }
- if (yych <= 'm')
- {
- goto basic_json_parser_4;
- }
- goto basic_json_parser_24;
- }
- }
- else
- {
- if (yych <= 'z')
- {
- if (yych == 't')
- {
- goto basic_json_parser_25;
- }
- goto basic_json_parser_4;
- }
- else
- {
- if (yych <= '{')
- {
- goto basic_json_parser_26;
- }
- if (yych == '}')
- {
- goto basic_json_parser_28;
- }
- goto basic_json_parser_4;
- }
- }
- }
-basic_json_parser_2:
- ++m_cursor;
- {
- last_token_type = token_type::end_of_input;
- break;
- }
-basic_json_parser_4:
- ++m_cursor;
-basic_json_parser_5:
- {
- last_token_type = token_type::parse_error;
- break;
- }
-basic_json_parser_6:
- ++m_cursor;
- if (m_limit <= m_cursor)
- {
- fill_line_buffer(1); // LCOV_EXCL_LINE
- }
- yych = *m_cursor;
- if (yybm[0 + yych] & 32)
- {
- goto basic_json_parser_6;
- }
- {
- continue;
- }
-basic_json_parser_9:
- yyaccept = 0;
- yych = *(m_marker = ++m_cursor);
- if (yych <= 0x1F)
- {
- goto basic_json_parser_5;
- }
- if (yych <= 0x7F)
- {
- goto basic_json_parser_31;
- }
- if (yych <= 0xC1)
- {
- goto basic_json_parser_5;
- }
- if (yych <= 0xF4)
- {
- goto basic_json_parser_31;
- }
- goto basic_json_parser_5;
-basic_json_parser_10:
- ++m_cursor;
- {
- last_token_type = token_type::value_separator;
- break;
- }
-basic_json_parser_12:
- yych = *++m_cursor;
- if (yych <= '/')
- {
- goto basic_json_parser_5;
- }
- if (yych <= '0')
- {
- goto basic_json_parser_13;
- }
- if (yych <= '9')
- {
- goto basic_json_parser_15;
- }
- goto basic_json_parser_5;
-basic_json_parser_13:
- yyaccept = 1;
- yych = *(m_marker = ++m_cursor);
- if (yych <= 'D')
- {
- if (yych == '.')
- {
- goto basic_json_parser_43;
- }
- }
- else
- {
- if (yych <= 'E')
- {
- goto basic_json_parser_44;
- }
- if (yych == 'e')
- {
- goto basic_json_parser_44;
- }
- }
-basic_json_parser_14:
- {
- last_token_type = token_type::value_number;
- break;
- }
-basic_json_parser_15:
- yyaccept = 1;
- m_marker = ++m_cursor;
- if ((m_limit - m_cursor) < 3)
- {
- fill_line_buffer(3); // LCOV_EXCL_LINE
- }
- yych = *m_cursor;
- if (yybm[0 + yych] & 64)
- {
- goto basic_json_parser_15;
- }
- if (yych <= 'D')
- {
- if (yych == '.')
- {
- goto basic_json_parser_43;
- }
- goto basic_json_parser_14;
- }
- else
- {
- if (yych <= 'E')
- {
- goto basic_json_parser_44;
- }
- if (yych == 'e')
- {
- goto basic_json_parser_44;
- }
- goto basic_json_parser_14;
- }
-basic_json_parser_17:
- ++m_cursor;
- {
- last_token_type = token_type::name_separator;
- break;
- }
-basic_json_parser_19:
- ++m_cursor;
- {
- last_token_type = token_type::begin_array;
- break;
- }
-basic_json_parser_21:
- ++m_cursor;
- {
- last_token_type = token_type::end_array;
- break;
- }
-basic_json_parser_23:
- yyaccept = 0;
- yych = *(m_marker = ++m_cursor);
- if (yych == 'a')
- {
- goto basic_json_parser_45;
- }
- goto basic_json_parser_5;
-basic_json_parser_24:
- yyaccept = 0;
- yych = *(m_marker = ++m_cursor);
- if (yych == 'u')
- {
- goto basic_json_parser_46;
- }
- goto basic_json_parser_5;
-basic_json_parser_25:
- yyaccept = 0;
- yych = *(m_marker = ++m_cursor);
- if (yych == 'r')
- {
- goto basic_json_parser_47;
- }
- goto basic_json_parser_5;
-basic_json_parser_26:
- ++m_cursor;
- {
- last_token_type = token_type::begin_object;
- break;
- }
-basic_json_parser_28:
- ++m_cursor;
- {
- last_token_type = token_type::end_object;
- break;
- }
-basic_json_parser_30:
- ++m_cursor;
- if (m_limit <= m_cursor)
- {
- fill_line_buffer(1); // LCOV_EXCL_LINE
- }
- yych = *m_cursor;
-basic_json_parser_31:
- if (yybm[0 + yych] & 128)
- {
- goto basic_json_parser_30;
- }
- if (yych <= 0xE0)
- {
- if (yych <= '\\')
- {
- if (yych <= 0x1F)
- {
- goto basic_json_parser_32;
- }
- if (yych <= '"')
- {
- goto basic_json_parser_33;
- }
- goto basic_json_parser_35;
- }
- else
- {
- if (yych <= 0xC1)
- {
- goto basic_json_parser_32;
- }
- if (yych <= 0xDF)
- {
- goto basic_json_parser_36;
- }
- goto basic_json_parser_37;
- }
- }
- else
- {
- if (yych <= 0xEF)
- {
- if (yych == 0xED)
- {
- goto basic_json_parser_39;
- }
- goto basic_json_parser_38;
- }
- else
- {
- if (yych <= 0xF0)
- {
- goto basic_json_parser_40;
- }
- if (yych <= 0xF3)
- {
- goto basic_json_parser_41;
- }
- if (yych <= 0xF4)
- {
- goto basic_json_parser_42;
- }
- }
- }
-basic_json_parser_32:
- m_cursor = m_marker;
- if (yyaccept == 0)
- {
- goto basic_json_parser_5;
- }
- else
- {
- goto basic_json_parser_14;
- }
-basic_json_parser_33:
- ++m_cursor;
- {
- last_token_type = token_type::value_string;
- break;
- }
-basic_json_parser_35:
- ++m_cursor;
- if (m_limit <= m_cursor)
- {
- fill_line_buffer(1); // LCOV_EXCL_LINE
- }
- yych = *m_cursor;
- if (yych <= 'e')
- {
- if (yych <= '/')
- {
- if (yych == '"')
- {
- goto basic_json_parser_30;
- }
- if (yych <= '.')
- {
- goto basic_json_parser_32;
- }
- goto basic_json_parser_30;
- }
- else
- {
- if (yych <= '\\')
- {
- if (yych <= '[')
- {
- goto basic_json_parser_32;
- }
- goto basic_json_parser_30;
- }
- else
- {
- if (yych == 'b')
- {
- goto basic_json_parser_30;
- }
- goto basic_json_parser_32;
- }
- }
- }
- else
- {
- if (yych <= 'q')
- {
- if (yych <= 'f')
- {
- goto basic_json_parser_30;
- }
- if (yych == 'n')
- {
- goto basic_json_parser_30;
- }
- goto basic_json_parser_32;
- }
- else
- {
- if (yych <= 's')
- {
- if (yych <= 'r')
- {
- goto basic_json_parser_30;
- }
- goto basic_json_parser_32;
- }
- else
- {
- if (yych <= 't')
- {
- goto basic_json_parser_30;
- }
- if (yych <= 'u')
- {
- goto basic_json_parser_48;
- }
- goto basic_json_parser_32;
- }
- }
- }
-basic_json_parser_36:
- ++m_cursor;
- if (m_limit <= m_cursor)
- {
- fill_line_buffer(1); // LCOV_EXCL_LINE
- }
- yych = *m_cursor;
- if (yych <= 0x7F)
- {
- goto basic_json_parser_32;
- }
- if (yych <= 0xBF)
- {
- goto basic_json_parser_30;
- }
- goto basic_json_parser_32;
-basic_json_parser_37:
- ++m_cursor;
- if (m_limit <= m_cursor)
- {
- fill_line_buffer(1); // LCOV_EXCL_LINE
- }
- yych = *m_cursor;
- if (yych <= 0x9F)
- {
- goto basic_json_parser_32;
- }
- if (yych <= 0xBF)
- {
- goto basic_json_parser_36;
- }
- goto basic_json_parser_32;
-basic_json_parser_38:
- ++m_cursor;
- if (m_limit <= m_cursor)
- {
- fill_line_buffer(1); // LCOV_EXCL_LINE
- }
- yych = *m_cursor;
- if (yych <= 0x7F)
- {
- goto basic_json_parser_32;
- }
- if (yych <= 0xBF)
- {
- goto basic_json_parser_36;
- }
- goto basic_json_parser_32;
-basic_json_parser_39:
- ++m_cursor;
- if (m_limit <= m_cursor)
- {
- fill_line_buffer(1); // LCOV_EXCL_LINE
- }
- yych = *m_cursor;
- if (yych <= 0x7F)
- {
- goto basic_json_parser_32;
- }
- if (yych <= 0x9F)
- {
- goto basic_json_parser_36;
- }
- goto basic_json_parser_32;
-basic_json_parser_40:
- ++m_cursor;
- if (m_limit <= m_cursor)
- {
- fill_line_buffer(1); // LCOV_EXCL_LINE
- }
- yych = *m_cursor;
- if (yych <= 0x8F)
- {
- goto basic_json_parser_32;
- }
- if (yych <= 0xBF)
- {
- goto basic_json_parser_38;
- }
- goto basic_json_parser_32;
-basic_json_parser_41:
- ++m_cursor;
- if (m_limit <= m_cursor)
- {
- fill_line_buffer(1); // LCOV_EXCL_LINE
- }
- yych = *m_cursor;
- if (yych <= 0x7F)
- {
- goto basic_json_parser_32;
- }
- if (yych <= 0xBF)
- {
- goto basic_json_parser_38;
- }
- goto basic_json_parser_32;
-basic_json_parser_42:
- ++m_cursor;
- if (m_limit <= m_cursor)
- {
- fill_line_buffer(1); // LCOV_EXCL_LINE
- }
- yych = *m_cursor;
- if (yych <= 0x7F)
- {
- goto basic_json_parser_32;
- }
- if (yych <= 0x8F)
- {
- goto basic_json_parser_38;
- }
- goto basic_json_parser_32;
-basic_json_parser_43:
- yych = *++m_cursor;
- if (yych <= '/')
- {
- goto basic_json_parser_32;
- }
- if (yych <= '9')
- {
- goto basic_json_parser_49;
- }
- goto basic_json_parser_32;
-basic_json_parser_44:
- yych = *++m_cursor;
- if (yych <= ',')
- {
- if (yych == '+')
- {
- goto basic_json_parser_51;
- }
- goto basic_json_parser_32;
- }
- else
- {
- if (yych <= '-')
- {
- goto basic_json_parser_51;
- }
- if (yych <= '/')
- {
- goto basic_json_parser_32;
- }
- if (yych <= '9')
- {
- goto basic_json_parser_52;
- }
- goto basic_json_parser_32;
- }
-basic_json_parser_45:
- yych = *++m_cursor;
- if (yych == 'l')
- {
- goto basic_json_parser_54;
- }
- goto basic_json_parser_32;
-basic_json_parser_46:
- yych = *++m_cursor;
- if (yych == 'l')
- {
- goto basic_json_parser_55;
- }
- goto basic_json_parser_32;
-basic_json_parser_47:
- yych = *++m_cursor;
- if (yych == 'u')
- {
- goto basic_json_parser_56;
- }
- goto basic_json_parser_32;
-basic_json_parser_48:
- ++m_cursor;
- if (m_limit <= m_cursor)
- {
- fill_line_buffer(1); // LCOV_EXCL_LINE
- }
- yych = *m_cursor;
- if (yych <= '@')
- {
- if (yych <= '/')
- {
- goto basic_json_parser_32;
- }
- if (yych <= '9')
- {
- goto basic_json_parser_57;
- }
- goto basic_json_parser_32;
- }
- else
- {
- if (yych <= 'F')
- {
- goto basic_json_parser_57;
- }
- if (yych <= '`')
- {
- goto basic_json_parser_32;
- }
- if (yych <= 'f')
- {
- goto basic_json_parser_57;
- }
- goto basic_json_parser_32;
- }
-basic_json_parser_49:
- yyaccept = 1;
- m_marker = ++m_cursor;
- if ((m_limit - m_cursor) < 3)
- {
- fill_line_buffer(3); // LCOV_EXCL_LINE
- }
- yych = *m_cursor;
- if (yych <= 'D')
- {
- if (yych <= '/')
- {
- goto basic_json_parser_14;
- }
- if (yych <= '9')
- {
- goto basic_json_parser_49;
- }
- goto basic_json_parser_14;
- }
- else
- {
- if (yych <= 'E')
- {
- goto basic_json_parser_44;
- }
- if (yych == 'e')
- {
- goto basic_json_parser_44;
- }
- goto basic_json_parser_14;
- }
-basic_json_parser_51:
- yych = *++m_cursor;
- if (yych <= '/')
- {
- goto basic_json_parser_32;
- }
- if (yych >= ':')
- {
- goto basic_json_parser_32;
- }
-basic_json_parser_52:
- ++m_cursor;
- if (m_limit <= m_cursor)
- {
- fill_line_buffer(1); // LCOV_EXCL_LINE
- }
- yych = *m_cursor;
- if (yych <= '/')
- {
- goto basic_json_parser_14;
- }
- if (yych <= '9')
- {
- goto basic_json_parser_52;
- }
- goto basic_json_parser_14;
-basic_json_parser_54:
- yych = *++m_cursor;
- if (yych == 's')
- {
- goto basic_json_parser_58;
- }
- goto basic_json_parser_32;
-basic_json_parser_55:
- yych = *++m_cursor;
- if (yych == 'l')
- {
- goto basic_json_parser_59;
- }
- goto basic_json_parser_32;
-basic_json_parser_56:
- yych = *++m_cursor;
- if (yych == 'e')
- {
- goto basic_json_parser_61;
- }
- goto basic_json_parser_32;
-basic_json_parser_57:
- ++m_cursor;
- if (m_limit <= m_cursor)
- {
- fill_line_buffer(1); // LCOV_EXCL_LINE
- }
- yych = *m_cursor;
- if (yych <= '@')
- {
- if (yych <= '/')
- {
- goto basic_json_parser_32;
- }
- if (yych <= '9')
- {
- goto basic_json_parser_63;
- }
- goto basic_json_parser_32;
- }
- else
- {
- if (yych <= 'F')
- {
- goto basic_json_parser_63;
- }
- if (yych <= '`')
- {
- goto basic_json_parser_32;
- }
- if (yych <= 'f')
- {
- goto basic_json_parser_63;
- }
- goto basic_json_parser_32;
- }
-basic_json_parser_58:
- yych = *++m_cursor;
- if (yych == 'e')
- {
- goto basic_json_parser_64;
- }
- goto basic_json_parser_32;
-basic_json_parser_59:
- ++m_cursor;
- {
- last_token_type = token_type::literal_null;
- break;
- }
-basic_json_parser_61:
- ++m_cursor;
- {
- last_token_type = token_type::literal_true;
- break;
- }
-basic_json_parser_63:
- ++m_cursor;
- if (m_limit <= m_cursor)
- {
- fill_line_buffer(1); // LCOV_EXCL_LINE
- }
- yych = *m_cursor;
- if (yych <= '@')
- {
- if (yych <= '/')
- {
- goto basic_json_parser_32;
- }
- if (yych <= '9')
- {
- goto basic_json_parser_66;
- }
- goto basic_json_parser_32;
- }
- else
- {
- if (yych <= 'F')
- {
- goto basic_json_parser_66;
- }
- if (yych <= '`')
- {
- goto basic_json_parser_32;
- }
- if (yych <= 'f')
- {
- goto basic_json_parser_66;
- }
- goto basic_json_parser_32;
- }
-basic_json_parser_64:
- ++m_cursor;
- {
- last_token_type = token_type::literal_false;
- break;
- }
-basic_json_parser_66:
- ++m_cursor;
- if (m_limit <= m_cursor)
- {
- fill_line_buffer(1); // LCOV_EXCL_LINE
- }
- yych = *m_cursor;
- if (yych <= '@')
- {
- if (yych <= '/')
- {
- goto basic_json_parser_32;
- }
- if (yych <= '9')
- {
- goto basic_json_parser_30;
- }
- goto basic_json_parser_32;
- }
- else
- {
- if (yych <= 'F')
- {
- goto basic_json_parser_30;
- }
- if (yych <= '`')
- {
- goto basic_json_parser_32;
- }
- if (yych <= 'f')
- {
- goto basic_json_parser_30;
- }
- goto basic_json_parser_32;
- }
+
+ {
+ lexer_char_t yych;
+ unsigned int yyaccept = 0;
+ static const unsigned char yybm[] = {
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 32, 32, 0, 0, 32, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 160, 128, 0, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 192, 192, 192, 192, 192, 192, 192, 192,
+ 192, 192, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 0, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ };
+ if ((m_limit - m_cursor) < 5) fill_line_buffer(5); // LCOV_EXCL_LINE
+ yych = *m_cursor;
+ if (yybm[0+yych] & 32) {
+ goto basic_json_parser_6;
+ }
+ if (yych <= '[') {
+ if (yych <= '-') {
+ if (yych <= '"') {
+ if (yych <= 0x00) goto basic_json_parser_2;
+ if (yych <= '!') goto basic_json_parser_4;
+ goto basic_json_parser_9;
+ } else {
+ if (yych <= '+') goto basic_json_parser_4;
+ if (yych <= ',') goto basic_json_parser_10;
+ goto basic_json_parser_12;
}
+ } else {
+ if (yych <= '9') {
+ if (yych <= '/') goto basic_json_parser_4;
+ if (yych <= '0') goto basic_json_parser_13;
+ goto basic_json_parser_15;
+ } else {
+ if (yych <= ':') goto basic_json_parser_17;
+ if (yych <= 'Z') goto basic_json_parser_4;
+ goto basic_json_parser_19;
+ }
+ }
+ } else {
+ if (yych <= 'n') {
+ if (yych <= 'e') {
+ if (yych == ']') goto basic_json_parser_21;
+ goto basic_json_parser_4;
+ } else {
+ if (yych <= 'f') goto basic_json_parser_23;
+ if (yych <= 'm') goto basic_json_parser_4;
+ goto basic_json_parser_24;
+ }
+ } else {
+ if (yych <= 'z') {
+ if (yych == 't') goto basic_json_parser_25;
+ goto basic_json_parser_4;
+ } else {
+ if (yych <= '{') goto basic_json_parser_26;
+ if (yych == '}') goto basic_json_parser_28;
+ goto basic_json_parser_4;
+ }
+ }
+ }
+basic_json_parser_2:
+ ++m_cursor;
+ { last_token_type = token_type::end_of_input; break; }
+basic_json_parser_4:
+ ++m_cursor;
+basic_json_parser_5:
+ { last_token_type = token_type::parse_error; break; }
+basic_json_parser_6:
+ ++m_cursor;
+ if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
+ yych = *m_cursor;
+ if (yybm[0+yych] & 32) {
+ goto basic_json_parser_6;
+ }
+ { continue; }
+basic_json_parser_9:
+ yyaccept = 0;
+ yych = *(m_marker = ++m_cursor);
+ if (yych <= 0x1F) goto basic_json_parser_5;
+ if (yych <= 0x7F) goto basic_json_parser_31;
+ if (yych <= 0xC1) goto basic_json_parser_5;
+ if (yych <= 0xF4) goto basic_json_parser_31;
+ goto basic_json_parser_5;
+basic_json_parser_10:
+ ++m_cursor;
+ { last_token_type = token_type::value_separator; break; }
+basic_json_parser_12:
+ yych = *++m_cursor;
+ if (yych <= '/') goto basic_json_parser_5;
+ if (yych <= '0') goto basic_json_parser_13;
+ if (yych <= '9') goto basic_json_parser_15;
+ goto basic_json_parser_5;
+basic_json_parser_13:
+ yyaccept = 1;
+ yych = *(m_marker = ++m_cursor);
+ if (yych <= 'D') {
+ if (yych == '.') goto basic_json_parser_43;
+ } else {
+ if (yych <= 'E') goto basic_json_parser_44;
+ if (yych == 'e') goto basic_json_parser_44;
+ }
+basic_json_parser_14:
+ { last_token_type = token_type::value_number; break; }
+basic_json_parser_15:
+ yyaccept = 1;
+ m_marker = ++m_cursor;
+ if ((m_limit - m_cursor) < 3) fill_line_buffer(3); // LCOV_EXCL_LINE
+ yych = *m_cursor;
+ if (yybm[0+yych] & 64) {
+ goto basic_json_parser_15;
+ }
+ if (yych <= 'D') {
+ if (yych == '.') goto basic_json_parser_43;
+ goto basic_json_parser_14;
+ } else {
+ if (yych <= 'E') goto basic_json_parser_44;
+ if (yych == 'e') goto basic_json_parser_44;
+ goto basic_json_parser_14;
+ }
+basic_json_parser_17:
+ ++m_cursor;
+ { last_token_type = token_type::name_separator; break; }
+basic_json_parser_19:
+ ++m_cursor;
+ { last_token_type = token_type::begin_array; break; }
+basic_json_parser_21:
+ ++m_cursor;
+ { last_token_type = token_type::end_array; break; }
+basic_json_parser_23:
+ yyaccept = 0;
+ yych = *(m_marker = ++m_cursor);
+ if (yych == 'a') goto basic_json_parser_45;
+ goto basic_json_parser_5;
+basic_json_parser_24:
+ yyaccept = 0;
+ yych = *(m_marker = ++m_cursor);
+ if (yych == 'u') goto basic_json_parser_46;
+ goto basic_json_parser_5;
+basic_json_parser_25:
+ yyaccept = 0;
+ yych = *(m_marker = ++m_cursor);
+ if (yych == 'r') goto basic_json_parser_47;
+ goto basic_json_parser_5;
+basic_json_parser_26:
+ ++m_cursor;
+ { last_token_type = token_type::begin_object; break; }
+basic_json_parser_28:
+ ++m_cursor;
+ { last_token_type = token_type::end_object; break; }
+basic_json_parser_30:
+ ++m_cursor;
+ if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
+ yych = *m_cursor;
+basic_json_parser_31:
+ if (yybm[0+yych] & 128) {
+ goto basic_json_parser_30;
+ }
+ if (yych <= 0xE0) {
+ if (yych <= '\\') {
+ if (yych <= 0x1F) goto basic_json_parser_32;
+ if (yych <= '"') goto basic_json_parser_33;
+ goto basic_json_parser_35;
+ } else {
+ if (yych <= 0xC1) goto basic_json_parser_32;
+ if (yych <= 0xDF) goto basic_json_parser_36;
+ goto basic_json_parser_37;
+ }
+ } else {
+ if (yych <= 0xEF) {
+ if (yych == 0xED) goto basic_json_parser_39;
+ goto basic_json_parser_38;
+ } else {
+ if (yych <= 0xF0) goto basic_json_parser_40;
+ if (yych <= 0xF3) goto basic_json_parser_41;
+ if (yych <= 0xF4) goto basic_json_parser_42;
+ }
+ }
+basic_json_parser_32:
+ m_cursor = m_marker;
+ if (yyaccept == 0) {
+ goto basic_json_parser_5;
+ } else {
+ goto basic_json_parser_14;
+ }
+basic_json_parser_33:
+ ++m_cursor;
+ { last_token_type = token_type::value_string; break; }
+basic_json_parser_35:
+ ++m_cursor;
+ if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
+ yych = *m_cursor;
+ if (yych <= 'e') {
+ if (yych <= '/') {
+ if (yych == '"') goto basic_json_parser_30;
+ if (yych <= '.') goto basic_json_parser_32;
+ goto basic_json_parser_30;
+ } else {
+ if (yych <= '\\') {
+ if (yych <= '[') goto basic_json_parser_32;
+ goto basic_json_parser_30;
+ } else {
+ if (yych == 'b') goto basic_json_parser_30;
+ goto basic_json_parser_32;
+ }
+ }
+ } else {
+ if (yych <= 'q') {
+ if (yych <= 'f') goto basic_json_parser_30;
+ if (yych == 'n') goto basic_json_parser_30;
+ goto basic_json_parser_32;
+ } else {
+ if (yych <= 's') {
+ if (yych <= 'r') goto basic_json_parser_30;
+ goto basic_json_parser_32;
+ } else {
+ if (yych <= 't') goto basic_json_parser_30;
+ if (yych <= 'u') goto basic_json_parser_48;
+ goto basic_json_parser_32;
+ }
+ }
+ }
+basic_json_parser_36:
+ ++m_cursor;
+ if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
+ yych = *m_cursor;
+ if (yych <= 0x7F) goto basic_json_parser_32;
+ if (yych <= 0xBF) goto basic_json_parser_30;
+ goto basic_json_parser_32;
+basic_json_parser_37:
+ ++m_cursor;
+ if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
+ yych = *m_cursor;
+ if (yych <= 0x9F) goto basic_json_parser_32;
+ if (yych <= 0xBF) goto basic_json_parser_36;
+ goto basic_json_parser_32;
+basic_json_parser_38:
+ ++m_cursor;
+ if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
+ yych = *m_cursor;
+ if (yych <= 0x7F) goto basic_json_parser_32;
+ if (yych <= 0xBF) goto basic_json_parser_36;
+ goto basic_json_parser_32;
+basic_json_parser_39:
+ ++m_cursor;
+ if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
+ yych = *m_cursor;
+ if (yych <= 0x7F) goto basic_json_parser_32;
+ if (yych <= 0x9F) goto basic_json_parser_36;
+ goto basic_json_parser_32;
+basic_json_parser_40:
+ ++m_cursor;
+ if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
+ yych = *m_cursor;
+ if (yych <= 0x8F) goto basic_json_parser_32;
+ if (yych <= 0xBF) goto basic_json_parser_38;
+ goto basic_json_parser_32;
+basic_json_parser_41:
+ ++m_cursor;
+ if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
+ yych = *m_cursor;
+ if (yych <= 0x7F) goto basic_json_parser_32;
+ if (yych <= 0xBF) goto basic_json_parser_38;
+ goto basic_json_parser_32;
+basic_json_parser_42:
+ ++m_cursor;
+ if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
+ yych = *m_cursor;
+ if (yych <= 0x7F) goto basic_json_parser_32;
+ if (yych <= 0x8F) goto basic_json_parser_38;
+ goto basic_json_parser_32;
+basic_json_parser_43:
+ yych = *++m_cursor;
+ if (yych <= '/') goto basic_json_parser_32;
+ if (yych <= '9') goto basic_json_parser_49;
+ goto basic_json_parser_32;
+basic_json_parser_44:
+ yych = *++m_cursor;
+ if (yych <= ',') {
+ if (yych == '+') goto basic_json_parser_51;
+ goto basic_json_parser_32;
+ } else {
+ if (yych <= '-') goto basic_json_parser_51;
+ if (yych <= '/') goto basic_json_parser_32;
+ if (yych <= '9') goto basic_json_parser_52;
+ goto basic_json_parser_32;
+ }
+basic_json_parser_45:
+ yych = *++m_cursor;
+ if (yych == 'l') goto basic_json_parser_54;
+ goto basic_json_parser_32;
+basic_json_parser_46:
+ yych = *++m_cursor;
+ if (yych == 'l') goto basic_json_parser_55;
+ goto basic_json_parser_32;
+basic_json_parser_47:
+ yych = *++m_cursor;
+ if (yych == 'u') goto basic_json_parser_56;
+ goto basic_json_parser_32;
+basic_json_parser_48:
+ ++m_cursor;
+ if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
+ yych = *m_cursor;
+ if (yych <= '@') {
+ if (yych <= '/') goto basic_json_parser_32;
+ if (yych <= '9') goto basic_json_parser_57;
+ goto basic_json_parser_32;
+ } else {
+ if (yych <= 'F') goto basic_json_parser_57;
+ if (yych <= '`') goto basic_json_parser_32;
+ if (yych <= 'f') goto basic_json_parser_57;
+ goto basic_json_parser_32;
+ }
+basic_json_parser_49:
+ yyaccept = 1;
+ m_marker = ++m_cursor;
+ if ((m_limit - m_cursor) < 3) fill_line_buffer(3); // LCOV_EXCL_LINE
+ yych = *m_cursor;
+ if (yych <= 'D') {
+ if (yych <= '/') goto basic_json_parser_14;
+ if (yych <= '9') goto basic_json_parser_49;
+ goto basic_json_parser_14;
+ } else {
+ if (yych <= 'E') goto basic_json_parser_44;
+ if (yych == 'e') goto basic_json_parser_44;
+ goto basic_json_parser_14;
+ }
+basic_json_parser_51:
+ yych = *++m_cursor;
+ if (yych <= '/') goto basic_json_parser_32;
+ if (yych >= ':') goto basic_json_parser_32;
+basic_json_parser_52:
+ ++m_cursor;
+ if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
+ yych = *m_cursor;
+ if (yych <= '/') goto basic_json_parser_14;
+ if (yych <= '9') goto basic_json_parser_52;
+ goto basic_json_parser_14;
+basic_json_parser_54:
+ yych = *++m_cursor;
+ if (yych == 's') goto basic_json_parser_58;
+ goto basic_json_parser_32;
+basic_json_parser_55:
+ yych = *++m_cursor;
+ if (yych == 'l') goto basic_json_parser_59;
+ goto basic_json_parser_32;
+basic_json_parser_56:
+ yych = *++m_cursor;
+ if (yych == 'e') goto basic_json_parser_61;
+ goto basic_json_parser_32;
+basic_json_parser_57:
+ ++m_cursor;
+ if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
+ yych = *m_cursor;
+ if (yych <= '@') {
+ if (yych <= '/') goto basic_json_parser_32;
+ if (yych <= '9') goto basic_json_parser_63;
+ goto basic_json_parser_32;
+ } else {
+ if (yych <= 'F') goto basic_json_parser_63;
+ if (yych <= '`') goto basic_json_parser_32;
+ if (yych <= 'f') goto basic_json_parser_63;
+ goto basic_json_parser_32;
+ }
+basic_json_parser_58:
+ yych = *++m_cursor;
+ if (yych == 'e') goto basic_json_parser_64;
+ goto basic_json_parser_32;
+basic_json_parser_59:
+ ++m_cursor;
+ { last_token_type = token_type::literal_null; break; }
+basic_json_parser_61:
+ ++m_cursor;
+ { last_token_type = token_type::literal_true; break; }
+basic_json_parser_63:
+ ++m_cursor;
+ if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
+ yych = *m_cursor;
+ if (yych <= '@') {
+ if (yych <= '/') goto basic_json_parser_32;
+ if (yych <= '9') goto basic_json_parser_66;
+ goto basic_json_parser_32;
+ } else {
+ if (yych <= 'F') goto basic_json_parser_66;
+ if (yych <= '`') goto basic_json_parser_32;
+ if (yych <= 'f') goto basic_json_parser_66;
+ goto basic_json_parser_32;
+ }
+basic_json_parser_64:
+ ++m_cursor;
+ { last_token_type = token_type::literal_false; break; }
+basic_json_parser_66:
+ ++m_cursor;
+ if (m_limit <= m_cursor) fill_line_buffer(1); // LCOV_EXCL_LINE
+ yych = *m_cursor;
+ if (yych <= '@') {
+ if (yych <= '/') goto basic_json_parser_32;
+ if (yych <= '9') goto basic_json_parser_30;
+ goto basic_json_parser_32;
+ } else {
+ if (yych <= 'F') goto basic_json_parser_30;
+ if (yych <= '`') goto basic_json_parser_32;
+ if (yych <= 'f') goto basic_json_parser_30;
+ goto basic_json_parser_32;
+ }
+ }
}
diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c
index e1a43b54..e3d5a400 100644
--- a/src/json.hpp.re2c
+++ b/src/json.hpp.re2c
@@ -5625,36 +5625,23 @@ class basic_json
return false;
}
- /*!
- @brief comparison: equal
-
- The functions compares the given JSON value against a null pointer. As the
- null pointer can be used to initialize a JSON value to null, a comparison
- of JSON value @a v with a null pointer should be equivalent to call
- `v.is_null()`.
-
- @param[in] v JSON value to consider
- @return whether @a v is null
-
- @complexity Constant.
-
- @liveexample{The example compares several JSON types to the null pointer.
- ,operator__equal__nullptr_t}
-
- @since version 1.0.0
+ /*!@brief comparison: equal
+ @copydoc operator==(const_reference, const_reference)
*/
- friend bool operator==(const_reference v, std::nullptr_t) noexcept
- {
- return v.is_null();
+ template<typename ScalarType, typename std::enable_if<
+ std::is_scalar<ScalarType>::value, int>::type = 0>
+ friend bool operator==(const_reference lhs, const ScalarType rhs) noexcept {
+ return (lhs == basic_json(rhs));
}
/*!
@brief comparison: equal
- @copydoc operator==(const_reference, std::nullptr_t)
+ @copydoc operator==(const_reference, const_reference)
*/
- friend bool operator==(std::nullptr_t, const_reference v) noexcept
- {
- return v.is_null();
+ template<typename ScalarType, typename std::enable_if<
+ std::is_scalar<ScalarType>::value, int>::type = 0>
+ friend bool operator==(const ScalarType lhs, const_reference rhs) noexcept {
+ return (basic_json(lhs) == rhs);
}
/*!
@@ -5680,34 +5667,24 @@ class basic_json
/*!
@brief comparison: not equal
-
- The functions compares the given JSON value against a null pointer. As the
- null pointer can be used to initialize a JSON value to null, a comparison
- of JSON value @a v with a null pointer should be equivalent to call
- `not v.is_null()`.
-
- @param[in] v JSON value to consider
- @return whether @a v is not null
-
- @complexity Constant.
-
- @liveexample{The example compares several JSON types to the null pointer.
- ,operator__notequal__nullptr_t}
-
- @since version 1.0.0
+ @copydoc operator!=(const_reference, const_reference)
*/
- friend bool operator!=(const_reference v, std::nullptr_t) noexcept
+ template<typename ScalarType, typename std::enable_if<
+ std::is_scalar<ScalarType>::value, int>::type = 0>
+ friend bool operator!=(const_reference lhs, const ScalarType rhs) noexcept
{
- return not v.is_null();
+ return (lhs != basic_json(rhs));
}
/*!
@brief comparison: not equal
- @copydoc operator!=(const_reference, std::nullptr_t)
+ @copydoc operator!=(const_reference, const_reference)
*/
- friend bool operator!=(std::nullptr_t, const_reference v) noexcept
+ template<typename ScalarType, typename std::enable_if<
+ std::is_scalar<ScalarType>::value, int>::type = 0>
+ friend bool operator!=(const ScalarType lhs, const_reference rhs) noexcept
{
- return not v.is_null();
+ return (basic_json(lhs) != rhs);
}
/*!
diff --git a/test/src/unit-regression.cpp b/test/src/unit-regression.cpp
index 401867c2..9235d36c 100644
--- a/test/src/unit-regression.cpp
+++ b/test/src/unit-regression.cpp
@@ -663,4 +663,22 @@ TEST_CASE("regression tests")
std::vector<uint8_t> vec3 {0xbf, 0x61, 0x61, 0x01};
CHECK_THROWS_AS(json::from_cbor(vec3), std::out_of_range);
}
+
+ SECTION("issue #414 - compare with literal 0)")
+ {
+ #define CHECK_TYPE(v) \
+ CHECK((json(v) == v));\
+ CHECK((v == json(v)));\
+ CHECK_FALSE((json(v) != v));\
+ CHECK_FALSE((v != json(v)));
+
+ CHECK_TYPE(nullptr);
+ CHECK_TYPE(0);
+ CHECK_TYPE(0u);
+ CHECK_TYPE(0L);
+ CHECK_TYPE(0.0);
+ CHECK_TYPE("");
+
+ #undef CHECK_TYPE
+ }
}