fix error handling in material parsing #122
Open
+140
−79
Conversation
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
Contributor
Author
|
@clalancette I just noticed that you also worked on more restrictive material parsing in #104. |
rhaschke
force-pushed
the
tolerant-material-parsing
branch
from
beb1e4e to
9ebb53a
Compare
Contributor
Author
Contributor
Author
|
Ping |
rhaschke
force-pushed
the
tolerant-material-parsing
branch
from
9ebb53a to
e787fc8
Compare
Contributor
Author
|
@scpeters, @clalancette, @sloretz |
There are 2 main things done here:
1. Check the return value from parseMaterial, parseLink, and
parseJoint. While these can throw a ParseError exception,
most often they return false when they fail to parse.
2. Revamp the error checking around those calls so that the
code is indented a lot less. It is much easier to read this way.
Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
Just make the code flow easier to understand. Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
We should consider the return value of parseMaterial(). Redefining the same material again, should be accepted. This often occurs when composing URDFs via xacro.
rhaschke
force-pushed
the
tolerant-material-parsing
branch
from
e787fc8 to
c5eaa16
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
We should consider the return value of parseMaterial() to react to plain parsing errors.
Redefining the same material again should be accepted though. This often occurs when composing URDFs via xacro.