diff options
Diffstat (limited to 'plugins/pychrysalide/analysis/types/module.c')
| -rw-r--r-- | plugins/pychrysalide/analysis/types/module.c | 64 |
1 files changed, 35 insertions, 29 deletions
diff --git a/plugins/pychrysalide/analysis/types/module.c b/plugins/pychrysalide/analysis/types/module.c index 1566014..baa8ad1 100644 --- a/plugins/pychrysalide/analysis/types/module.c +++ b/plugins/pychrysalide/analysis/types/module.c @@ -37,29 +37,28 @@ #include "override.h" #include "proto.h" #include "template.h" -#include "../../access.h" +#include "../../helpers.h" /****************************************************************************** * * -* Paramètres : module = module dont la définition est à compléter. * +* Paramètres : super = module dont la définition est à compléter. * * * -* Description : Ajoute le module 'types' au module Python. * +* Description : Ajoute le module 'analysis.types' à un module Python. * * * -* Retour : - * +* Retour : Bilan de l'opération. * * * * Remarques : - * * * ******************************************************************************/ -bool add_analysis_types_module_to_python_module(PyObject *super) +bool add_analysis_types_module(PyObject *super) { bool result; /* Bilan à retourner */ PyObject *module; /* Sous-module mis en place */ - int ret; /* Bilan d'un appel */ - static PyModuleDef py_chrysalide_types_module = { + static PyModuleDef py_chrysalide_analysis_types_module = { .m_base = PyModuleDef_HEAD_INIT, @@ -70,35 +69,42 @@ bool add_analysis_types_module_to_python_module(PyObject *super) }; - result = false; + module = build_python_module(super, &py_chrysalide_analysis_types_module); - module = PyModule_Create(&py_chrysalide_types_module); - if (module == NULL) return false; + result = (module != NULL); - ret = PyState_AddModule(super, &py_chrysalide_types_module); - if (ret != 0) goto loading_failed; + return result; - ret = _PyImport_FixupBuiltin(module, "pychrysalide.analysis.types"); - if (ret != 0) goto loading_failed; +} - Py_INCREF(module); - ret = PyModule_AddObject(super, "types", module); - if (ret != 0) goto loading_failed; - result = register_python_array_type(module); - if (result) result = register_python_basic_type(module); - if (result) result = register_python_class_enum_type(module); - if (result) result = register_python_expr_type(module); - if (result) result = register_python_encapsulated_type(module); - if (result) result = register_python_literal_type(module); - if (result) result = register_python_override_type(module); - if (result) result = register_python_proto_type(module); - if (result) result = register_python_template_type(module); +/****************************************************************************** +* * +* Paramètres : - * +* * +* Description : Intègre les objets du module 'analysis.types'. * +* * +* Retour : Bilan de l'opération. * +* * +* Remarques : - * +* * +******************************************************************************/ - if (result) - register_access_to_python_module("pychrysalide.analysis.types", module); +bool populate_analysis_types_module(void) +{ + bool result; /* Bilan à retourner */ - loading_failed: + result = true; + + if (result) result = ensure_python_array_type_is_registered(); + if (result) result = ensure_python_basic_type_is_registered(); + if (result) result = ensure_python_class_enum_type_is_registered(); + if (result) result = ensure_python_expr_type_is_registered(); + if (result) result = ensure_python_encapsulated_type_is_registered(); + if (result) result = ensure_python_literal_type_is_registered(); + if (result) result = ensure_python_override_type_is_registered(); + if (result) result = ensure_python_proto_type_is_registered(); + if (result) result = ensure_python_template_type_is_registered(); assert(result); |