Skip to content

Commit ab97b02

Browse files
lostmsulostmsu
committed
revert slot-related parts of 1b466df to avoid conditional compilation
1 parent d623d2f commit ab97b02

7 files changed

Lines changed: 9 additions & 431 deletions

File tree

‎src/runtime/interop36.cs‎

Lines changed: 0 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -133,97 +133,4 @@ public TypeOffset36() { }
133133
public int qualname { get; private set; }
134134
public int ht_cached_keys { get; private set; }
135135
}
136-
137-
#if PYTHON36
138-
[StructLayout(LayoutKind.Sequential)]
139-
internal struct PyNumberMethods
140-
{
141-
public IntPtr nb_add;
142-
public IntPtr nb_subtract;
143-
public IntPtr nb_multiply;
144-
public IntPtr nb_remainder;
145-
public IntPtr nb_divmod;
146-
public IntPtr nb_power;
147-
public IntPtr nb_negative;
148-
public IntPtr nb_positive;
149-
public IntPtr nb_absolute;
150-
public IntPtr nb_bool;
151-
public IntPtr nb_invert;
152-
public IntPtr nb_lshift;
153-
public IntPtr nb_rshift;
154-
public IntPtr nb_and;
155-
public IntPtr nb_xor;
156-
public IntPtr nb_or;
157-
public IntPtr nb_int;
158-
public IntPtr nb_reserved;
159-
public IntPtr nb_float;
160-
public IntPtr nb_inplace_add;
161-
public IntPtr nb_inplace_subtract;
162-
public IntPtr nb_inplace_multiply;
163-
public IntPtr nb_inplace_remainder;
164-
public IntPtr nb_inplace_power;
165-
public IntPtr nb_inplace_lshift;
166-
public IntPtr nb_inplace_rshift;
167-
public IntPtr nb_inplace_and;
168-
public IntPtr nb_inplace_xor;
169-
public IntPtr nb_inplace_or;
170-
public IntPtr nb_floor_divide;
171-
public IntPtr nb_true_divide;
172-
public IntPtr nb_inplace_floor_divide;
173-
public IntPtr nb_inplace_true_divide;
174-
public IntPtr nb_index;
175-
public IntPtr nb_matrix_multiply;
176-
public IntPtr nb_inplace_matrix_multiply;
177-
}
178-
179-
[StructLayout(LayoutKind.Sequential)]
180-
internal struct PySequenceMethods
181-
{
182-
public IntPtr sq_length;
183-
public IntPtr sq_concat;
184-
public IntPtr sq_repeat;
185-
public IntPtr sq_item;
186-
public IntPtr was_sq_slice;
187-
public IntPtr sq_ass_item;
188-
public IntPtr was_sq_ass_slice;
189-
public IntPtr sq_contains;
190-
public IntPtr sq_inplace_concat;
191-
public IntPtr sq_inplace_repeat;
192-
}
193-
194-
[StructLayout(LayoutKind.Sequential)]
195-
internal struct PyMappingMethods
196-
{
197-
public IntPtr mp_length;
198-
public IntPtr mp_subscript;
199-
public IntPtr mp_ass_subscript;
200-
}
201-
202-
[StructLayout(LayoutKind.Sequential)]
203-
internal struct PyAsyncMethods
204-
{
205-
public IntPtr am_await;
206-
public IntPtr am_aiter;
207-
public IntPtr am_anext;
208-
}
209-
210-
[StructLayout(LayoutKind.Sequential)]
211-
internal struct PyBufferProcs
212-
{
213-
public IntPtr bf_getbuffer;
214-
public IntPtr bf_releasebuffer;
215-
}
216-
217-
internal static partial class SlotTypes
218-
{
219-
public static readonly Type[] Types = {
220-
typeof(PyNumberMethods),
221-
typeof(PySequenceMethods),
222-
typeof(PyMappingMethods),
223-
typeof(PyAsyncMethods),
224-
typeof(PyBufferProcs),
225-
};
226-
}
227-
228-
#endif
229136
}

‎src/runtime/interop37.cs‎

