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

readPGF in the Python runtime now throws "No such file or directory" exception if the grammar is missing

Browse Source
This commit is contained in:
kr.angelov
2013-05-29 10:49:56 +00:00
parent 7b13fbda35
commit fac39a78fe
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/runtime/c/gu/exn.h
View File

@@ -91,8 +91,11 @@ gu_exn_clear(GuExn* err) {
GuType* GuType*
gu_exn_caught(GuExn* err); gu_exn_caught(GuExn* err);
const void* inline const void*
gu_exn_caught_data(GuExn* err); gu_exn_caught_data(GuExn* err)
{
return err->data.data;
}
/// Temporarily block a raised exception. /// Temporarily block a raised exception.
void void

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

@@ -1640,7 +1640,12 @@ pgf_readPGF(PyObject *self, PyObject *args)
// Read the PGF grammar. // Read the PGF grammar.
py_pgf->pgf = pgf_read(fpath, py_pgf->pool, err); py_pgf->pgf = pgf_read(fpath, py_pgf->pool, err);
if (!gu_ok(err)) { if (!gu_ok(err)) {
PyErr_SetString(PGFError, "The grammar cannot be loaded"); if (gu_exn_caught(err) == gu_type(GuErrno)) {
errno = *((GuErrno*) gu_exn_caught_data(err));
PyErr_SetFromErrnoWithFilename(PyExc_IOError, fpath);
} else {
PyErr_SetString(PGFError, "The grammar cannot be loaded");
}
Py_DECREF(py_pgf); Py_DECREF(py_pgf);
gu_pool_free(tmp_pool); gu_pool_free(tmp_pool);
return NULL; return NULL;