Skip to content

fix inner_active_ test in variant handler's on_array_end #1203

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

Closed
Ramya-9353 wants to merge 1 commit into from
Closed

fix inner_active_ test in variant handler's on_array_end #1203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion include/boost/json/detail/parse_into.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1602,7 +1602,7 @@ class converting_handler<variant_conversion_tag, T, P>

bool on_array_end( system::error_code& ec )
{
if( !inner_active_ )
if( inner_active_ < 0 )
return signal_end(ec);

BOOST_JSON_INVOKE_INNER( array_end_handler_event{}, ec );
Expand Down
12 changes: 12 additions & 0 deletions test/parse_into.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,18 @@ class parse_into_test
"five",
std::map<std::string, double>{ {"one", 1}, {"pi", 3.14} }));

// the closing bracket of an array that belongs to an alternative has to
// be handed to that alternative, not treated as the end of the array
// the variant itself is an element of
testParseInto< Variant< std::vector<std::vector<int>> > >(
std::vector<std::vector<int>>{ {1, 2}, {3} } );
testParseInto< std::vector< Variant<std::vector<int>, int> > >(
{ std::vector<int>{1}, std::vector<int>{2} } );
#if defined(BOOST_DESCRIBE_CXX14)
testParseIntoErrors< Variant<X, int> >(
error::exhausted_variants, object{ {"z", array{ array{0} }} } );
#endif // BOOST_DESCRIBE_CXX14

testParseIntoErrors< Variant<Monostate> >(
error::exhausted_variants, "a" );
testParseIntoErrors< Variant<int> >(
Expand Down
Loading