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

Code cleaning in py-bindings.

Browse Source
This commit is contained in:
jordi.saludes
2010-07-22 15:13:00 +00:00
parent 0e72c17b43
commit e04b3e49dc
1 changed files with 5 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
contrib/py-bindings/gfmodule.c
View File

@@ -27,8 +27,8 @@ NEWGF(PGF,GF_PGF,PGFType,"gf.pgf","PGF module")
NEWGF(Expr,GF_Expr,ExprType,"gf.expr","gf expression") NEWGF(Expr,GF_Expr,ExprType,"gf.expr","gf expression")
NEWGF(Tree,GF_Tree,TreeType,"gf.tree","gf tree") NEWGF(Tree,GF_Tree,TreeType,"gf.tree","gf tree")
/* CId methods, constructor and destructor */
/* CId methods, constructor and destructor */
DEALLOCFN(CId_dealloc, CId, gf_freeCId, "freeCId") DEALLOCFN(CId_dealloc, CId, gf_freeCId, "freeCId")
@@ -45,10 +45,8 @@ CId_repr(CId *self)
/* PGF methods, constructor and destructor */ /* PGF methods, constructor and destructor */
DEALLOCFN(PGF_dealloc, PGF, gf_freePGF, "freePGF") DEALLOCFN(PGF_dealloc, PGF, gf_freePGF, "freePGF")
static PyObject* static PyObject*
pgf_repr(PGF *self) { pgf_repr(PGF *self) {
Lang lang; Lang lang;
@@ -58,10 +56,8 @@ pgf_repr(PGF *self) {
return PyString_FromFormat("<gf.pgf with abstract %s at 0x%x>", abs, self->obj); return PyString_FromFormat("<gf.pgf with abstract %s at 0x%x>", abs, self->obj);
} }
static gfType* static gfType*
startCategory(PyObject *self, PyObject *noarg) startCategory(PGF *self, PyObject *noarg)
{ {
gfType *cat; gfType *cat;
if (!checkType(self, &PGFType)) return NULL; if (!checkType(self, &PGFType)) return NULL;
@@ -73,15 +69,6 @@ startCategory(PyObject *self, PyObject *noarg)
inline static PyObject* inline static PyObject*
categories(PGF* self) categories(PGF* self)
{ {
/* PyObject* cats = PyList_New(0);
GF_CId *p = gf_categories(self);
while (*p) {
CId* c = (CId*)CIdType.tp_new(&CIdType,NULL,NULL);
c->obj = *(p++);
PyList_Append(cats, (PyObject*)c);
Py_DECREF(c); //?
}
return cats; */
return gf_categories(self); return gf_categories(self);
} }
@@ -132,7 +119,6 @@ abstractName(PGF *self)
return abs_name; return abs_name;
} }
static PyObject* static PyObject*
printName(PGF *self, PyObject *args) printName(PGF *self, PyObject *args)
{ {
@@ -150,7 +136,7 @@ printName(PGF *self, PyObject *args)
static PyObject* static PyObject*
parse(PyObject *self, PyObject *args, PyObject *kws) parse(PGF *self, PyObject *args, PyObject *kws)
{ {
PyObject *lang, *cat = NULL; PyObject *lang, *cat = NULL;
//GF_PGF pgf; //GF_PGF pgf;
@@ -295,18 +281,7 @@ PyModule_AddObject(m, "gf", (PyObject *)&t);
} }
/* inline Lang* newLang() { /* List utilities to be imported by FFI */
return (Lang*)LangType.tp_new(&LangType,NULL,NULL);
}
inline Tree* newTree() {
return (Tree*)TreeType.tp_new(&TreeType,NULL,NULL);
}
inline CId* newCId() {
return (CId*)CIdType.tp_new(&CIdType,NULL,NULL);
}
*/
inline PyObject* newList() { return PyList_New(0); } inline PyObject* newList() { return PyList_New(0); }
inline void append(PyObject* l, PyObject* ob) { PyList_Append(l, ob); } inline void append(PyObject* l, PyObject* ob) { PyList_Append(l, ob); }