Repository navigation
Argument Clinic: multiple macro definition #67688
Description
Activity
Argument Clinic generates multiple definitions in non-block mode for functions with alternating signature. See example file. If FOO is not defines, SPAM_METHODDEF is defined twice.
First time in:
#ifndef SPAM_METHODDEF #define SPAM_METHODDEF #endif /* !defined(SPAM_METHODDEF) */
Second time in:
#if !defined(FOO) ... #define SPAM_METHODDEF \
- addedbuildThe build process and cross-buildThe build process and cross-buildtype-bugAn unexpected behavior, bug, or errorAn unexpected behavior, bug, or error
on Feb 22, 2015 Can you give me a test case?
Oh, sorry. Here is a sample. Other sample see in bpo-23501.
Here is a patch which moves all methoddef_ifndef to the end of the buffer or file, so they are not conflicts with other definitions.
Here is a sample file generated by fixed clinic.py.
In your sample output we still get two #ifndef SPAM_METHODDEF stanzas. Wouldn't it be better to only have one?
Maybe Clinic needs to be smarter about generating those anyway. Let me think about it.
Actually in this sample output no one #ifndef SPAM_METHODDEF stanza is needed, because SPAM_METHODDEF is defined in any case.
How about this approach? Only ever emit the #ifndef stanza once per symbol.
(see larry.ac_multiple_macro_definitions.diff.1.txt posted above)
Oops, I should have run "make clinic", so you could see all the changes that result from this patch.
It doesn't fix the issue, because the #ifndef stanza is emitted before second definition. Try to run clinic.py with your patch on sample.c. But may be this idea can be used with my patch.
6 remaining items
Looks as you didn't notice my comments on Rietveld.
I did, I just didn't respond. I'll do that now.
Updated patch, removed all references to two-pass. Also realized I needed to make the default behavior for methoddef_ifndef go to the end. And, finally, I forgot to merge the "only print each #ifndef block once" code I wrote before when I redid the patch, so that's in now.
larry.ac_multiple_macro_definitions.diff.5.txt LGTM.
New changeset 25eef0ecb9c1 by Larry Hastings in branch 'default':
Issue bpo-23500: Argument Clinic is now smarter about generating the "#ifndef"
https://hg.python.org/cpython/rev/25eef0ecb9c1Does this really need a backport to 3.4?
I think this is not needed.
Thank you Larry.
Removing 3.4 from the version list as I close the bug, then. If we decide we need it backported please reopen (or create a new bug, either is fine).
- added 3 commits that reference this issue
on May 3, 2023
Note: these values reflect the state of the issue at the time it was migrated and might not reflect the current state.
Show more details
GitHub fields:
bugs.python.org fields: