refactor: replace regex matching with find_last_of to split plugin name #271
+27
−58
Conversation
This file contains 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
c33b84a to
4e5da06
Compare
sloretz
requested changes
Feb 4, 2025
Comment on lines
+509
to
+525
| auto last_slash = lookup_name.find_last_of('/'); | ||
| auto last_colon = lookup_name.find_last_of(':'); | ||
| if (last_slash == std::string::npos && last_colon == std::string::npos) { | ||
| // no matches | ||
| return lookup_name; | ||
| } | ||
| if (last_slash == std::string::npos) { | ||
| // only colon matched | ||
| return lookup_name.substr(last_colon + 1); | ||
| } | ||
| if (last_colon == std::string::npos) { | ||
| // only slash matched | ||
| return lookup_name.substr(last_slash + 1); | ||
| } | ||
| // both matched, return shorter suffix | ||
| return lookup_name.substr(std::max(last_slash, last_colon) + 1); |
There was a problem hiding this comment.
Thank you for the PR!
Please add unit tests for ClassLoader<T>::getName so we can make sure the code works the same before and after the refactor
https://github.com/ros/pluginlib/blob/rolling/test/utest.cpp
There was a problem hiding this comment.
Please also add #include <algorithm> for max to make the linter happy: https://build.ros2.org/job/Rpr__pluginlib__ubuntu_noble_amd64/17/testReport/junit/pluginlib/cpplint/build_include_what_you_use__4____tmp_ws_src_pluginlib_include_pluginlib_class_loader_imp_hpp_524_/
There was a problem hiding this comment.
I added some tests and the missing include. Let me know if I should add any additional test cases.
3c0d559 to
1f8f369
Compare
Signed-off-by: Felix Zeltner <28302109+ipa-fez@users.noreply.github.com>
1f8f369 to
a2457b0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This gets rid of the regex based string splitting and just finds the appropriate substring using a delimiter directly.
I came across this because clang-19 raises some
-Wmaybe-uninitializedwarnings inside the regex code here.