remove MIN_PSEUDO_OPCODE and MAX_PSEUDO_OPCODE too

iritkatriel · iritkatriel · commit fdba0fb4074e · 2023-08-02T16:53:48.000+01:00
diff --git a/Doc/whatsnew/3.13.rst b/Doc/whatsnew/3.13.rst
@@ -124,6 +124,11 @@ opcode
   This field was added in 3.12, it was never documented and is not intended for
   external usage. (Contributed by Irit Katriel in :gh:`105481`.)
 
+* Removed ``opcode.is_pseudo``, ``opcode.MIN_PSEUDO_OPCODE`` and
+  ``opcode.MAX_PSEUDO_OPCODE``, which were added in 3.12, were never
+  documented or exposed through ``dis``, and were not intended to be
+  used externally.
+
 pathlib
 -------
 
diff --git a/Include/opcode.h b/Include/opcode.h
diff --git a/Lib/opcode.py b/Lib/opcode.py
@@ -200,13 +200,8 @@ def def_op(name, op):
 # 255 is reserved
 
 
-MIN_PSEUDO_OPCODE = 256
-MAX_PSEUDO_OPCODE = -1
 
 def pseudo_op(name, op):
-    global MAX_PSEUDO_OPCODE
-    if op > MAX_PSEUDO_OPCODE:
-        MAX_PSEUDO_OPCODE = op
     def_op(name, op)
 
 pseudo_op('SETUP_FINALLY', 256)
@@ -227,7 +222,7 @@ def pseudo_op(name, op):
 
 del def_op, pseudo_op
 
-opname = ['<%r>' % (op,) for op in range(MAX_PSEUDO_OPCODE + 1)]
+opname = ['<%r>' % (op,) for op in range(max(opmap.values()) + 1)]
 for op, i in opmap.items():
     opname[i] = op
 
diff --git a/Misc/NEWS.d/next/Library/2023-08-01-21-43-58.gh-issue-105481.cl2ajS.rst b/Misc/NEWS.d/next/Library/2023-08-01-21-43-58.gh-issue-105481.cl2ajS.rst
@@ -1,3 +1,2 @@
-Remove ``opcode.is_pseudo``, which was added in 3.12, was never documented
-and not intended to be used externally. It is a shortcut for ``op >=
-opcode.MIN_PSEUDO_OPCODE and op <= opcode.MAX_PSEUDO_OPCODE``.
+Remove ``opcode.is_pseudo``, ``opcode.MIN_PSEUDO_OPCODE`` and ``opcode.MAX_PSEUDO_OPCODE``,
+which were added in 3.12, were never documented and were not intended to be used externally.
diff --git a/Tools/build/generate_opcode_h.py b/Tools/build/generate_opcode_h.py
@@ -73,8 +73,6 @@ def main(opcode_py,
     opmap = opcode['opmap']
     opname = opcode['opname']
 
-    MIN_PSEUDO_OPCODE = opcode["MIN_PSEUDO_OPCODE"]
-    MAX_PSEUDO_OPCODE = opcode["MAX_PSEUDO_OPCODE"]
     MIN_INSTRUMENTED_OPCODE = opcode["MIN_INSTRUMENTED_OPCODE"]
 
     NUM_OPCODES = len(opname)
@@ -100,16 +98,11 @@ def main(opcode_py,
         for name in opname:
             if name in opmap:
                 op = opmap[name]
-                if op == MIN_PSEUDO_OPCODE:
-                    fobj.write(DEFINE.format("MIN_PSEUDO_OPCODE", MIN_PSEUDO_OPCODE))
                 if op == MIN_INSTRUMENTED_OPCODE:
                     fobj.write(DEFINE.format("MIN_INSTRUMENTED_OPCODE", MIN_INSTRUMENTED_OPCODE))
 
                 fobj.write(DEFINE.format(name, op))
 
-                if op == MAX_PSEUDO_OPCODE:
-                    fobj.write(DEFINE.format("MAX_PSEUDO_OPCODE", MAX_PSEUDO_OPCODE))
-
 
         for name, op in specialized_opmap.items():
             fobj.write(DEFINE.format(name, op))
