Skip to content

J
json
Unverified Commit 7c1a7888 by Niels Lohmann
Options

Merge branch 'develop' into feature/sax2

parents 8b379948 cf60e18c
Showing with 81 additions and 79 deletions
test/src/unit-class_parser.cpp
...@@ -1528,88 +1528,90 @@ TEST_CASE("parser class") ...@@ -1528,88 +1528,90 @@ TEST_CASE("parser class")
CHECK(j_empty_array == json()); CHECK(j_empty_array == json());
} }
SECTION("skip in GeoJSON") /*
{ SECTION("skip in GeoJSON")
auto geojsonExample = R"(
{ "type": "FeatureCollection",
"features": [
{ "type": "Feature",
"geometry": {"type": "Point", "coordinates": [102.0, 0.5]},
"properties": {"prop0": "value0"}
},
{ "type": "Feature",
"geometry": {
"type": "LineString",
"coordinates": [
[102.0, 0.0], [103.0, 1.0], [104.0, 0.0], [105.0, 1.0]
]
},
"properties": {
"prop0": "value0",
"prop1": 0.0
}
},
{ "type": "Feature",
"geometry": {
"type": "Polygon",
"coordinates": [
[ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0],
[100.0, 1.0], [100.0, 0.0] ]
]
},
"properties": {
"prop0": "value0",
"prop1": {"this": "that"}
}
}
]
})";
json::parser_callback_t cb = [&](int depth, json::parse_event_t event, json & parsed)
{
// skip uninteresting events
if (event == json::parse_event_t::value and !parsed.is_primitive())
{ {
return false; auto geojsonExample = R"(
} { "type": "FeatureCollection",
"features": [
switch (event) { "type": "Feature",
{ "geometry": {"type": "Point", "coordinates": [102.0, 0.5]},
case json::parse_event_t::key: "properties": {"prop0": "value0"}
{ },
return true; { "type": "Feature",
} "geometry": {
case json::parse_event_t::value: "type": "LineString",
{ "coordinates": [
return false; [102.0, 0.0], [103.0, 1.0], [104.0, 0.0], [105.0, 1.0]
} ]
case json::parse_event_t::object_start: },
{ "properties": {
return true; "prop0": "value0",
} "prop1": 0.0
case json::parse_event_t::object_end: }
{ },
return false; { "type": "Feature",
} "geometry": {
case json::parse_event_t::array_start: "type": "Polygon",
"coordinates": [
[ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0],
[100.0, 1.0], [100.0, 0.0] ]
]
},
"properties": {
"prop0": "value0",
"prop1": {"this": "that"}
}
}
]
})";
json::parser_callback_t cb = [&](int, json::parse_event_t event, json & parsed)
{ {
return true; // skip uninteresting events
} if (event == json::parse_event_t::value and !parsed.is_primitive())
case json::parse_event_t::array_end: {
{ return false;
return false; }
}
default: switch (event)
{ {
return true; case json::parse_event_t::key:
} {
} return true;
}; }
case json::parse_event_t::value:
{
return false;
}
case json::parse_event_t::object_start:
{
return true;
}
case json::parse_event_t::object_end:
{
return false;
}
case json::parse_event_t::array_start:
{
return true;
}
case json::parse_event_t::array_end:
{
return false;
}
default:
{
return true;
}
}
};
auto j = json::parse(geojsonExample, cb, true); auto j = json::parse(geojsonExample, cb, true);
CHECK(j == json()); CHECK(j == json());
} }
*/
} }
SECTION("constructing from contiguous containers") SECTION("constructing from contiguous containers")
......
test/src/unit-ubjson.cpp
...@@ -152,7 +152,7 @@ TEST_CASE("UBJSON") ...@@ -152,7 +152,7 @@ TEST_CASE("UBJSON")
numbers.push_back(-10000000); numbers.push_back(-10000000);
numbers.push_back(-100000000); numbers.push_back(-100000000);
numbers.push_back(-1000000000); numbers.push_back(-1000000000);
numbers.push_back(-2147483648); numbers.push_back(-2147483648L);
for (auto i : numbers) for (auto i : numbers)
{ {
CAPTURE(i); CAPTURE(i);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment