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

fix the handling of PGF_EXN_OTHER_ERROR

Browse Source
This commit is contained in:
krangelov
2021-09-25 08:11:05 +02:00
parent f82f19ba68
commit 4a0efda0e6
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/python/ffi.c
View File

@@ -20,8 +20,6 @@ PgfExnType handleError(PgfExn err)
} else if (err.type == PGF_EXN_PGF_ERROR) { } else if (err.type == PGF_EXN_PGF_ERROR) {
PyErr_SetString(PGFError, err.msg); PyErr_SetString(PGFError, err.msg);
free((char *)err.msg); free((char *)err.msg);
} else if (err.type == PGF_EXN_OTHER_ERROR) {
PyErr_SetString(PGFError, "an unknown error occured");
} }
return err.type; return err.type;
} }

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

@@ -83,13 +83,11 @@ _collect_cats(PgfItor *fn, PgfText *key, void *value, PgfExn *err)
PyObject *py_name = PyUnicode_FromStringAndSize(name->text, name->size); PyObject *py_name = PyUnicode_FromStringAndSize(name->text, name->size);
if (py_name == NULL) { if (py_name == NULL) {
err->type = PGF_EXN_OTHER_ERROR; err->type = PGF_EXN_OTHER_ERROR;
err->msg = "unable to create string from category";
return; return;
} }
if (PyList_Append((PyObject*) clo->collection, py_name) != 0) { if (PyList_Append((PyObject*) clo->collection, py_name) != 0) {
err->type = PGF_EXN_OTHER_ERROR; err->type = PGF_EXN_OTHER_ERROR;
err->msg = "unable append category to list";
Py_DECREF(py_name); Py_DECREF(py_name);
} }
} }
@@ -165,12 +163,11 @@ _collect_funs(PgfItor *fn, PgfText *key, void *value, PgfExn *err)
PyObject *py_name = PyUnicode_FromStringAndSize(name->text, name->size); PyObject *py_name = PyUnicode_FromStringAndSize(name->text, name->size);
if (py_name == NULL) { if (py_name == NULL) {
err->type = PGF_EXN_OTHER_ERROR; err->type = PGF_EXN_OTHER_ERROR;
err->msg = "unable to create string from function"; return;
} }
if (PyList_Append((PyObject*) clo->collection, py_name) != 0) { if (PyList_Append((PyObject*) clo->collection, py_name) != 0) {
err->type = PGF_EXN_OTHER_ERROR; err->type = PGF_EXN_OTHER_ERROR;
err->msg = "unable append function to list";
Py_DECREF(py_name); Py_DECREF(py_name);
} }
} }