Skip to content

Use composition in value instead of inheritance #293

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
mrabine merged 2 commits into from
Oct 17, 2026
Merged

Use composition in value instead of inheritance #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a06d92
Use composition in value instead of inheritance
mrabine Oct 17, 2026
85e4db2
fix emplace back
mrabine Oct 17, 2026
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
7 changes: 7 additions & 0 deletions core/tests/variant_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,13 @@ TEST (Variant, get)
EXPECT_THROW (var.get<2> (), std::bad_cast);
EXPECT_THROW (var.get<3> (), std::bad_cast);
EXPECT_NO_THROW (var.get<4> ());

var.set<double> (0.5);
const Variant<int, double, std::string, bool, std::nullptr_t>& constVar = var;
EXPECT_NO_THROW (constVar.get<double> ());
EXPECT_THROW (constVar.get<int> (), std::bad_cast);
EXPECT_NO_THROW (constVar.get<1> ());
EXPECT_THROW (constVar.get<0> (), std::bad_cast);
}

/**
Expand Down
51 changes: 25 additions & 26 deletions data/include/join/document.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ namespace join
*/
int setNull ()
{
return emplaceValue (in_place_index_t<Value::Null>{}, nullptr);
return emplaceValue (nullptr);
}

/**
Expand All @@ -141,7 +141,7 @@ namespace join
*/
int setBool (bool value)
{
return emplaceValue (in_place_index_t<Value::Boolean>{}, value);
return emplaceValue (value);
}

/**
Expand All @@ -151,7 +151,7 @@ namespace join
*/
int setInt (int32_t value)
{
return emplaceValue (in_place_index_t<Value::Integer>{}, value);
return emplaceValue (value);
}

/**
Expand All @@ -161,7 +161,7 @@ namespace join
*/
int setUint (uint32_t value)
{
return emplaceValue (in_place_index_t<Value::Unsigned>{}, value);
return emplaceValue (value);
}

/**
Expand All @@ -171,7 +171,7 @@ namespace join
*/
int setInt64 (int64_t value)
{
return emplaceValue (in_place_index_t<Value::Integer64>{}, value);
return emplaceValue (value);
}

/**
Expand All @@ -181,7 +181,7 @@ namespace join
*/
int setUint64 (uint64_t value)
{
return emplaceValue (in_place_index_t<Value::Unsigned64>{}, value);
return emplaceValue (value);
}

/**
Expand All @@ -191,7 +191,7 @@ namespace join
*/
int setDouble (double value)
{
return emplaceValue (in_place_index_t<Value::Real>{}, value);
return emplaceValue (value);
}

/**
Expand All @@ -201,7 +201,7 @@ namespace join
*/
int setString (const std::string& value)
{
return emplaceValue (in_place_index_t<Value::String>{}, value);
return emplaceValue (value);
}

/**
Expand All @@ -211,7 +211,7 @@ namespace join
*/
int setString (std::string&& value)
{
return emplaceValue (in_place_index_t<Value::String>{}, std::move (value));
return emplaceValue (std::move (value));
}

