Repository navigation
[refactor] Replace std::stof with parse_float #368
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.
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
antond-weta
merged 2 commits into
AcademySoftwareFoundation:main
from
antond-weta:from_chars
Nov 10, 2026
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // Copyright Contributors to the rawtoaces Project. | ||
|
|
||
| #include "helpers.h" | ||
|
|
||
| #include <charconv> | ||
|
|
||
| namespace rta | ||
| { | ||
| namespace helpers | ||
| { | ||
|
|
||
| bool parse_float( const std::string &str, float &out ) | ||
| { | ||
| auto [ptr, ec] = | ||
| std::from_chars( str.data(), str.data() + str.size(), out ); | ||
| return ec == std::errc(); | ||
| } | ||
|
|
||
| } // namespace helpers | ||
| } // namespace rta |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // Copyright Contributors to the rawtoaces Project. | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <string> | ||
|
|
||
| namespace rta | ||
| { | ||
| namespace helpers | ||
| { | ||
|
|
||
| /// Parse a float from a string without throwing. | ||
| /// | ||
| /// Unlike `std::stof`, this never throws: a non-numeric input simply | ||
| /// returns `false`. | ||
| /// | ||
| /// @param str String to parse. | ||
| /// @param out Destination filled on success. | ||
| /// @return `true` if a float could be parsed from the start of `str`. | ||
| bool parse_float( const std::string &str, float &out ); | ||
|
|
||
| } // namespace helpers | ||
| } // namespace rta |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,7 @@ | |
| // Copyright Contributors to the rawtoaces Project. | ||
|
|
||
| #include <rawtoaces/spectral_data.h> | ||
| #include "../misc/helpers.h" | ||
|
|
||
| #include <assert.h> | ||
| #include <fstream> | ||
|
|
@@ -278,7 +279,17 @@ bool SpectralData::load( | |
| for ( auto &[bin_wavelength, bin_values]: | ||
| spectral_data[set_name].items() ) | ||
| { | ||
| float this_wavelength = std::stof( bin_wavelength ); | ||
| float this_wavelength = 0.0f; | ||
| if ( !rta::helpers::parse_float( | ||
| bin_wavelength, this_wavelength ) ) | ||
| { | ||
| if ( error_message != nullptr ) | ||
| { | ||
| *error_message = "Error: Failed to parse wavelength '" + | ||
| bin_wavelength + "' in " + path + "."; | ||
| } | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. you reckon this error handling and error adding can be integrated into helper ... I guess not, you'd need to pass error message in as a ref. and all that. ignore me. |
||
| return false; | ||
| } | ||
|
|
||
| if ( prev_wavelength != -1 ) | ||
| { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/nit I feel like now when we have opened that flood gate of "util" or "helper" place we can drop here bunch stuff from other places.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Which is a good thing, right?
rawtoaces_utilis a public target containing image conversion functionality (poorly named in my opinion). The whole reason for addinghelperswas that it's notutil.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.