j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed some warnings

Browse source
This commit is contained in:
Niels 2016-04-24 19:09:12 +02:00
parent 8d4cf5ef8d
commit 96cfe7463f
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/json.hpp
View file

@ -9522,7 +9522,7 @@ basic_json_parser_63:
basic_json result = *this; basic_json result = *this;
// wrapper for "add" operation; add value at ptr // wrapper for "add" operation; add value at ptr
const auto operation_add = [&result](json_pointer & ptr, basic_json value) const auto operation_add = [&result](json_pointer & ptr, basic_json val)
{ {
// get reference to parent of JSON pointer ptr // get reference to parent of JSON pointer ptr
const auto last_path = ptr.pop_back(); const auto last_path = ptr.pop_back();
@ -9531,19 +9531,19 @@ basic_json_parser_63:
if (parent.is_object()) if (parent.is_object())
{ {
// use operator[] to add value // use operator[] to add value
parent[last_path] = value; parent[last_path] = val;
} }
else if (parent.is_array()) else if (parent.is_array())
{ {
if (last_path == "-") if (last_path == "-")
{ {
// special case: append to back // special case: append to back
parent.push_back(value); parent.push_back(val);
} }
else else
{ {
// default case: insert add offset // default case: insert add offset
parent.insert(parent.begin() + std::stoi(last_path), value); parent.insert(parent.begin() + std::stoi(last_path), val);
} }
} }
}; };
@ -9579,7 +9579,7 @@ basic_json_parser_63:
// wrapper to get a value for an operation // wrapper to get a value for an operation
const auto get_value = [&val](const std::string & op, const auto get_value = [&val](const std::string & op,
const std::string & member, const std::string & member,
bool string_type = false) -> basic_json& bool string_type) -> basic_json&
{ {
// find value // find value
auto it = val.m_value.object->find(member); auto it = val.m_value.object->find(member);
@ -9616,7 +9616,7 @@ basic_json_parser_63:
if (op == "add") if (op == "add")
{ {
operation_add(ptr, get_value("add", "value")); operation_add(ptr, get_value("add", "value", false));
} }
else if (op == "remove") else if (op == "remove")
{ {
@ -9624,7 +9624,7 @@ basic_json_parser_63:
} }
else if (op == "replace") else if (op == "replace")
{ {
result.at(ptr) = get_value("replace", "value"); result.at(ptr) = get_value("replace", "value", false);
} }
else if (op == "move") else if (op == "move")
{ {
@ -9644,7 +9644,7 @@ basic_json_parser_63:
} }
else if (op == "test") else if (op == "test")
{ {
if (result.at(ptr) != get_value("test", "value")) if (result.at(ptr) != get_value("test", "value", false))
{ {
throw std::domain_error("unsuccessful: " + val.dump()); throw std::domain_error("unsuccessful: " + val.dump());
} }

16
src/json.hpp.re2c
View file

@ -8832,7 +8832,7 @@ class basic_json
basic_json result = *this; basic_json result = *this;
// wrapper for "add" operation; add value at ptr // wrapper for "add" operation; add value at ptr
const auto operation_add = [&result](json_pointer & ptr, basic_json value) const auto operation_add = [&result](json_pointer & ptr, basic_json val)
{ {
// get reference to parent of JSON pointer ptr // get reference to parent of JSON pointer ptr
const auto last_path = ptr.pop_back(); const auto last_path = ptr.pop_back();
@ -8841,19 +8841,19 @@ class basic_json
if (parent.is_object()) if (parent.is_object())
{ {
// use operator[] to add value // use operator[] to add value
parent[last_path] = value; parent[last_path] = val;
} }
else if (parent.is_array()) else if (parent.is_array())
{ {
if (last_path == "-") if (last_path == "-")
{ {
// special case: append to back // special case: append to back
parent.push_back(value); parent.push_back(val);
} }
else else
{ {
// default case: insert add offset // default case: insert add offset
parent.insert(parent.begin() + std::stoi(last_path), value); parent.insert(parent.begin() + std::stoi(last_path), val);
} }
} }
}; };
@ -8889,7 +8889,7 @@ class basic_json
// wrapper to get a value for an operation // wrapper to get a value for an operation
const auto get_value = [&val](const std::string & op, const auto get_value = [&val](const std::string & op,
const std::string & member, const std::string & member,
bool string_type = false) -> basic_json& bool string_type) -> basic_json&
{ {
// find value // find value
auto it = val.m_value.object->find(member); auto it = val.m_value.object->find(member);
@ -8926,7 +8926,7 @@ class basic_json
if (op == "add") if (op == "add")
{ {
operation_add(ptr, get_value("add", "value")); operation_add(ptr, get_value("add", "value", false));
} }
else if (op == "remove") else if (op == "remove")
{ {
@ -8934,7 +8934,7 @@ class basic_json
} }
else if (op == "replace") else if (op == "replace")
{ {
result.at(ptr) = get_value("replace", "value"); result.at(ptr) = get_value("replace", "value", false);
} }
else if (op == "move") else if (op == "move")
{ {
@ -8954,7 +8954,7 @@ class basic_json
} }
else if (op == "test") else if (op == "test")
{ {
if (result.at(ptr) != get_value("test", "value")) if (result.at(ptr) != get_value("test", "value", false))
{ {
throw std::domain_error("unsuccessful: " + val.dump()); throw std::domain_error("unsuccessful: " + val.dump());
} }