[pypy-svn] r73490 - pypy/branch/cpython-extension/pypy/module/cpyext

[xoraxax at codespeak.net]

Author: xoraxax
Date: Wed Apr  7 02:22:11 2010
New Revision: 73490

Modified:
   pypy/branch/cpython-extension/pypy/module/cpyext/api.py
Log:
Generate correct decl code for the standalone case.

Modified: pypy/branch/cpython-extension/pypy/module/cpyext/api.py
==============================================================================
--- pypy/branch/cpython-extension/pypy/module/cpyext/api.py	(original)
+++ pypy/branch/cpython-extension/pypy/module/cpyext/api.py	Wed Apr  7 02:22:11 2010
@@ -522,7 +522,7 @@
     pypy_macros_h = udir.join('pypy_macros.h')
     pypy_macros_h.write('\n'.join(pypy_macros))
 
-def generate_decls_and_callbacks(db, export_symbols, api_struct=True):
+def generate_decls_and_callbacks(db, export_symbols, api_struct=True, globals_are_pointers=True):
     # implement function callbacks and generate function decls
     functions = []
     pypy_decls = []
@@ -543,6 +543,8 @@
             functions.append('%s\n%s\n' % (header, body))
     pypy_decls.append("#ifndef PYPY_STANDALONE\n")
     for name, (typ, expr) in GLOBALS.iteritems():
+        if not globals_are_pointers:
+            typ = typ.replace("*", "")
         pypy_decls.append('PyAPI_DATA(%s) %s;' % (typ, name.replace("#", "")))
     for name in VA_TP_LIST:
         name_no_star = process_va_name(name)
@@ -598,7 +600,7 @@
 
     generate_macros(export_symbols, rename, False)
 
-    functions = generate_decls_and_callbacks(db, [], api_struct=False)
+    functions = generate_decls_and_callbacks(db, [], api_struct=False, globals_are_pointers=False)
     code = "#include <Python.h>\n" + "\n".join(functions)
 
     eci = build_eci(False, export_symbols, code)