Skip to content

gh-101907: Stop using _Py_OPCODE and _Py_OPARG macros #101912

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.

Sign up for GitHub

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

Merged
markshannon merged 8 commits into from
Feb 20, 2023
Merged

gh-101907: Stop using _Py_OPCODE and _Py_OPARG macros #101912

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1f5d7cb
gh-101907: Removes use of non-standard C++ extension from Include/cpy…
zooba Feb 14, 2023
5005130
Use SET macros instead
zooba Feb 14, 2023
b4fd83d
Remove macros from internal use instead
zooba Feb 14, 2023
a517463
Rename macro parameter
zooba Feb 14, 2023
2bcfd8d
Make cases_generator correct on Windows
zooba Feb 14, 2023
c654b35
Fix hash func
zooba Feb 14, 2023
5edc4d4
Merge remote-tracking branch 'cpython/main' into gh-101907-2
zooba Feb 14, 2023
5d401ed
Fix set_opcode and generated file
zooba Feb 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Make cases_generator correct on Windows
  • Loading branch information
@zooba
zooba committed Feb 14, 2023
commit 2bcfd8d41cd6e2170314a065652939461ecdb38f
2 changes: 1 addition & 1 deletion Python/generated_cases.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Python/opcode_metadata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is generated by Tools\cases_generator\generate_cases.py --metadata
// from Python\bytecodes.c
// This file is generated by Tools/cases_generator/generate_cases.py --metadata
// from Python/bytecodes.c
// Do not edit!

#ifndef NEED_OPCODE_TABLES
Expand Down
5 changes: 3 additions & 2 deletions Tools/cases_generator/generate_cases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import contextlib
import dataclasses
import os
import posixpath
import re
import sys
import typing
Expand All @@ -17,7 +18,7 @@

HERE = os.path.dirname(__file__)
ROOT = os.path.join(HERE, "../..")
THIS = os.path.relpath(__file__, ROOT)
THIS = os.path.relpath(__file__, ROOT).replace(os.path.sep, posixpath.sep)
Comment thread
zooba marked this conversation as resolved.

DEFAULT_INPUT = os.path.relpath(os.path.join(ROOT, "Python/bytecodes.c"))
DEFAULT_OUTPUT = os.path.relpath(os.path.join(ROOT, "Python/generated_cases.c.h"))
Expand Down Expand Up @@ -930,7 +931,7 @@ def write_metadata(self) -> None:
with open(self.metadata_filename, "w") as f:
# Write provenance header
f.write(f"// This file is generated by {THIS} --metadata\n")
f.write(f"// from {os.path.relpath(self.filename, ROOT)}\n")
f.write(f"// from {os.path.relpath(self.filename, ROOT).replace(os.path.sep, posixpath.sep)}\n")
f.write(f"// Do not edit!\n")

# Create formatter; the rest of the code uses this
Expand Down