Skip to content

Commit ccc057e

Browse files
filmorfilmor
committed
Add type offsets for 3.12 and update interop generation
1 parent 22d07dd commit ccc057e

File tree

2 files changed

+157
-1
lines changed

2 files changed

+157
-1
lines changed

‎src/runtime/Native/TypeOffset312.cs

+144
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
2+
// Auto-generated by geninterop.py.
3+
// DO NOT MODIFY BY HAND.
4+
5+
// Python 3.12: ABI flags: ''
6+
7+
// ReSharper disable InconsistentNaming
8+
// ReSharper disable IdentifierTypo
9+
10+
using System;
11+
using System.Diagnostics.CodeAnalysis;
12+
using System.Runtime.InteropServices;
13+
14+
using Python.Runtime.Native;
15+
16+
namespace Python.Runtime
17+
{
18+
[SuppressMessage("Style", "IDE1006:Naming Styles",
19+
Justification = "Following CPython",
20+
Scope = "type")]
21+
22+
[StructLayout(LayoutKind.Sequential)]
23+
internal class TypeOffset312 : GeneratedTypeOffsets, ITypeOffsets
24+
{
25+
public TypeOffset312() { }
26+
// Auto-generated from PyHeapTypeObject in Python.h
27+
public int ob_refcnt { get; private set; }
28+
public int ob_type { get; private set; }
29+
public int ob_size { get; private set; }
30+
public int tp_name { get; private set; }
31+
public int tp_basicsize { get; private set; }
32+
public int tp_itemsize { get; private set; }
33+
public int tp_dealloc { get; private set; }
34+
public int tp_vectorcall_offset { get; private set; }
35+
public int tp_getattr { get; private set; }
36+
public int tp_setattr { get; private set; }
37+
public int tp_as_async { get; private set; }
38+
public int tp_repr { get; private set; }
39+
public int tp_as_number { get; private set; }
40+
public int tp_as_sequence { get; private set; }
41+
public int tp_as_mapping { get; private set; }
42+
public int tp_hash { get; private set; }
43+
public int tp_call { get; private set; }
44+
public int tp_str { get; private set; }
45+
public int tp_getattro { get; private set; }
46+
public int tp_setattro { get; private set; }
47+
public int tp_as_buffer { get; private set; }
48+
public int tp_flags { get; private set; }
49+
public int tp_doc { get; private set; }
50+
public int tp_traverse { get; private set; }
51+
public int tp_clear { get; private set; }
52+
public int tp_richcompare { get; private set; }
53+
public int tp_weaklistoffset { get; private set; }
54+
public int tp_iter { get; private set; }
55+
public int tp_iternext { get; private set; }
56+
public int tp_methods { get; private set; }
57+
public int tp_members { get; private set; }
58+
public int tp_getset { get; private set; }
59+
public int tp_base { get; private set; }
60+
public int tp_dict { get; private set; }
61+
public int tp_descr_get { get; private set; }
62+
public int tp_descr_set { get; private set; }
63+
public int tp_dictoffset { get; private set; }
64+
public int tp_init { get; private set; }
65+
public int tp_alloc { get; private set; }
66+
public int tp_new { get; private set; }
67+
public int tp_free { get; private set; }
68+
public int tp_is_gc { get; private set; }
69+
public int tp_bases { get; private set; }
70+
public int tp_mro { get; private set; }
71+
public int tp_cache { get; private set; }
72+
public int tp_subclasses { get; private set; }
73+
public int tp_weaklist { get; private set; }
74+
public int tp_del { get; private set; }
75+
public int tp_version_tag { get; private set; }
76+
public int tp_finalize { get; private set; }
77+
public int tp_vectorcall { get; private set; }
78+
public int tp_watched { get; private set; }
79+
public int am_await { get; private set; }
80+
public int am_aiter { get; private set; }
81+
public int am_anext { get; private set; }
82+
public int am_send { get; private set; }
83+
public int nb_add { get; private set; }
84+
public int nb_subtract { get; private set; }
85+
public int nb_multiply { get; private set; }
86+
public int nb_remainder { get; private set; }
87+
public int nb_divmod { get; private set; }
88+
public int nb_power { get; private set; }
89+
public int nb_negative { get; private set; }
90+
public int nb_positive { get; private set; }
91+
public int nb_absolute { get; private set; }
92+
public int nb_bool { get; private set; }
93+
public int nb_invert { get; private set; }
94+
public int nb_lshift { get; private set; }
95+
public int nb_rshift { get; private set; }
96+
public int nb_and { get; private set; }
97+
public int nb_xor { get; private set; }
98+
public int nb_or { get; private set; }
99+
public int nb_int { get; private set; }
100+
public int nb_reserved { get; private set; }
101+
public int nb_float { get; private set; }
102+
public int nb_inplace_add { get; private set; }
103+
public int nb_inplace_subtract { get; private set; }
104+
public int nb_inplace_multiply { get; private set; }
105+
public int nb_inplace_remainder { get; private set; }
106+
public int nb_inplace_power { get; private set; }
107+
public int nb_inplace_lshift { get; private set; }
108+
public int nb_inplace_rshift { get; private set; }
109+
public int nb_inplace_and { get; private set; }
110+
public int nb_inplace_xor { get; private set; }
111+
public int nb_inplace_or { get; private set; }
112+
public int nb_floor_divide { get; private set; }
113+
public int nb_true_divide { get; private set; }
114+
public int nb_inplace_floor_divide { get; private set; }
115+
public int nb_inplace_true_divide { get; private set; }
116+
public int nb_index { get; private set; }
117+
public int nb_matrix_multiply { get; private set; }
118+
public int nb_inplace_matrix_multiply { get; private set; }
119+
public int mp_length { get; private set; }
120+
public int mp_subscript { get; private set; }
121+
public int mp_ass_subscript { get; private set; }
122+
public int sq_length { get; private set; }
123+
public int sq_concat { get; private set; }
124+
public int sq_repeat { get; private set; }
125+
public int sq_item { get; private set; }
126+
public int was_sq_slice { get; private set; }
127+
public int sq_ass_item { get; private set; }
128+
public int was_sq_ass_slice { get; private set; }
129+
public int sq_contains { get; private set; }
130+
public int sq_inplace_concat { get; private set; }
131+
public int sq_inplace_repeat { get; private set; }
132+
public int bf_getbuffer { get; private set; }
133+
public int bf_releasebuffer { get; private set; }
134+
public int name { get; private set; }
135+
public int ht_slots { get; private set; }
136+
public int qualname { get; private set; }
137+
public int ht_cached_keys { get; private set; }
138+
public int ht_module { get; private set; }
139+
public int _ht_tpname { get; private set; }
140+
public int spec_cache_getitem { get; private set; }
141+
public int getitem_version { get; private set; }
142+
}
143+
}
144+

