modtool fix noblock codegen #7318
Merged
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
marcusmueller
added
modtool
Python
pybind11
Bug Fix
Backport-3.10
marcusmueller
force-pushed
the
modtool_fix_noblock_codegen
branch
from
7beb140
to
b8f93a4
Compare
marcusmueller
force-pushed
the
modtool_fix_noblock_codegen
branch
from
b8f93a4
to
d329c4a
Compare
|
@marcusmueller are you still working on this one, or should we make it draft? |
marcusmueller
force-pushed
the
modtool_fix_noblock_codegen
branch
from
d329c4a
to
0e54ebd
Compare
|
Could you squash the last 2 commits, then I'll merge. |
Two issues: modtool's `add` functionality incorrectly adds binding specification for a non-existing `make` function to the generated bind_*.cc code. And: the templates for pydocs and bindings differ in how they start counting overloaded constructors. bindtool generates D() properties for pybind11'ed classes. To handle overloaded methods, the pydoc_h strings carry a trailing `_N`, which the template code automatically increments, when it's detected that there's more than one member of the same type and name. However, there was a mismatch between counting of constructor duplicity in the pybind11 bind_classname.cc-generating template, and the pydoc-generating template, such that the pydoc-generating template did not automatically add a _0 to the first constructor, whereas the bind_classname.cc expected that (the ctor name being identical to the class name). Fixing `add`'s `make` wrapping required modification of the `header_info` structure entertwined with how the bindtool templates were fixed, so these two changes ended up in the same commit. Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
marcusmueller
force-pushed
the
modtool_fix_noblock_codegen
branch
from
e016e28
to
25e3bb9
Compare
|
@willcode ping! |
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.
Description
Due to an expectation mismatch between addition of binding code and pydoc code, noblock OOT python bindings did not compile.
Also required that modtool's add functionality only adds
makebindings to actual blocks that have them.Related Issue
Fixes #6960
Which blocks/areas does this affect?
modtool/OOTs
Checklist