Skip to content
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

fixing fast float stod conversion according to ST_Number schema specification #339

Merged
merged 5 commits into from
Jan 31, 2024
Merged

fixing fast float stod conversion according to ST_Number schema specification #339

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
06eb11a
fixing stod conversion according to schema
gangatp Jan 30, 2024
5d18331
spaces to tabs
gangatp Jan 30, 2024
4e2e76c
adding test case
gangatp Jan 30, 2024
3a52ffb
adding test case for leading plus sign double conversion
gangatp Jan 30, 2024
324ed58
refactoring
gangatp Jan 30, 2024
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
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ file(GLOB
list(FILTER LIBS_INCLUDE EXCLUDE REGEX "zlib|libzip|libressl")
target_include_directories(${PROJECT_NAME} PRIVATE ${LIBS_INCLUDE})

# allow FASTFLOAT_ALLOWS_LEADING_PLUS
add_definitions(-DFASTFLOAT_ALLOWS_LEADING_PLUS=1)

target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source)
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Include/API)
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Include)
Expand Down
4 changes: 4 additions & 0 deletions Source/Common/NMR_StringUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,10 @@
{
throw CNMRException(NMR_ERROR_EMPTYSTRINGTODOUBLECONVERSION);
}
else if (answer.ptr && answer.ptr[0] == ',') // Invalidate comma as decimal separator
{
throw CNMRException(NMR_ERROR_INVALIDSTRINGTODOUBLECONVERSION);

Check warning on line 166 in Source/Common/NMR_StringUtils.cpp

View check run for this annotation

Codecov / codecov/patch

Source/Common/NMR_StringUtils.cpp#L166 

Added line #L166 was not covered by tests
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's also add a test for that, please.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer that we do never add such style of code. While it is shorter, it is a landmine and who knows on what situation and platform (or little change by somebody) answer.ptr[0] is evaluated when answer.ptr == nullptr.

Making two if statements out of it is much easier to read and much safer.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if(answer.ptr){
if(answer.ptr[0] == ','){
throw here
}
}

I can make this into two if statements for readability, but that would mean the same. Did you mean anything else?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's what I meant, yes :)

}

if ((dResult == HUGE_VAL) || (dResult == -HUGE_VAL))
throw CNMRException(NMR_ERROR_STRINGTODOUBLECONVERSIONOUTOFRANGE);
Expand Down
6 changes: 6 additions & 0 deletions Tests/CPP_Bindings/Source/Reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,4 +149,10 @@ namespace Lib3MF
auto reader = model->QueryReader("3mf");
ASSERT_SPECIFIC_THROW(reader->ReadFromFile(sTestFilesPath + "/Reader/" + "GEN-M-ADA-ITEM-TRANSFORM-0.3mf"), ELib3MFException);
}


TEST_F(Reader, IntegrationTestError) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good idea to add a test there.

Please explain what the content of the file is and why it should fail.
Also please change the name to something meaningfull.

auto reader = model->QueryReader("3mf");
ASSERT_SPECIFIC_THROW(reader->ReadFromFile(sTestFilesPath + "/Reader/" + "N_XXX_0422_01.3mf"), ELib3MFException);
}
}
Loading