diff options
author | Robert Bradshaw <robertwb@gmail.com> | 2014-10-16 23:32:09 -0700 |
---|---|---|
committer | Robert Bradshaw <robertwb@gmail.com> | 2014-10-16 23:33:08 -0700 |
commit | bcc15b5dcd7292dcc4e8a1630ba434205a2d78fa (patch) | |
tree | 3324cb64a6db9a0bcbf92d444db6ce56037f3b97 /Cython/Compiler/ModuleNode.py | |
parent | 3cd6c6acc7d6a13c49542d813a22a7d5e4d08ca2 (diff) | |
download | cython-bcc15b5dcd7292dcc4e8a1630ba434205a2d78fa.tar.gz |
Add empty declaration code method.
Diffstat (limited to 'Cython/Compiler/ModuleNode.py')
-rw-r--r-- | Cython/Compiler/ModuleNode.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Cython/Compiler/ModuleNode.py b/Cython/Compiler/ModuleNode.py index 891b97b74..4e7a38a1c 100644 --- a/Cython/Compiler/ModuleNode.py +++ b/Cython/Compiler/ModuleNode.py @@ -251,7 +251,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): % (entry.name, cname, sig)) for entry in api_vars: cname = env.mangle(Naming.varptr_prefix, entry.name) - sig = entry.type.declaration_code("") + sig = entry.type.empty_declaration_code() h_code.putln( 'if (__Pyx_ImportVoidPtr(module, "%s", (void **)&%s, "%s") < 0) goto bad;' % (entry.name, cname, sig)) @@ -776,7 +776,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): def generate_struct_union_predeclaration(self, entry, code): type = entry.type if type.is_cpp_class and type.templates: - code.putln("template <typename %s>" % ", typename ".join([T.declaration_code("") for T in type.templates])) + code.putln("template <typename %s>" % ", typename ".join([T.empty_declaration_code() for T in type.templates])) code.putln(self.sue_predeclaration(type, type.kind, type.cname)) def sue_header_footer(self, type, kind, name): @@ -826,12 +826,12 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): scope = type.scope if scope: if type.templates: - code.putln("template <class %s>" % ", class ".join([T.declaration_code("") for T in type.templates])) + code.putln("template <class %s>" % ", class ".join([T.empty_declaration_code() for T in type.templates])) # Just let everything be public. code.put("struct %s" % type.cname) if type.base_classes: base_class_decl = ", public ".join( - [base_class.declaration_code("") for base_class in type.base_classes]) + [base_class.empty_declaration_code() for base_class in type.base_classes]) code.put(" : public %s" % base_class_decl) code.putln(" {") has_virtual_methods = False @@ -1124,7 +1124,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): code.putln( "%s = (%s)o;" % ( type.declaration_code("p"), - type.declaration_code(""))) + type.empty_declaration_code())) def generate_new_function(self, scope, code, cclass_entry): tp_slot = TypeSlots.ConstructorSlot("tp_new", '__new__') @@ -1226,7 +1226,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): for entry in cpp_class_attrs: code.putln("new((void*)&(p->%s)) %s();" % - (entry.cname, entry.type.declaration_code(""))) + (entry.cname, entry.type.empty_declaration_code())) for entry in py_attrs: code.put_init_var_to_py_none(entry, "p->%s", nanny=False) @@ -2427,7 +2427,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): if entries: env.use_utility_code(UtilityCode.load_cached("VoidPtrExport", "ImportExport.c")) for entry in entries: - signature = entry.type.declaration_code("") + signature = entry.type.empty_declaration_code() name = code.intern_identifier(entry.name) code.putln('if (__Pyx_ExportVoidPtr(%s, (void *)&%s, "%s") < 0) %s' % ( name, entry.cname, signature, @@ -2495,7 +2495,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): cname = entry.cname else: cname = module.mangle(Naming.varptr_prefix, entry.name) - signature = entry.type.declaration_code("") + signature = entry.type.empty_declaration_code() code.putln( 'if (__Pyx_ImportVoidPtr(%s, "%s", (void **)&%s, "%s") < 0) %s' % ( temp, entry.name, cname, signature, |