From: Robert Bradshaw Date: Tue, 30 Sep 2008 20:12:52 +0000 (-0700) Subject: Move autodoc transform to later in the pipeline, remove redundant type formatting... X-Git-Tag: 0.9.9.2.beta~74 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5249c53670e7c6c5a346546a1657857ce204139d;p=cython.git Move autodoc transform to later in the pipeline, remove redundant type formatting code. --- diff --git a/Cython/Compiler/AutoDocTransforms.py b/Cython/Compiler/AutoDocTransforms.py index 0e65ce2e..83a1b0f7 100644 --- a/Cython/Compiler/AutoDocTransforms.py +++ b/Cython/Compiler/AutoDocTransforms.py @@ -1,54 +1,19 @@ -import re - from Cython.Compiler.Visitor import CythonTransform from Cython.Compiler.Nodes import DefNode, CFuncDefNode from Cython.Compiler.Errors import CompileError from Cython.Compiler.StringEncoding import EncodedString from Cython.Compiler import Options +from Cython.Compiler import PyrexTypes -class EmbedSignature(CythonTransform): - SPECIAL_METHOD_RE = re.compile(r'__\w+__') +class EmbedSignature(CythonTransform): def __init__(self, context): super(EmbedSignature, self).__init__(context) self.denv = None # XXX - self.is_in_class = False self.class_name = None - def _fmt_basic_c_type_modifiers(self, ctype): - longness = ctype.longness - modifiers = '' - if longness < 0: - modifiers = 'short ' - elif longness > 0: - modifiers = 'long ' * longness - signed = ctype.signed - if signed == 0: - modifiers = 'unsigned ' + modifiers - elif signed == 2: - modifiers = 'signed ' + modifiers - return modifiers[:-1] # strip final space - - def _fmt_arg_type(self, arg): - try: - base_type = arg.base_type - arg_type = base_type.name - except AttributeError: - return '' - if base_type.is_basic_c_type: - modifiers = self._fmt_basic_c_type_modifiers(base_type) - if modifiers: - arg_type = '%s %s' % (modifiers, arg_type) - return arg_type - - def _fmt_arg_name(self, arg): - try: - return arg.declarator.name - except AttributeError: - return arg.declarator.base.name - def _fmt_arg_defv(self, arg): if not arg.default: return None @@ -63,14 +28,14 @@ class EmbedSignature(CythonTransform): return '' def _fmt_arg(self, arg): - arg_type = self._fmt_arg_type(arg) - arg_name = self._fmt_arg_name(arg) - arg_defv = self._fmt_arg_defv(arg) - doc = arg_name - if arg_type: - doc = ('%s ' % arg_type) + doc - if arg_defv: - doc = doc + ('=%s' % arg_defv) + if arg.type is PyrexTypes.py_object_type or arg.is_self_arg: + doc = arg.name + else: + doc = arg.type.declaration_code(arg.name, for_display=1) + if arg.default: + arg_defv = self._fmt_arg_defv(arg) + if arg_defv: + doc = doc + ('=%s' % arg_defv) return doc def _fmt_arglist(self, args, @@ -89,13 +54,10 @@ class EmbedSignature(CythonTransform): return arglist def _fmt_ret_type(self, ret): - ret_type = ret.name - if ret_type is None: - return '' - modifiers = self._fmt_basic_c_type_modifiers(ret) - if modifiers: - ret_type = '%s %s' % (modifiers, ret_type) - return ret_type + if ret is PyrexTypes.py_object_type: + return None + else: + return ret.declaration_code("", for_display=1) def _fmt_signature(self, cls_name, func_name, args, npargs=0, pargs=None, @@ -128,9 +90,7 @@ class EmbedSignature(CythonTransform): return super(EmbedSignature, self).__call__(node) def visit_ClassDefNode(self, node): - oldincls = self.is_in_class oldname = self.class_name - self.is_in_class = True try: # PyClassDefNode self.class_name = node.name @@ -138,7 +98,6 @@ class EmbedSignature(CythonTransform): # CClassDefNode self.class_name = node.class_name self.visitchildren(node) - self.is_in_class = oldincls self.class_name = oldname return node @@ -148,9 +107,7 @@ class EmbedSignature(CythonTransform): signature = None if type(node) is DefNode: # def FOO(...): - special_method = (self.is_in_class and \ - self.SPECIAL_METHOD_RE.match(node.name)) - if not special_method: + if not node.entry.is_special: nkargs = getattr(node, 'num_kwonly_args', 0) npargs = len(node.args) - nkargs signature = self._fmt_signature( @@ -163,10 +120,12 @@ class EmbedSignature(CythonTransform): signature = self._fmt_signature( self.class_name, node.declarator.base.name, node.declarator.args, - return_type=node.base_type) + return_type=node.return_type) else: # should not fall here ... assert False if signature: - new_doc = self._embed_signature(signature, node.doc) - node.doc = EncodedString(new_doc) # XXX + new_doc = self._embed_signature(signature, node.entry.doc) + node.entry.doc = EncodedString(new_doc) + if hasattr(node, 'py_func') and node.py_func is not None: + node.py_func.entry.doc = EncodedString(new_doc) return node diff --git a/Cython/Compiler/Main.py b/Cython/Compiler/Main.py index 970fc697..3c7e9cd4 100644 --- a/Cython/Compiler/Main.py +++ b/Cython/Compiler/Main.py @@ -97,11 +97,11 @@ class Context: PostParse(self), _specific_post_parse, InterpretCompilerDirectives(self, self.pragma_overrides), - EmbedSignature(self), FlattenInListTransform(), WithTransform(self), DecoratorTransform(self), AnalyseDeclarationsTransform(self), + EmbedSignature(self), TransformBuiltinMethods(self), IntroduceBufferAuxiliaryVars(self), _check_c_classes, diff --git a/Cython/Compiler/PyrexTypes.py b/Cython/Compiler/PyrexTypes.py index c2e406d0..ef8d13cd 100644 --- a/Cython/Compiler/PyrexTypes.py +++ b/Cython/Compiler/PyrexTypes.py @@ -472,6 +472,8 @@ class CNumericType(CType): def declaration_code(self, entity_code, for_display = 0, dll_linkage = None, pyrex = 0): base = public_decl(self.sign_and_name(), dll_linkage) + if for_display and self.is_longlong: + base = base.replace('PY_LONG_LONG', 'long long') return self.base_declaration_code(base, entity_code) @@ -556,7 +558,7 @@ class CULongType(CUIntType): from_py_function = "PyInt_AsUnsignedLongMask" -class CLongLongType(CUIntType): +class CLongLongType(CIntType): is_longlong = 1 to_py_function = "PyLong_FromLongLong" diff --git a/tests/run/embedsignatures.pyx b/tests/run/embedsignatures.pyx index af6a12d8..b28e222f 100644 --- a/tests/run/embedsignatures.pyx +++ b/tests/run/embedsignatures.pyx @@ -48,7 +48,7 @@ __doc__ = ur""" 'with_doc_2(a, b, c)\n\n Existing string\n ' >>> types.__doc__ - 'types(Ext a, int b, unsigned short int c, float d, e)' + 'types(Ext a, int b, unsigned short c, float d, e)' >>> print (f_c.__doc__) f_c(char c) -> char @@ -61,13 +61,13 @@ __doc__ = ur""" >>> print (f_s.__doc__) - f_s(short int s) -> short int + f_s(short s) -> short >>> print (f_us.__doc__) - f_us(unsigned short int s) -> unsigned short int + f_us(unsigned short s) -> unsigned short >>> print (f_ss.__doc__) - f_ss(signed short int s) -> signed short int + f_ss(signed short s) -> signed short >>> print (f_i.__doc__) @@ -81,23 +81,23 @@ __doc__ = ur""" >>> print (f_l.__doc__) - f_l(long int l) -> long int + f_l(long l) -> long >>> print (f_ul.__doc__) - f_ul(unsigned long int l) -> unsigned long int + f_ul(unsigned long l) -> unsigned long >>> print (f_sl.__doc__) - f_sl(signed long int l) -> signed long int + f_sl(signed long l) -> signed long >>> print (f_L.__doc__) - f_L(long long int L) -> long long int + f_L(long long L) -> long long >>> print (f_uL.__doc__) - f_uL(unsigned long long int L) -> unsigned long long int + f_uL(unsigned long long L) -> unsigned long long >>> print (f_sL.__doc__) - f_sL(signed long long int L) -> signed long long int + f_sL(signed long long L) -> signed long long >>> print (f_f.__doc__)