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

the parser in the C runtime can now detect incomplete sentences just like the parser in the Haskell runtime. This is also reflected in all bindings.

Browse Source
This commit is contained in:
Krasimir Angelov
2017-09-06 12:38:42 +02:00
parent 18f2135785
commit 15d014abb8
13 changed files with 184 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1545,13 +1545,28 @@ Concr_parse(ConcrObject* self, PyObject *args, PyObject *keywds)
GuString msg = (GuString) gu_exn_caught_data(parse_err);
PyErr_SetString(PGFError, msg);
} else if (gu_exn_caught(parse_err, PgfParseError)) {
GuString tok = (GuString) gu_exn_caught_data(parse_err);
PyObject* py_tok = PyString_FromString(tok);
PyObject_SetAttrString(ParseError, "token", py_tok);
PyErr_Format(ParseError, "Unexpected token: \"%s\"", tok);
Py_DECREF(py_tok);
PgfParseError* err = (PgfParseError*) gu_exn_caught_data(parse_err);
PyObject* py_offset = PyInt_FromLong(err->offset);
if (err->incomplete) {
PyObject_SetAttrString(ParseError, "incomplete", Py_True);
PyObject_SetAttrString(ParseError, "offset", py_offset);
PyErr_Format(ParseError, "The sentence is incomplete");
} else {
PyObject* py_tok = PyString_FromStringAndSize(err->token_ptr,
err->token_len);
PyObject_SetAttrString(ParseError, "incomplete", Py_False);
PyObject_SetAttrString(ParseError, "offset", py_offset);
PyObject_SetAttrString(ParseError, "token", py_tok);
#if PY_MAJOR_VERSION >= 3
PyErr_Format(ParseError, "Unexpected token: \"%U\"", py_tok);
#else
PyErr_Format(ParseError, "Unexpected token: \"%s\"", PyString_AsString(py_tok));
#endif
Py_DECREF(py_tok);
}
Py_DECREF(py_offset);
}
Py_DECREF(pyres);
pyres = NULL;
}