Lines changed: 0 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -133,97 +133,4 @@ public TypeOffset37() { }
133133
public int qualname { get; private set; }
134134
public int ht_cached_keys { get; private set; }
135135
}
136-
137-
#if PYTHON37
138-
[StructLayout(LayoutKind.Sequential)]
139-
internal struct PyNumberMethods
140-
{
141-
public IntPtr nb_add;
142-
public IntPtr nb_subtract;
143-
public IntPtr nb_multiply;
144-
public IntPtr nb_remainder;
145-
public IntPtr nb_divmod;
146-
public IntPtr nb_power;
147-
public IntPtr nb_negative;
148-
public IntPtr nb_positive;
149-
public IntPtr nb_absolute;
150-
public IntPtr nb_bool;
151-
public IntPtr nb_invert;
152-
public IntPtr nb_lshift;
153-
public IntPtr nb_rshift;
154-
public IntPtr nb_and;
155-
public IntPtr nb_xor;
156-
public IntPtr nb_or;
157-
public IntPtr nb_int;
158-
public IntPtr nb_reserved;
159-
public IntPtr nb_float;
160-
public IntPtr nb_inplace_add;
161-
public IntPtr nb_inplace_subtract;
162-
public IntPtr nb_inplace_multiply;
163-
public IntPtr nb_inplace_remainder;
164-
public IntPtr nb_inplace_power;
165-
public IntPtr nb_inplace_lshift;
166-
public IntPtr nb_inplace_rshift;
167-
public IntPtr nb_inplace_and;
168-
public IntPtr nb_inplace_xor;
169-
public IntPtr nb_inplace_or;
170-
public IntPtr nb_floor_divide;
171-
public IntPtr nb_true_divide;
172-
public IntPtr nb_inplace_floor_divide;
173-
public IntPtr nb_inplace_true_divide;
174-
public IntPtr nb_index;
175-
public IntPtr nb_matrix_multiply;
176-
public IntPtr nb_inplace_matrix_multiply;
177-
}
178-
179-
[StructLayout(LayoutKind.Sequential)]
180-
internal struct PySequenceMethods
181-
{
182-
public IntPtr sq_length;
183-
public IntPtr sq_concat;
184-
public IntPtr sq_repeat;
185-
public IntPtr sq_item;
186-
public IntPtr was_sq_slice;
187-
public IntPtr sq_ass_item;
188-
public IntPtr was_sq_ass_slice;
189-
public IntPtr sq_contains;
190-
public IntPtr sq_inplace_concat;
191-
public IntPtr sq_inplace_repeat;
192-
}
193-
194-
[StructLayout(LayoutKind.Sequential)]
195-
internal struct PyMappingMethods
196-
{
197-
public IntPtr mp_length;
198-
public IntPtr mp_subscript;
199-
public IntPtr mp_ass_subscript;
200-
}
201-
202-
[StructLayout(LayoutKind.Sequential)]
203-
internal struct PyAsyncMethods
204-
{
205-
public IntPtr am_await;
206-
public IntPtr am_aiter;
207-
public IntPtr am_anext;
208-
}
209-
210-
[StructLayout(LayoutKind.Sequential)]
211-
internal struct PyBufferProcs
212-
{
213-
public IntPtr bf_getbuffer;
214-
public IntPtr bf_releasebuffer;
215-
}
216-
217-
internal static partial class SlotTypes
218-
{
219-
public static readonly Type[] Types = {
220-
typeof(PyNumberMethods),
221-
typeof(PySequenceMethods),
222-
typeof(PyMappingMethods),
223-
typeof(PyAsyncMethods),
224-
typeof(PyBufferProcs),
225-
};
226-
}
227-
228-
#endif
229136
}

‎src/runtime/interop38.cs‎

Lines changed: 0 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -135,97 +135,4 @@ public TypeOffset38() { }
135135
public int qualname { get; private set; }
136136
public int ht_cached_keys { get; private set; }
137137
}
138-
139-
#if PYTHON38
140-
[StructLayout(LayoutKind.Sequential)]
141-
internal struct PyNumberMethods
142-
{
143-
public IntPtr nb_add;
144-
public IntPtr nb_subtract;
145-
public IntPtr nb_multiply;
146-
public IntPtr nb_remainder;
147-
public IntPtr nb_divmod;
148-
public IntPtr nb_power;
149-
public IntPtr nb_negative;
150-
public IntPtr nb_positive;
151-
public IntPtr nb_absolute;
152-
public IntPtr nb_bool;
153-
public IntPtr nb_invert;
154-
public IntPtr nb_lshift;
155-
public IntPtr nb_rshift;
156-
public IntPtr nb_and;
157-
public IntPtr nb_xor;
158-
public IntPtr nb_or;
159-
public IntPtr nb_int;
160-
public IntPtr nb_reserved;
161-
public IntPtr nb_float;
162-
public IntPtr nb_inplace_add;
163-
public IntPtr nb_inplace_subtract;
164-
public IntPtr nb_inplace_multiply;
165-
public IntPtr nb_inplace_remainder;
166-
public IntPtr nb_inplace_power;
167-
public IntPtr nb_inplace_lshift;
168-
public IntPtr nb_inplace_rshift;
169-
public IntPtr nb_inplace_and;
170-
public IntPtr nb_inplace_xor;
171-
public IntPtr nb_inplace_or;
172-
public IntPtr nb_floor_divide;
173-
public IntPtr nb_true_divide;
174-
public IntPtr nb_inplace_floor_divide;
175-
public IntPtr nb_inplace_true_divide;
176-
public IntPtr nb_index;
177-
public IntPtr nb_matrix_multiply;
178-
public IntPtr nb_inplace_matrix_multiply;
179-
}
180-
181-
[StructLayout(LayoutKind.Sequential)]
182-
internal struct PySequenceMethods
183-
{
184-
public IntPtr sq_length;
185-
public IntPtr sq_concat;
186-
public IntPtr sq_repeat;
187-
public IntPtr sq_item;
188-
public IntPtr was_sq_slice;
189-
public IntPtr sq_ass_item;
190-
public IntPtr was_sq_ass_slice;
191-
public IntPtr sq_contains;
192-
public IntPtr sq_inplace_concat;
193-
public IntPtr sq_inplace_repeat;
194-
}
195-
196-
[StructLayout(LayoutKind.Sequential)]
197-
internal struct PyMappingMethods
198-
{
199-
public IntPtr mp_length;
200-
public IntPtr mp_subscript;
201-
public IntPtr mp_ass_subscript;
202-
}
203-
204-
[StructLayout(LayoutKind.Sequential)]
205-
internal struct PyAsyncMethods
206-
{
207-
public IntPtr am_await;
208-
public IntPtr am_aiter;
209-
public IntPtr am_anext;
210-
}
211-
212-
[StructLayout(LayoutKind.Sequential)]
213-
internal struct PyBufferProcs
214-
{
215-
public IntPtr bf_getbuffer;
216-
public IntPtr bf_releasebuffer;
217-
}
218-
219-
internal static partial class SlotTypes
220-
{
221-
public static readonly Type[] Types = {
222-
typeof(PyNumberMethods),
223-
typeof(PySequenceMethods),
224-
typeof(PyMappingMethods),
225-
typeof(PyAsyncMethods),
226-
typeof(PyBufferProcs),
227-
};
228-
}
229-
230-
#endif
231138
}

