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

Trying to complete Type marshaller, keep getting segfaults

Browse Source
This commit is contained in:
John J. Camilleri
2021-09-10 00:28:16 +02:00
parent 2f51c8471c
commit 678d244b21
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/runtime/python/marshaller.c
View File

@@ -166,7 +166,7 @@ PyUnicode_AsPgfText(PyObject *pystr)
PgfText *ptext = (PgfText *)PyMem_Malloc(sizeof(PgfText)+size+1); PgfText *ptext = (PgfText *)PyMem_Malloc(sizeof(PgfText)+size+1);
memcpy(ptext->text, enc, size+1); memcpy(ptext->text, enc, size+1);
ptext->size = size; ptext->size = size;
// Py_INCREF(ptext); Py_INCREF(ptext); // ?
return ptext; return ptext;
} }
@@ -203,8 +203,19 @@ object match_type(PgfMarshaller *this, PgfUnmarshaller *u, PgfType ty)
{ {
TypeObject *type = (TypeObject *)ty; TypeObject *type = (TypeObject *)ty;
int n_hypos = 0; //PyList_Size(type->hypos); int n_hypos = PyList_Size(type->hypos);
PgfTypeHypo *hypos = NULL; // TODO PgfTypeHypo *hypos;
if (n_hypos > 0) {
PyObject *hytup = (PyObject *)PyList_GetItem(type->hypos, 0);
PgfTypeHypo hypo;
hypo.bind_type = PyLong_AsLong(PyTuple_GetItem(hytup, 0)) == 0 ? PGF_BIND_TYPE_EXPLICIT : PGF_BIND_TYPE_IMPLICIT;
hypo.cid = PyUnicode_AsPgfText(PyTuple_GetItem(hytup, 1));
hypo.type = (PgfType) PyTuple_GetItem(hytup, 2);
hypos = &hypo;
Py_INCREF(hypos); // ?
} else {
hypos = NULL;
}
PgfText *cat = PyUnicode_AsPgfText(type->cat); PgfText *cat = PyUnicode_AsPgfText(type->cat);
if (cat == NULL) { if (cat == NULL) {
@@ -216,6 +227,7 @@ object match_type(PgfMarshaller *this, PgfUnmarshaller *u, PgfType ty)
if (n_exprs > 0) { if (n_exprs > 0) {
exprs = (PgfExpr *)PyList_GetItem(type->exprs, 0); exprs = (PgfExpr *)PyList_GetItem(type->exprs, 0);
// TODO lay out others in memory in some way? // TODO lay out others in memory in some way?
Py_INCREF(exprs); // ?
} else { } else {
exprs = NULL; exprs = NULL;
} }