‎tools/geninterop/geninterop.py

+13-1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ def visit(self, node):
7676
self.visit_ptrdecl(node)
7777
elif isinstance(node, c_ast.IdentifierType):
7878
self.visit_identifier(node)
79+
elif isinstance(node, c_ast.Union):
80+
self.visit_union(node)
7981

8082
def visit_ast(self, ast):
8183
for _name, node in ast.children():
@@ -119,6 +121,16 @@ def visit_identifier(self, identifier):
119121
type_name = " ".join(identifier.names)
120122
self._add_struct_member(type_name)
121123

124+
def visit_union(self, union):
125+
# Treat the field as if it was just the first declaration for now. This
126+
# is not really correct, but handles the one case that is relevant for
127+
# us right now (ob_refcnt being "split" in Python 3.12)
128+
if self._struct_members_stack and union.decls:
129+
decl = union.decls[0]
130+
self._struct_members_stack.pop(0)
131+
self._struct_members_stack.insert(0, decl.name)
132+
self.visit(decl)
133+
122134
def _add_struct_member(self, type_name):
123135
if not (self._struct_stack and self._struct_members_stack):
124136
return
@@ -245,7 +257,7 @@ def gen_interop_head(writer, version, abi_flags):
245257
// Auto-generated by {filename}.
246258
// DO NOT MODIFY BY HAND.
247259
248-
// Python {".".join(version[:2])}: ABI flags: '{abi_flags}'
260+
// Python {".".join(map(str, version[:2]))}: ABI flags: '{abi_flags}'
249261
250262
// ReSharper disable InconsistentNaming
251263
// ReSharper disable IdentifierTypo

0 commit comments

Comments
 (0)