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.

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

Fix resolving of macros declared and called in/from a namespace #297

Merged
merged 1 commit into from
Dec 29, 2021

Conversation

rhaschke
Copy link
Contributor

@rhaschke rhaschke commented Oct 30, 2021

Given two macros, declared in a namespace-included file,
from outside they can only be accessed using the namespace prefix.
However, when calling one macro from the other (within the namespace),
the namespace prefix shouldn't be required anymore (it's not even known).
To fix this issue, the macros dict needs to be updated during resolution.
Fixes #296.

Note: macros declared outside the namespace will not be accessible anymore!

Given two macros, declared in a namespace-included file,
from outside they can only be accessed using the namespace prefix.
However, when calling one macro from the other (within the namespace),
the namespace prefix shouldn't be required anymore (it's not even known).
To fix this issue, the macros dict needs to be updated during resolution.
@rhaschke rhaschke merged commit 73e4970 into ros:melodic-devel Dec 29, 2021
rhaschke added a commit to ubi-agni/xacro that referenced this pull request Jan 19, 2022
This is a follow-up of ros#297, which resolved a corresponding issue for macro names only.
As we have separate dicts for macros and symbols, we need to resolve both of them.
rhaschke added a commit to ubi-agni/xacro that referenced this pull request Jan 19, 2022
This is a follow-up of ros#297, which resolved a corresponding issue for macro names only.
As we have separate dicts for macros and symbols, we need to resolve both of them.
rhaschke added a commit that referenced this pull request Jan 20, 2022
This is a follow-up of #297, which resolved a corresponding issue for macro names only.
As we have separate dicts for macros and symbols, we need to resolve both of them.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant