Skip to content

Added support for exception-free TOML; resolves #436 #447

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
liuzicheng1987 merged 2 commits into from
Jun 9, 2025
+15 −3
Merged

Added support for exception-free TOML; resolves #436 #447

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ecad0d
Added support for exception-free TOML
liuzicheng1987 Jun 9, 2025
52f9881
Catch std::exception instead of std::runtime_error
liuzicheng1987 Jun 9, 2025
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
18 changes: 15 additions & 3 deletions include/rfl/toml/read.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,21 @@ auto read(InputVarType _var) {
/// Reads a TOML string.
template <class T, class... Ps>
Result<internal::wrap_in_rfl_array_t<T>> read(
const std::string_view _toml_str) {
auto table = ::toml::parse(_toml_str);
return read<T, Ps...>(&table);
const std::string_view _toml_str) noexcept {
#if TOML_EXCEPTIONS
try {
auto table = ::toml::parse(_toml_str);
return read<T, Ps...>(&table);
} catch (const std::exception& e) {
return error(e.what());
}
#else
auto result = ::toml::parse(_toml_str);
if (!result) {
return error(std::string(result.error().description()));
}
return read<T, Ps...>(&result.table());
Comment thread
liuzicheng1987 marked this conversation as resolved.
#endif
}

/// Parses an object from a stringstream.
Expand Down
Loading