/**
Expand Down Expand Up @@ -258,7 +258,7 @@ namespace join
return 0;
}

_stack.emplace_back (in_place_index_t<Value::ArrayValue>{}, std::move (array));
_stack.emplace_back (std::move (array));

return 0;
}
Expand Down Expand Up @@ -362,7 +362,7 @@ namespace join
return 0;
}

_stack.emplace_back (in_place_index_t<Value::ObjectValue>{}, std::move (object));
_stack.emplace_back (std::move (object));

return 0;
}
Expand All @@ -389,31 +389,31 @@ namespace join
switch (value.index ())
{
case Value::Boolean:
return handler.setBool (value.get<Value::Boolean> ());
return handler.setBool (value.getBool ());

case Value::Integer:
return handler.setInt (value.get<Value::Integer> ());
return handler.setInt (value.getInt ());

case Value::Unsigned:
return handler.setUint (value.get<Value::Unsigned> ());
return handler.setUint (value.getUint ());

case Value::Integer64:
return handler.setInt64 (value.get<Value::Integer64> ());
return handler.setInt64 (value.getInt64 ());

case Value::Unsigned64:
return handler.setUint64 (value.get<Value::Unsigned64> ());
return handler.setUint64 (value.getUint64 ());

case Value::Real:
return handler.setDouble (value.get<Value::Real> ());
return handler.setDouble (value.getDouble ());

case Value::String:
return handler.setString (value.get<Value::String> ());
return handler.setString (value.getString ());

case Value::ArrayValue:
return setArray (value.get<Value::ArrayValue> (), handler);
return setArray (value.getArray (), handler);

case Value::ObjectValue:
return setObject (value.get<Value::ObjectValue> (), handler);
return setObject (value.getObject (), handler);

default:
return handler.setNull ();
Expand Down Expand Up @@ -477,20 +477,19 @@ namespace join

/**
* @brief construct a value in place in the current container, or as root.
* @param index index of the alternative to construct.
* @param args arguments forwarded to the value constructor.
* @param value value of the alternative to construct.
* @return 0 on success, -1 otherwise.
*/
template <size_t I, typename... Args>
int emplaceValue (in_place_index_t<I> index, Args&&... args)
template <typename T>
int emplaceValue (T&& value)
{
if (JOIN_UNLIKELY (_depth == 0))
{
_root = Value (index, std::forward<Args> (args)...);
_root = Value (std::forward<T> (value));
return 0;
}

_stack.emplace_back (index, std::forward<Args> (args)...);
_stack.emplace_back (std::forward<T> (value));

return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion data/include/join/json.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1810,7 +1810,7 @@ namespace join
template <typename ViewType, typename Handler>
int readString (ViewType& document, Handler& handler, bool isKey = false)
{
thread_local Value output (in_place_index_t<Value::String>{});
thread_local Value output{std::string ()};
output.clear ();
output.reserve (64);

Expand Down
60 changes: 23 additions & 37 deletions data/include/join/pack.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,25 +434,25 @@ namespace join
switch (key.index ())
{
case Value::Boolean:
return setBool (key.get<Value::Boolean> ());
return setBool (key.getBool ());

case Value::Integer:
return setInt (key.get<Value::Integer> ());
return setInt (key.getInt ());

case Value::Unsigned:
return setUint (key.get<Value::Unsigned> ());
return setUint (key.getUint ());

case Value::Integer64:
return setInt64 (key.get<Value::Integer64> ());
return setInt64 (key.getInt64 ());

case Value::Unsigned64:
return setUint64 (key.get<Value::Unsigned64> ());
return setUint64 (key.getUint64 ());

case Value::Real:
return setDouble (key.get<Value::Real> ());
return setDouble (key.getDouble ());

case Value::String:
return setString (key.get<Value::String> ());
return setString (key.getString ());

default:
return setNull ();
Expand Down Expand Up @@ -826,7 +826,7 @@ namespace join
int readNull (ViewType& document, Handler& handler, bool isKey = false)
{
document.get ();
return (isKey) ? handler.setKey (Value (in_place_index_t<Value::Null>{}, nullptr)) : handler.setNull ();
return (isKey) ? handler.setKey (Value (nullptr)) : handler.setNull ();
}

/**
Expand All @@ -840,8 +840,7 @@ namespace join
int readFalse (ViewType& document, Handler& handler, bool isKey = false)
{
document.get ();
return (isKey) ? handler.setKey (Value (in_place_index_t<Value::Boolean>{}, false))
: handler.setBool (false);
return (isKey) ? handler.setKey (Value (false)) : handler.setBool (false);
}

/**
Expand All @@ -855,7 +854,7 @@ namespace join
int readTrue (ViewType& document, Handler& handler, bool isKey = false)
{
document.get ();
return (isKey) ? handler.setKey (Value (in_place_index_t<Value::Boolean>{}, true)) : handler.setBool (true);
return (isKey) ? handler.setKey (Value (true)) : handler.setBool (true);
}

/**
Expand Down Expand Up @@ -1062,8 +1061,7 @@ namespace join
return -1;
}

return isKey ? handler.setKey (Value (in_place_index_t<Value::String>{}, std::move (output)))
: handler.setString (std::move (output));
return isKey ? handler.setKey (Value (std::move (output))) : handler.setString (std::move (output));
}

/**
Expand Down Expand Up @@ -1123,14 +1121,12 @@ namespace join
if (head <= 0x7f)
{
auto number = uint32_t (head);
return isKey ? handler.setKey (Value (in_place_index_t<Value::Unsigned>{}, number))
: handler.setUint (number);
return isKey ? handler.setKey (Value (number)) : handler.setUint (number);
}
else if (head >= 0xe0)
{
auto number = int32_t (static_cast<int8_t> (head));
return isKey ? handler.setKey (Value (in_place_index_t<Value::Integer>{}, number))
: handler.setInt (number);
return isKey ? handler.setKey (Value (number)) : handler.setInt (number);
}
else if (head == 0xd3)
{
Expand All @@ -1139,8 +1135,7 @@ namespace join
{
return -1;
}
return isKey ? handler.setKey (Value (in_place_index_t<Value::Integer64>{}, number))
: handler.setInt64 (number);
return isKey ? handler.setKey (Value (number)) : handler.setInt64 (number);
}
else if (head == 0xcf)
{
Expand All @@ -1149,8 +1144,7 @@ namespace join
{
return -1;
}
return isKey ? handler.setKey (Value (in_place_index_t<Value::Unsigned64>{}, number))
: handler.setUint64 (number);
return isKey ? handler.setKey (Value (number)) : handler.setUint64 (number);
}
else if (head == 0xcb)
{
Expand All @@ -1159,8 +1153,7 @@ namespace join
{
return -1;
}
return isKey ? handler.setKey (Value (in_place_index_t<Value::Real>{}, number))
: handler.setDouble (number);
return isKey ? handler.setKey (Value (number)) : handler.setDouble (number);
}
else if (head == 0xd2)
{
Expand All @@ -1169,8 +1162,7 @@ namespace join
{
return -1;
}
return isKey ? handler.setKey (Value (in_place_index_t<Value::Integer>{}, number))
: handler.setInt (number);
return isKey ? handler.setKey (Value (number)) : handler.setInt (number);
}
else if (head == 0xce)
{
Expand All @@ -1179,8 +1171,7 @@ namespace join
{
return -1;
}
return isKey ? handler.setKey (Value (in_place_index_t<Value::Unsigned>{}, number))
: handler.setUint (number);
return isKey ? handler.setKey (Value (number)) : handler.setUint (number);
}
else if (head == 0xca)
{
Expand All @@ -1189,8 +1180,7 @@ namespace join
{
return -1;
}
return isKey ? handler.setKey (Value (in_place_index_t<Value::Real>{}, number))
: handler.setDouble (number);
return isKey ? handler.setKey (Value (number)) : handler.setDouble (number);
}
else if (head == 0xd1)
{
Expand All @@ -1199,8 +1189,7 @@ namespace join
{
return -1;
}
return isKey ? handler.setKey (Value (in_place_index_t<Value::Integer>{}, number))
: handler.setInt (number);
return isKey ? handler.setKey (Value (number)) : handler.setInt (number);
}
else if (head == 0xcd)
{
Expand All @@ -1209,8 +1198,7 @@ namespace join
{
return -1;
}
return isKey ? handler.setKey (Value (in_place_index_t<Value::Unsigned>{}, number))
: handler.setUint (number);
return isKey ? handler.setKey (Value (number)) : handler.setUint (number);
}
else if (head == 0xd0)
{
Expand All @@ -1219,8 +1207,7 @@ namespace join
{
return -1;
}
return isKey ? handler.setKey (Value (in_place_index_t<Value::Integer>{}, number))
: handler.setInt (number);
return isKey ? handler.setKey (Value (number)) : handler.setInt (number);
}
else if (head == 0xcc)
{
Expand All @@ -1229,8 +1216,7 @@ namespace join
{
return -1;
}
return isKey ? handler.setKey (Value (in_place_index_t<Value::Unsigned>{}, number))
: handler.setUint (number);
return isKey ? handler.setKey (Value (number)) : handler.setUint (number);
}
else
{
Expand Down
Loading
Loading