msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

Update error handling in Python bindings, using the new PGF_EXN_OTHER_ERROR

Browse Source
This commit is contained in:
John J. Camilleri
2021-08-31 10:07:42 +02:00
parent 0bf7522291
commit 32f6691024
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2967,12 +2967,12 @@ pgf_collect_cats(PgfItor* fn, PgfText* key, void* value, PgfExn *err)
py_name = PyString_FromString(name->text); py_name = PyString_FromString(name->text);
if (py_name == NULL) { if (py_name == NULL) {
// gu_raise(err, PgfExn); err->type = PGF_EXN_OTHER_ERROR;
goto end; goto end;
} }
if (PyList_Append((PyObject*) clo->collection, py_name) != 0) { if (PyList_Append((PyObject*) clo->collection, py_name) != 0) {
// gu_raise(err, PgfExn); err->type = PGF_EXN_OTHER_ERROR;
goto end; goto end;
} }
@@ -2990,6 +2990,10 @@ PGF_getCategories(PGFObject *self, void *closure)
PgfExn err; PgfExn err;
PyPGFClosure clo = { { pgf_collect_cats }, self, categories }; PyPGFClosure clo = { { pgf_collect_cats }, self, categories };
pgf_iter_categories(self->pgf, &clo.fn, &err); pgf_iter_categories(self->pgf, &clo.fn, &err);
if (err.type != PGF_EXN_NONE) {
Py_DECREF(categories);
return NULL;
}
return categories; return categories;
} }
@@ -3024,12 +3028,12 @@ pgf_collect_funs(PgfItor* fn, PgfText* key, void* value, PgfExn *err)
py_name = PyString_FromString(name->text); py_name = PyString_FromString(name->text);
if (py_name == NULL) { if (py_name == NULL) {
// gu_raise(err, PgfExn); err->type = PGF_EXN_OTHER_ERROR;
goto end; goto end;
} }
if (PyList_Append((PyObject*) clo->collection, py_name) != 0) { if (PyList_Append((PyObject*) clo->collection, py_name) != 0) {
// gu_raise(err, PgfExn); err->type = PGF_EXN_OTHER_ERROR;
goto end; goto end;
} }
@@ -3047,13 +3051,10 @@ PGF_getFunctions(PGFObject *self, void *closure)
PgfExn err; PgfExn err;
PyPGFClosure clo = { { pgf_collect_funs }, self, functions }; PyPGFClosure clo = { { pgf_collect_funs }, self, functions };
pgf_iter_functions(self->pgf, &clo.fn, &err); pgf_iter_functions(self->pgf, &clo.fn, &err);
// if (!gu_ok(err)) { if (err.type != PGF_EXN_NONE) {
// Py_DECREF(functions); Py_DECREF(functions);
// gu_pool_free(tmp_pool); return NULL;
// return NULL; }
// }
//
// gu_pool_free(tmp_pool);
return functions; return functions;
} }
@@ -3079,13 +3080,10 @@ PGF_functionsByCat(PGFObject* self, PyObject *args)
PgfExn err; PgfExn err;
PyPGFClosure clo = { { pgf_collect_funs }, self, functions }; PyPGFClosure clo = { { pgf_collect_funs }, self, functions };
pgf_iter_functions_by_cat(self->pgf, catname, &clo.fn, &err); pgf_iter_functions_by_cat(self->pgf, catname, &clo.fn, &err);
// if (!gu_ok(err)) { if (err.type != PGF_EXN_NONE) {
// Py_DECREF(functions); Py_DECREF(functions);
// gu_pool_free(tmp_pool); return NULL;
// return NULL; }
// }
//
// gu_pool_free(tmp_pool);
return functions; return functions;
} }