Skip to content

Conversation

@iritkatriel
Copy link
Member

@iritkatriel iritkatriel commented Aug 15, 2024

Also organises them at the top with the macros next to the functions they are invoking.

(e.g., ADDOP needed to move before the codegen_addop_* functions that now use it).

Copy link
Member

@picnixz picnixz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to be sure, but you are not introducing new macros right? it's just moving them around right and replacing parts of the code with existing macros? if so, could you maybe consider merging #120018 first so that those macros use do-while constructions and then apply your changes? (you can also first merge your PR and I'll take care of conflicts in my branch if you don't want to be held up).

@iritkatriel
Copy link
Member Author

Just to be sure, but you are not introducing new macros right? it's just moving them around right and replacing parts of the code with existing macros? if so, could you maybe consider merging #120018 first so that those macros use do-while constructions and then apply your changes? (you can also first merge your PR and I'll take care of conflicts in my branch if you don't want to be held up).

I think I added one or two macros with *_IN_SCOPE. I forgot about your outstanding PR. We can merge in either order, it should be quite straightforward to resolve.

@picnixz
Copy link
Member

picnixz commented Aug 16, 2024

Let's merge your PR first. It'll be easier for me to solve the conflicts afterwards and that way, you don't have to change this branch in particular (my PR is not outstanding btw but I appreciate the qualifier 😄)

Copy link
Member

@markshannon markshannon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@iritkatriel iritkatriel merged commit e2f2dc7 into python:main Aug 16, 2024
jeremyhylton pushed a commit to jeremyhylton/cpython that referenced this pull request Aug 19, 2024
blhsing pushed a commit to blhsing/cpython that referenced this pull request Aug 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

interpreter-core (Objects, Python, Grammar, and Parser dirs) skip news

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants