GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 19:42:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

bracketedLinearize in Python is now using the linref

Browse Source
This commit is contained in:
kr.angelov
2013-10-31 09:04:07 +00:00
parent 40f0ceb2ef
commit 8f565302cc
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/runtime/c/pgf/linearizer.h
View File

@@ -59,7 +59,8 @@ struct PgfLinFuncs
}; };
PgfCncTree
pgf_lzr_wrap_linref(PgfCncTree ctree, GuPool* pool);
/// Linearize a concrete syntax tree. /// Linearize a concrete syntax tree.
void void

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

@@ -1492,6 +1492,8 @@ Concr_bracketedLinearize(ConcrObject* self, PyObject *args)
PyObject* list = PyList_New(0); PyObject* list = PyList_New(0);
ctree = pgf_lzr_wrap_linref(ctree, tmp_pool);
PgfBracketLznState state; PgfBracketLznState state;
state.funcs = &pgf_bracket_lin_funcs; state.funcs = &pgf_bracket_lin_funcs;
state.stack = gu_new_buf(PyObject*, tmp_pool); state.stack = gu_new_buf(PyObject*, tmp_pool);
@@ -1499,18 +1501,8 @@ Concr_bracketedLinearize(ConcrObject* self, PyObject *args)
pgf_lzr_linearize(self->concr, ctree, 0, &state.funcs); pgf_lzr_linearize(self->concr, ctree, 0, &state.funcs);
gu_pool_free(tmp_pool); gu_pool_free(tmp_pool);
PyObject* bracket = NULL;
if (PyList_Size(list) == 1) {
bracket = PyList_GetItem(list, 0);
Py_INCREF(bracket);
} else {
PyErr_SetString(PGFError, "The abstract tree cannot be linearized");
}
Py_DECREF(list); return list;
return bracket;
} }
static PyObject* static PyObject*