PGFModule rename to PGF in py-bindings.

This commit is contained in:
jordi.saludes
2010-07-22 15:02:49 +00:00
parent 7a9015c09f
commit 3a5e1f11cb

View File

@@ -23,7 +23,7 @@ checkType(void* obj, PyTypeObject* tp)
NEWGF(CId,GF_CId,CIdType,"gf.cid","c identifier") NEWGF(CId,GF_CId,CIdType,"gf.cid","c identifier")
NEWGF(Lang,GF_Language,LangType,"gf.lang","language") NEWGF(Lang,GF_Language,LangType,"gf.lang","language")
NEWGF(gfType,GF_Type,gfTypeType,"gf.type","gf type") NEWGF(gfType,GF_Type,gfTypeType,"gf.type","gf type")
NEWGF(PGFModule,GF_PGF,PGFType,"gf.pgf","PGF module") 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")
@@ -46,11 +46,11 @@ CId_repr(CId *self)
/* PGF methods, constructor and destructor */ /* PGF methods, constructor and destructor */
DEALLOCFN(PGF_dealloc, PGFModule, gf_freePGF, "freePGF") DEALLOCFN(PGF_dealloc, PGF, gf_freePGF, "freePGF")
static PyObject* static PyObject*
pgf_repr(PGFModule *self) { pgf_repr(PGF *self) {
Lang lang; Lang lang;
gf_abstractName(self, &lang); gf_abstractName(self, &lang);
const char* abs = gf_showLanguage(&lang); const char* abs = gf_showLanguage(&lang);
@@ -66,12 +66,12 @@ startCategory(PyObject *self, PyObject *noarg)
gfType *cat; gfType *cat;
if (!checkType(self, &PGFType)) return NULL; if (!checkType(self, &PGFType)) return NULL;
cat = (gfType*)gfTypeType.tp_new(&gfTypeType,NULL,NULL); cat = (gfType*)gfTypeType.tp_new(&gfTypeType,NULL,NULL);
gf_startCat((PGFModule*)self, cat); gf_startCat((PGF*)self, cat);
return cat; return cat;
} }
inline static PyObject* inline static PyObject*
categories(PGFModule* self) categories(PGF* self)
{ {
/* PyObject* cats = PyList_New(0); /* PyObject* cats = PyList_New(0);
GF_CId *p = gf_categories(self); GF_CId *p = gf_categories(self);
@@ -86,13 +86,13 @@ categories(PGFModule* self)
} }
inline static PyObject* inline static PyObject*
languages(PGFModule* self) languages(PGF* self)
{ {
return gf_languages(self); return gf_languages(self);
} }
static PyObject* static PyObject*
languageCode(PGFModule *self, PyObject *args) languageCode(PGF *self, PyObject *args)
{ {
Lang *lang; Lang *lang;
if (!PyArg_ParseTuple(args, "O", &lang)) if (!PyArg_ParseTuple(args, "O", &lang))
@@ -111,7 +111,7 @@ languageCode(PGFModule *self, PyObject *args)
} }
static PyObject* static PyObject*
linearize(PGFModule *self, PyObject *args) linearize(PGF *self, PyObject *args)
{ {
Lang *lang; Lang *lang;
Tree *tree; Tree *tree;
@@ -125,7 +125,7 @@ linearize(PGFModule *self, PyObject *args)
} }
static Lang* static Lang*
abstractName(PGFModule* self) abstractName(PGF *self)
{ {
Lang* abs_name = (Lang*)LangType.tp_new(&LangType,NULL,NULL); Lang* abs_name = (Lang*)LangType.tp_new(&LangType,NULL,NULL);
if (!checkType(self,&PGFType)) return NULL; if (!checkType(self,&PGFType)) return NULL;
@@ -135,7 +135,7 @@ abstractName(PGFModule* self)
static PyObject* static PyObject*
printName(PGFModule *self, PyObject *args) printName(PGF *self, PyObject *args)
{ {
Lang* lang; Lang* lang;
CId* id; CId* id;
@@ -172,16 +172,16 @@ parse(PyObject *self, PyObject *args, PyObject *kws)
return gf_parse(self, lang, cat, lexed); return gf_parse(self, lang, cat, lexed);
} }
static PGFModule* static PGF*
readPGF(PyObject *self, PyObject *args) readPGF(PyObject *self, PyObject *args)
{ {
char *path; char *path;
struct stat info; struct stat info;
PGFModule *pgf; PGF *pgf;
if (!PyArg_ParseTuple(args, "s", &path)) if (!PyArg_ParseTuple(args, "s", &path))
return NULL; return NULL;
if (stat(path, &info) == 0) { if (stat(path, &info) == 0) {
pgf = (PGFModule*)PGFType.tp_new(&PGFType,NULL,NULL); pgf = (PGF*)PGFType.tp_new(&PGFType,NULL,NULL);
if (!pgf) return NULL; if (!pgf) return NULL;
gf_readPGF(pgf, path); gf_readPGF(pgf, path);
return pgf; return pgf;