Skip to content

Add constructor from all integer types. #1429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
barcharcraz merged 3 commits into from
Mar 10, 2022
Merged

Add constructor from all integer types. #1429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5408f1d
Add constructor from all integer types.
May 23, 2020
06363bc
Update Release/include/cpprest/json.h
NN--- Mar 10, 2022
3eac925
Update Release/include/cpprest/json.h
NN--- Mar 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 46 additions & 16 deletions Release/include/cpprest/json.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,25 +100,37 @@ class value
/// Constructor creating a JSON number value
/// </summary>
/// <param name="value">The C++ value to create a JSON value from</param>
_ASYNCRTIMP value(int32_t value);
_ASYNCRTIMP value(int value);

/// <summary>
/// Constructor creating a JSON number value
/// </summary>
/// <param name="value">The C++ value to create a JSON value from</param>
_ASYNCRTIMP value(uint32_t value);
_ASYNCRTIMP value(unsigned value);

/// <summary>
/// Constructor creating a JSON number value
/// </summary>
/// <param name="value">The C++ value to create a JSON value from</param>
_ASYNCRTIMP value(int64_t value);
_ASYNCRTIMP value(long value);

/// <summary>
/// Constructor creating a JSON number value
/// </summary>
/// <param name="value">The C++ value to create a JSON value from</param>
_ASYNCRTIMP value(uint64_t value);
_ASYNCRTIMP value(unsigned long value);

/// <summary>
/// Constructor creating a JSON number value
/// </summary>
/// <param name="value">The C++ value to create a JSON value from</param>
_ASYNCRTIMP value(long long value);

/// <summary>
/// Constructor creating a JSON number value
/// </summary>
/// <param name="value">The C++ value to create a JSON value from</param>
_ASYNCRTIMP value(unsigned long long value);

/// <summary>
/// Constructor creating a JSON number value
Expand Down Expand Up @@ -222,28 +234,42 @@ class value
/// </summary>
/// <param name="value">The C++ value to create a JSON value from</param>
/// <returns>A JSON number value</returns>
static _ASYNCRTIMP value __cdecl number(int32_t value);
static _ASYNCRTIMP value __cdecl number(int value);

/// <summary>
/// Creates a number value
/// </summary>
/// <param name="value">The C++ value to create a JSON value from</param>
/// <returns>A JSON number value</returns>
static _ASYNCRTIMP value __cdecl number(unsigned value);

/// <summary>
/// Creates a number value
/// </summary>
/// <param name="value">The C++ value to create a JSON value from</param>
/// <returns>A JSON number value</returns>
static _ASYNCRTIMP value __cdecl number(long value);

/// <summary>
/// Creates a number value
/// </summary>
/// <param name="value">The C++ value to create a JSON value from</param>
/// <returns>A JSON number value</returns>
static _ASYNCRTIMP value __cdecl number(uint32_t value);
static _ASYNCRTIMP value __cdecl number(unsigned long value);

/// <summary>
/// Creates a number value
/// </summary>
/// <param name="value">The C++ value to create a JSON value from</param>
/// <returns>A JSON number value</returns>
static _ASYNCRTIMP value __cdecl number(int64_t value);
static _ASYNCRTIMP value __cdecl number(long long value);

/// <summary>
/// Creates a number value
/// </summary>
/// <param name="value">The C++ value to create a JSON value from</param>
/// <returns>A JSON number value</returns>
static _ASYNCRTIMP value __cdecl number(uint64_t value);
static _ASYNCRTIMP value __cdecl number(unsigned long long value);

/// <summary>
/// Creates a Boolean value
Expand Down Expand Up @@ -1218,10 +1244,12 @@ class number
// convert to unsigned int64). This helps handling number objects e.g. comparing two numbers.

number(double value) : m_value(value), m_type(double_type) {}
number(int32_t value) : m_intval(value), m_type(value < 0 ? signed_type : unsigned_type) {}
number(uint32_t value) : m_intval(value), m_type(unsigned_type) {}
number(int64_t value) : m_intval(value), m_type(value < 0 ? signed_type : unsigned_type) {}
number(uint64_t value) : m_uintval(value), m_type(unsigned_type) {}
number(int value) : m_intval(value), m_type(value < 0 ? signed_type : unsigned_type) {}
number(unsigned value) : m_intval(value), m_type(unsigned_type) {}
number(long value) : m_intval(value), m_type(value < 0 ? signed_type : unsigned_type) {}
number(unsigned long value) : m_uintval(value), m_type(unsigned_type) {}
number(long long value) : m_intval(value), m_type(value < 0 ? signed_type : unsigned_type) {}
number(unsigned long long value) : m_uintval(value), m_type(unsigned_type) {}

