GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-22 19:22:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

PGF.embed can now augment existing modules

Browse Source
This commit is contained in:
Krasimir Angelov
2022-10-08 17:21:36 +02:00
parent 706b74a15b
commit be721f3415
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/runtime/python/pypgf.c
View File

@@ -399,9 +399,26 @@ pgf_embed_funs(PgfItor* fn, PgfText* name, object value, PgfExn* err)
static PyObject* static PyObject*
PGF_embed(PGFObject* self, PyObject *modname) PGF_embed(PGFObject* self, PyObject *modname)
{ {
PyObject *m = PyImport_AddModuleObject(modname); PyObject *m = PyImport_Import(modname);
if (m == NULL) if (m == NULL) {
return NULL; PyObject *globals = PyEval_GetGlobals();
if (globals != NULL) {
PyObject *exc = PyDict_GetItemString(globals, "ModuleNotFoundError");
if (exc != NULL) {
if (PyErr_ExceptionMatches(exc)) {
PyErr_Clear();
m = PyImport_AddModuleObject(modname);
Py_INCREF(m);
}
}
}
}
if (m == NULL)
return NULL;
if (PyModule_AddObjectRef(m, "__pgf__", (PyObject*) self) != 0) {
return NULL;
}
PgfExn err; PgfExn err;
PyPGFClosure clo = { { pgf_embed_funs }, self, m }; PyPGFClosure clo = { { pgf_embed_funs }, self, m };
@@ -411,7 +428,6 @@ PGF_embed(PGFObject* self, PyObject *modname)
return NULL; return NULL;
} }
Py_INCREF(m);
return m; return m;
} }