‎src/runtime/interop39.cs‎

Lines changed: 0 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -134,99 +134,5 @@ public TypeOffset39() { }
134134
public int qualname { get; private set; }
135135
public int ht_cached_keys { get; private set; }
136136
public int ht_module { get; private set; }
137-
138-
}
139-
140-
#if PYTHON39
141-
[StructLayout(LayoutKind.Sequential)]
142-
internal struct PyNumberMethods
143-
{
144-
public IntPtr nb_add;
145-
public IntPtr nb_subtract;
146-
public IntPtr nb_multiply;
147-
public IntPtr nb_remainder;
148-
public IntPtr nb_divmod;
149-
public IntPtr nb_power;
150-
public IntPtr nb_negative;
151-
public IntPtr nb_positive;
152-
public IntPtr nb_absolute;
153-
public IntPtr nb_bool;
154-
public IntPtr nb_invert;
155-
public IntPtr nb_lshift;
156-
public IntPtr nb_rshift;
157-
public IntPtr nb_and;
158-
public IntPtr nb_xor;
159-
public IntPtr nb_or;
160-
public IntPtr nb_int;
161-
public IntPtr nb_reserved;
162-
public IntPtr nb_float;
163-
public IntPtr nb_inplace_add;
164-
public IntPtr nb_inplace_subtract;
165-
public IntPtr nb_inplace_multiply;
166-
public IntPtr nb_inplace_remainder;
167-
public IntPtr nb_inplace_power;
168-
public IntPtr nb_inplace_lshift;
169-
public IntPtr nb_inplace_rshift;
170-
public IntPtr nb_inplace_and;
171-
public IntPtr nb_inplace_xor;
172-
public IntPtr nb_inplace_or;
173-
public IntPtr nb_floor_divide;
174-
public IntPtr nb_true_divide;
175-
public IntPtr nb_inplace_floor_divide;
176-
public IntPtr nb_inplace_true_divide;
177-
public IntPtr nb_index;
178-
public IntPtr nb_matrix_multiply;
179-
public IntPtr nb_inplace_matrix_multiply;
180-
}
181-
182-
[StructLayout(LayoutKind.Sequential)]
183-
internal struct PySequenceMethods
184-
{
185-
public IntPtr sq_length;
186-
public IntPtr sq_concat;
187-
public IntPtr sq_repeat;
188-
public IntPtr sq_item;
189-
public IntPtr was_sq_slice;
190-
public IntPtr sq_ass_item;
191-
public IntPtr was_sq_ass_slice;
192-
public IntPtr sq_contains;
193-
public IntPtr sq_inplace_concat;
194-
public IntPtr sq_inplace_repeat;
195-
}
196-
197-
[StructLayout(LayoutKind.Sequential)]
198-
internal struct PyMappingMethods
199-
{
200-
public IntPtr mp_length;
201-
public IntPtr mp_subscript;
202-
public IntPtr mp_ass_subscript;
203137
}
204-
205-
[StructLayout(LayoutKind.Sequential)]
206-
internal struct PyAsyncMethods
207-
{
208-
public IntPtr am_await;
209-
public IntPtr am_aiter;
210-
public IntPtr am_anext;
211-
}
212-
213-
[StructLayout(LayoutKind.Sequential)]
214-
internal struct PyBufferProcs
215-
{
216-
public IntPtr bf_getbuffer;
217-
public IntPtr bf_releasebuffer;
218-
}
219-
220-
internal static partial class SlotTypes
221-
{
222-
public static readonly Type[] Types = {
223-
typeof(PyNumberMethods),
224-
typeof(PySequenceMethods),
225-
typeof(PyMappingMethods),
226-
typeof(PyAsyncMethods),
227-
typeof(PyBufferProcs),
228-
};
229-
}
230-
231-
#endif
232138
}

0 commit comments

Comments
 (0)