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

Merge pull request #1187 from devsisters/json-internal-catch

Browse source 
[RFC] Introduce a new macro function: JSON_INTERNAL_CATCH
This commit is contained in:
Niels Lohmann 2018-08-14 21:56:29 +02:00 committed by GitHub
commit 0e748f2f8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/nlohmann/detail/macro_scope.hpp
View file

@ -42,10 +42,12 @@
#define JSON_THROW(exception) throw exception
#define JSON_TRY try
#define JSON_CATCH(exception) catch(exception)
#define JSON_INTERNAL_CATCH(exception) catch(exception)
#else
#define JSON_THROW(exception) std::abort()
#define JSON_TRY if(true)
#define JSON_CATCH(exception) if(false)
#define JSON_INTERNAL_CATCH(exception) if(false)
#endif
// override exception macros
@ -60,6 +62,11 @@
#if defined(JSON_CATCH_USER)
#undef JSON_CATCH
#define JSON_CATCH JSON_CATCH_USER
#define JSON_INTERNAL_CATCH JSON_CATCH_USER
#endif
#if defined(JSON_INTERNAL_CATCH_USER)
#undef JSON_INTERNAL_CATCH
#define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER
#endif
// manual branch prediction

1
include/nlohmann/detail/macro_unscope.hpp
View file

@ -9,6 +9,7 @@
#endif
// clean up
#undef JSON_INTERNAL_CATCH
#undef JSON_CATCH
#undef JSON_THROW
#undef JSON_TRY

4
include/nlohmann/json.hpp
View file

@ -3437,7 +3437,7 @@ class basic_json
{
return ptr.get_checked(this);
}
JSON_CATCH (out_of_range&)
JSON_INTERNAL_CATCH (out_of_range&)
{
return default_value;
}
@ -7359,7 +7359,7 @@ class basic_json
// the "path" location must exist - use at()
success = (result.at(ptr) == get_value("test", "value", false));
}
JSON_CATCH (out_of_range&)
JSON_INTERNAL_CATCH (out_of_range&)
{
// ignore out of range errors: success remains false
}

12
single_include/nlohmann/json.hpp
View file

@ -157,10 +157,12 @@ using json = basic_json<>;
#define JSON_THROW(exception) throw exception
#define JSON_TRY try
#define JSON_CATCH(exception) catch(exception)
#define JSON_INTERNAL_CATCH(exception) catch(exception)
#else
#define JSON_THROW(exception) std::abort()
#define JSON_TRY if(true)
#define JSON_CATCH(exception) if(false)
#define JSON_INTERNAL_CATCH(exception) if(false)
#endif
// override exception macros
@ -175,6 +177,11 @@ using json = basic_json<>;
#if defined(JSON_CATCH_USER)
#undef JSON_CATCH
#define JSON_CATCH JSON_CATCH_USER
#define JSON_INTERNAL_CATCH JSON_CATCH_USER
#endif
#if defined(JSON_INTERNAL_CATCH_USER)
#undef JSON_INTERNAL_CATCH
#define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER
#endif
// manual branch prediction
@ -14282,7 +14289,7 @@ class basic_json
{
return ptr.get_checked(this);
}
JSON_CATCH (out_of_range&)
JSON_INTERNAL_CATCH (out_of_range&)
{
return default_value;
}
@ -18204,7 +18211,7 @@ class basic_json
// the "path" location must exist - use at()
success = (result.at(ptr) == get_value("test", "value", false));
}
JSON_CATCH (out_of_range&)
JSON_INTERNAL_CATCH (out_of_range&)
{
// ignore out of range errors: success remains false
}
@ -18574,6 +18581,7 @@ inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std
#endif
// clean up
#undef JSON_INTERNAL_CATCH
#undef JSON_CATCH
#undef JSON_THROW
#undef JSON_TRY