Skip to content

C
cython
Commit b3a72122 authored by Lisandro Dalcin's avatar Lisandro Dalcin
Browse files
Options

get rid of Py_TPFLAGS_HAVE_INDEX to fill typeobj.nb_index slot

parent 84380456
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 15 deletions
Cython/Compiler/TypeSlots.py
View file @ b3a72122
...@@ -130,26 +130,23 @@ class SlotDescriptor(object): ...@@ -130,26 +130,23 @@ class SlotDescriptor(object):
# #
# slot_name string Member name of the slot in the type object # slot_name string Member name of the slot in the type object
# is_initialised_dynamically Is initialised by code in the module init function # is_initialised_dynamically Is initialised by code in the module init function
# flag Py_TPFLAGS_XXX value indicating presence of slot
# py3 Indicates presence of slot in Python 3 # py3 Indicates presence of slot in Python 3
# py2 Indicates presence of slot in Python 2 # py2 Indicates presence of slot in Python 2
# ifdef Full #ifdef string that slot is wrapped in. Using this causes py3, py2 and flags to be ignored.) # ifdef Full #ifdef string that slot is wrapped in. Using this causes py3, py2 and flags to be ignored.)
def __init__(self, slot_name, dynamic=0, def __init__(self, slot_name, dynamic=0,
flag=None, py3=True, py2=True, ifdef=None): py3=True, py2=True, ifdef=None):
self.slot_name = slot_name self.slot_name = slot_name
self.is_initialised_dynamically = dynamic self.is_initialised_dynamically = dynamic
self.flag = flag self.ifdef = ifdef
self.py3 = py3 self.py3 = py3
self.py2 = py2 self.py2 = py2
self.ifdef = ifdef
def generate(self, scope, code): def generate(self, scope, code):
if self.is_initialised_dynamically: if self.is_initialised_dynamically:
value = 0 value = 0
else: else:
value = self.slot_code(scope) value = self.slot_code(scope)
flag = self.flag
py3 = self.py3 py3 = self.py3
py2 = self.py2 py2 = self.py2
if self.ifdef: if self.ifdef:
...@@ -159,8 +156,6 @@ class SlotDescriptor(object): ...@@ -159,8 +156,6 @@ class SlotDescriptor(object):
code.putln("#if PY_MAJOR_VERSION < 3") code.putln("#if PY_MAJOR_VERSION < 3")
elif not py2: elif not py2:
code.putln("#if PY_MAJOR_VERSION >= 3") code.putln("#if PY_MAJOR_VERSION >= 3")
if flag:
code.putln("#if (PY_MAJOR_VERSION >= 3) || (Py_TPFLAGS_DEFAULT & %s)" % flag)
if py3 == '<RESERVED>': if py3 == '<RESERVED>':
code.putln("#if PY_MAJOR_VERSION >= 3") code.putln("#if PY_MAJOR_VERSION >= 3")
code.putln("0, /*reserved*/") code.putln("0, /*reserved*/")
...@@ -169,7 +164,7 @@ class SlotDescriptor(object): ...@@ -169,7 +164,7 @@ class SlotDescriptor(object):
code.putln("%s, /*%s*/" % (value, self.slot_name)) code.putln("%s, /*%s*/" % (value, self.slot_name))
if py3 == '<RESERVED>': if py3 == '<RESERVED>':
code.putln("#endif") code.putln("#endif")
if flag or (not py3 or not py2) or self.ifdef: if (not py3 or not py2) or self.ifdef:
code.putln("#endif") code.putln("#endif")
# Some C implementations have trouble statically # Some C implementations have trouble statically
...@@ -194,8 +189,8 @@ class FixedSlot(SlotDescriptor): ...@@ -194,8 +189,8 @@ class FixedSlot(SlotDescriptor):
# #
# value string # value string
def __init__(self, slot_name, value, flag=None, py3=True, py2=True, ifdef=None): def __init__(self, slot_name, value, py3=True, py2=True, ifdef=None):
SlotDescriptor.__init__(self, slot_name, flag=flag, py3=py3, py2=py2, ifdef=ifdef) SlotDescriptor.__init__(self, slot_name, py3=py3, py2=py2, ifdef=ifdef)
self.value = value self.value = value
def slot_code(self, scope): def slot_code(self, scope):
...@@ -205,8 +200,8 @@ class FixedSlot(SlotDescriptor): ...@@ -205,8 +200,8 @@ class FixedSlot(SlotDescriptor):
class EmptySlot(FixedSlot): class EmptySlot(FixedSlot):
# Descriptor for a type slot whose value is always 0. # Descriptor for a type slot whose value is always 0.
def __init__(self, slot_name, flag=None, py3=True, py2=True, ifdef=None): def __init__(self, slot_name, py3=True, py2=True, ifdef=None):
FixedSlot.__init__(self, slot_name, "0", flag=flag, py3=py3, py2=py2, ifdef=ifdef) FixedSlot.__init__(self, slot_name, "0", py3=py3, py2=py2, ifdef=ifdef)
class MethodSlot(SlotDescriptor): class MethodSlot(SlotDescriptor):
...@@ -217,8 +212,8 @@ class MethodSlot(SlotDescriptor): ...@@ -217,8 +212,8 @@ class MethodSlot(SlotDescriptor):
# alternatives [string] Alternative list of __xxx__ names for the method # alternatives [string] Alternative list of __xxx__ names for the method
def __init__(self, signature, slot_name, method_name, fallback=None, def __init__(self, signature, slot_name, method_name, fallback=None,
flag=None, py3=True, py2=True, ifdef=None): py3=True, py2=True, ifdef=None):
SlotDescriptor.__init__(self, slot_name, flag=flag, py3=py3, py2=py2, ifdef=ifdef) SlotDescriptor.__init__(self, slot_name, py3=py3, py2=py2, ifdef=ifdef)
self.signature = signature self.signature = signature
self.slot_name = slot_name self.slot_name = slot_name
self.method_name = method_name self.method_name = method_name
...@@ -603,7 +598,7 @@ PyNumberMethods = ( ...@@ -603,7 +598,7 @@ PyNumberMethods = (
MethodSlot(ibinaryfunc, "nb_inplace_true_divide", "__itruediv__"), MethodSlot(ibinaryfunc, "nb_inplace_true_divide", "__itruediv__"),
# Added in release 2.5 # Added in release 2.5
MethodSlot(unaryfunc, "nb_index", "__index__", flag = "Py_TPFLAGS_HAVE_INDEX") MethodSlot(unaryfunc, "nb_index", "__index__", ifdef = "PY_VERSION_HEX >= 0x02050000")
) )
PySequenceMethods = ( PySequenceMethods = (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7