[12/36] lucy-clownfish git commit: Invoke `PyType_Ready` for inert classes.

[ma...@apache.org]

Invoke `PyType_Ready` for inert classes.


Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/c9cbb2dc
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/c9cbb2dc
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/c9cbb2dc

Branch: refs/heads/py_exp13
Commit: c9cbb2dcfd3e9435134bf89812f8d0dad363ae10
Parents: 50c98b1
Author: Marvin Humphrey <ma...@rectangular.com>
Authored: Mon Feb 1 17:03:13 2016 -0800
Committer: Marvin Humphrey <ma...@rectangular.com>
Committed: Wed Feb 24 15:20:38 2016 -0800

----------------------------------------------------------------------
 compiler/src/CFCPython.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/c9cbb2dc/compiler/src/CFCPython.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCPython.c b/compiler/src/CFCPython.c
index 7921fbe..a2d28df 100644
--- a/compiler/src/CFCPython.c
+++ b/compiler/src/CFCPython.c
@@ -457,14 +457,26 @@ S_write_module_file(CFCPython *self, CFCParcel *parcel, const char *dest) {
     char *type_linkups       = S_gen_type_linkups(self, parcel, ordered);
     char *pound_includes     = CFCUtil_strdup("");
     char *class_bindings     = S_gen_class_bindings(self, parcel, pymod_name, ordered);
+    char *pytype_ready_calls = CFCUtil_strdup("");
 
     for (size_t i = 0; ordered[i] != NULL; i++) {
         CFCClass *klass = ordered[i];
         if (CFCClass_included(klass)) { continue; }
+        const char *struct_sym = CFCClass_get_struct_sym(klass);
 
         const char *include_h  = CFCClass_include_h(klass);
         pound_includes = CFCUtil_cat(pound_includes, "#include \"",
                                      include_h, "\"\n", NULL);
+
+        // The PyType_Ready invocations for instantiable classes are handled
+        // via bootstrapping of Clownfish Class objects.  Since inert classes
+        // do not at present have Class objects, we need to handle their
+        // PyType_Ready calls independently.
+        if (CFCClass_inert(klass)) {
+            pytype_ready_calls = CFCUtil_cat(pytype_ready_calls,
+                "    if (PyType_Ready(&", struct_sym,
+                "_pytype_struct) < 0) { return NULL; }\n", NULL);
+        }
     }
 
     const char pattern[] =
@@ -492,6 +504,9 @@ S_write_module_file(CFCPython *self, CFCParcel *parcel, const char *dest) {
         "PyMODINIT_FUNC\n"
         "PyInit__%s(void) {\n"
         "    cfish_Class_bootstrap_hook1 = CFBind_class_bootstrap_hook1;\n"
+        "\n"
+        "%s\n" // PyType_Ready calls
+        "\n"
         "    S_link_py_types();\n"
         "    PyObject *module = PyModule_Create(&module_def);\n"
         "    return module;\n"
@@ -503,7 +518,7 @@ S_write_module_file(CFCPython *self, CFCParcel *parcel, const char *dest) {
     char *content
         = CFCUtil_sprintf(pattern, self->header, pound_includes, callbacks,
                           helper_mod_name, class_bindings, type_linkups,
-                          last_component, self->footer);
+                          last_component, pytype_ready_calls, self->footer);
 
     char *filepath = CFCUtil_sprintf("%s" CHY_DIR_SEP "_%s.c", dest,
                                      last_component);
@@ -511,6 +526,7 @@ S_write_module_file(CFCPython *self, CFCParcel *parcel, const char *dest) {
     FREEMEM(filepath);
 
     FREEMEM(content);
+    FREEMEM(pytype_ready_calls);
     FREEMEM(class_bindings);
     FREEMEM(helper_mod_name);
     FREEMEM(pymod_name);