CodeCaptcha/pyliblex
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implement throwing exceptions.

Browse Source
This commit is contained in:
Danila Fedorin 2017-05-05 21:59:11 -07:00
parent 69afdab402
commit 46f52665cb
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/pyliblexmodule.h
View File

@ -8,6 +8,9 @@ static PyObject* pyliblex_add_definition(PyObject* self, PyObject* args);
static PyObject* pyliblex_lex(PyObject* self, PyObject* args); static PyObject* pyliblex_lex(PyObject* self, PyObject* args);
static PyObject* pyliblex_test(PyObject* self, PyObject* args); static PyObject* pyliblex_test(PyObject* self, PyObject* args);
static PyObject* invalid_regex_exception;
static PyObject* failed_lex_exception;
static const char module_docstring[] = "A wrapper around a homemade lexing library, liblex."; static const char module_docstring[] = "A wrapper around a homemade lexing library, liblex.";
static PyMethodDef module_methods[] = { static PyMethodDef module_methods[] = {
{"init", pyliblex_init, METH_VARARGS, "Initialize a liblex library object." }, {"init", pyliblex_init, METH_VARARGS, "Initialize a liblex library object." },

37
src/pyliblexmodule.c
View File

@ -36,8 +36,10 @@ static PyObject* pyliblex_add_definition(PyObject* self, PyObject* args){
eval_config* config = PyCapsule_GetPointer(capsule, NULL); eval_config* config = PyCapsule_GetPointer(capsule, NULL);
if(config){ if(config){
liblex_result result = eval_config_add(config, regex, id); liblex_result result = eval_config_add(config, regex, id);
if(result != LIBLEX_SUCCESS){ if(result == LIBLEX_MALLOC){
return_object = PyErr_NoMemory(); return_object = PyErr_NoMemory();
} else if(result != LIBLEX_SUCCESS){
PyErr_SetString(invalid_regex_exception, "Unable to construct regex.");
} else { } else {
Py_INCREF(Py_None); Py_INCREF(Py_None);
return_object = Py_None; return_object = Py_None;
@ -86,8 +88,10 @@ static PyObject* pyliblex_lex(PyObject* self, PyObject* args){
ll_init(&match_ll); ll_init(&match_ll);
result = eval_all(string, 0, config, &match_ll); result = eval_all(string, 0, config, &match_ll);
if(result != LIBLEX_SUCCESS){ if(result == LIBLEX_MALLOC){
return_object = PyErr_NoMemory(); return_object = PyErr_NoMemory();
} if(result != LIBLEX_SUCCESS){
PyErr_SetString(failed_lex_exception, "Unable to parse text.");
} else { } else {
int return_code = 0; int return_code = 0;
PyObject* list = PyList_New(0); PyObject* list = PyList_New(0);
@ -115,5 +119,32 @@ static PyObject* pyliblex_test(PyObject* self, PyObject* args) {
} }
PyMODINIT_FUNC PyInit_pyliblex() { PyMODINIT_FUNC PyInit_pyliblex() {
return PyModule_Create(&module_object); invalid_regex_exception = NULL;
failed_lex_exception = NULL;
PyObject* module = NULL;
int clear_exceptions = 1;
invalid_regex_exception = PyErr_NewException("pyliblex.InvalidRegexException", NULL, NULL);
failed_lex_exception = PyErr_NewException("pyliblex.FailedLexException", NULL, NULL);
if(invalid_regex_exception && failed_lex_exception){
module = PyModule_Create(&module_object);
if(module) {
if(!(PyModule_AddObject(module, "InvalidRegexException", invalid_regex_exception) ||
PyModule_AddObject(module, "FailedLexException", failed_lex_exception))){
Py_INCREF(invalid_regex_exception);
Py_INCREF(failed_lex_exception);
clear_exceptions = 0;
} else {
Py_DECREF(module);
module = NULL;
}
}
}
if(clear_exceptions){
if(invalid_regex_exception) Py_DECREF(invalid_regex_exception);
if(failed_lex_exception) Py_DECREF(failed_lex_exception);
}
return module;
} }