public:
/// <summary>
Expand Down Expand Up @@ -1438,10 +1466,12 @@ class _Number : public _Value
{
public:
_Number(double value) : m_number(value) {}
_Number(int32_t value) : m_number(value) {}
_Number(uint32_t value) : m_number(value) {}
_Number(int64_t value) : m_number(value) {}
_Number(uint64_t value) : m_number(value) {}
_Number(int value) : m_number(value) {}
_Number(unsigned value) : m_number(value) {}
_Number(long value) : m_number(value) {}
_Number(unsigned long value) : m_number(value) {}
_Number(long long value) : m_number(value) {}
_Number(unsigned long long value) : m_number(value) {}

virtual std::unique_ptr<_Value> _copy_value() { return utility::details::make_unique<_Number>(*this); }

Expand Down
37 changes: 29 additions & 8 deletions Release/src/json/json.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,31 +38,48 @@ web::json::value::value()
{
}

web::json::value::value(int32_t value)
web::json::value::value(int value)
: m_value(utility::details::make_unique<web::json::details::_Number>(value))
#ifdef ENABLE_JSON_VALUE_VISUALIZER
, m_kind(value::Number)
#endif
{
}

web::json::value::value(uint32_t value)
web::json::value::value(unsigned value)
: m_value(utility::details::make_unique<web::json::details::_Number>(value))
#ifdef ENABLE_JSON_VALUE_VISUALIZER
, m_kind(value::Number)
#endif
{
}

web::json::value::value(int64_t value)

web::json::value::value(long value)
: m_value(utility::details::make_unique<web::json::details::_Number>(value))
#ifdef ENABLE_JSON_VALUE_VISUALIZER
, m_kind(value::Number)
#endif
{
}

web::json::value::value(uint64_t value)
web::json::value::value(unsigned long value)
: m_value(utility::details::make_unique<web::json::details::_Number>(value))
#ifdef ENABLE_JSON_VALUE_VISUALIZER
, m_kind(value::Number)
#endif
{
}

web::json::value::value(long long value)
: m_value(utility::details::make_unique<web::json::details::_Number>(value))
#ifdef ENABLE_JSON_VALUE_VISUALIZER
, m_kind(value::Number)
#endif
{
}

web::json::value::value(unsigned long long value)
: m_value(utility::details::make_unique<web::json::details::_Number>(value))
#ifdef ENABLE_JSON_VALUE_VISUALIZER
, m_kind(value::Number)
Expand Down Expand Up @@ -162,13 +179,17 @@ web::json::value web::json::value::null() { return web::json::value(); }

web::json::value web::json::value::number(double value) { return web::json::value(value); }

web::json::value web::json::value::number(int32_t value) { return web::json::value(value); }
web::json::value web::json::value::number(int value) { return web::json::value(value); }

web::json::value web::json::value::number(unsigned value) { return web::json::value(value); }

web::json::value web::json::value::number(long value) { return web::json::value(value); }

web::json::value web::json::value::number(uint32_t value) { return web::json::value(value); }
web::json::value web::json::value::number(unsigned long value) { return web::json::value(value); }

web::json::value web::json::value::number(int64_t value) { return web::json::value(value); }
web::json::value web::json::value::number(long long value) { return web::json::value(value); }

web::json::value web::json::value::number(uint64_t value) { return web::json::value(value); }
web::json::value web::json::value::number(unsigned long long value) { return web::json::value(value); }

web::json::value web::json::value::boolean(bool value) { return web::json::value(value); }

Expand Down
55 changes: 55 additions & 0 deletions Release/tests/functional/json/construction_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,61 @@ SUITE(construction_tests)
VERIFY_ARE_EQUAL(U("null"), arr[1].serialize());
}

TEST(int_assignment_op)
{
json::value v;
v = static_cast<int>(1);
VERIFY_ARE_EQUAL(U("1"), v.serialize());

v = static_cast<unsigned>(1);
VERIFY_ARE_EQUAL(U("1"), v.serialize());

v = static_cast<long>(1);
VERIFY_ARE_EQUAL(U("1"), v.serialize());

v = static_cast<unsigned long>(1);
VERIFY_ARE_EQUAL(U("1"), v.serialize());

v = static_cast<long long >(1);
VERIFY_ARE_EQUAL(U("1"), v.serialize());

v = static_cast<unsigned long long>(1);
VERIFY_ARE_EQUAL(U("1"), v.serialize());
}

TEST(int_ctor)
{
{
json::value v(static_cast<int>(1));
VERIFY_ARE_EQUAL(U("1"), v.serialize());
}

{
json::value v(static_cast<unsigned>(1));
VERIFY_ARE_EQUAL(U("1"), v.serialize());
}

{
json::value v(static_cast<long>(1));
VERIFY_ARE_EQUAL(U("1"), v.serialize());
}

{
json::value v(static_cast<unsigned long>(1));
VERIFY_ARE_EQUAL(U("1"), v.serialize());
}

{
json::value v(static_cast<long long>(1));
VERIFY_ARE_EQUAL(U("1"), v.serialize());
}

{
json::value v(static_cast<unsigned long long>(1));
VERIFY_ARE_EQUAL(U("1"), v.serialize());
}
}

TEST(copy_ctor_array)
{
json::value arr = json::value::array();
Expand Down