Name change.

1 files changed, 44 insertions, 46 deletions

diff --git a/gpspacket.c b/gpspacket.c
index d38ff778..6cebc4c1 100644
--- a/gpspacket.c
+++ b/gpspacket.c
@@ -38,37 +38,35 @@ void gpsd_report(int errlevel UNUSED, const char *fmt, ... )
     Py_DECREF(args);
 }
 
-static PyTypeObject Getter_Type;
+static PyTypeObject Lexer_Type;
 
 typedef struct {
 	PyObject_HEAD
-	struct gps_packet_t getter;
-} GetterObject;
+	struct gps_packet_t lexer;
+} LexerObject;
 
-#define GetterObject_Check(v)	((v)->ob_type == &Getter_Type)
-
-static GetterObject *
-newGetterObject(PyObject *arg)
+static LexerObject *
+newLexerObject(PyObject *arg)
 {
-    GetterObject *self;
-    self = PyObject_New(GetterObject, &Getter_Type);
+    LexerObject *self;
+    self = PyObject_New(LexerObject, &Lexer_Type);
     if (self == NULL)
 	return NULL;
-    memset(&self->getter, 0, sizeof(struct gps_packet_t));
-    packet_reset(&self->getter);
+    memset(&self->lexer, 0, sizeof(struct gps_packet_t));
+    packet_reset(&self->lexer);
     return self;
 }
 
-/* Getter methods */
+/* Lexer methods */
 
 static int
-Getter_init(GetterObject *self)
+Lexer_init(LexerObject *self)
 {
-    packet_reset(&self->getter);
+    packet_reset(&self->lexer);
     return 0;
 }
 static PyObject *
-Getter_get(GetterObject *self, PyObject *args)
+Lexer_get(LexerObject *self, PyObject *args)
 {
     ssize_t len;
     int fd;
@@ -76,64 +74,64 @@ Getter_get(GetterObject *self, PyObject *args)
     if (!PyArg_ParseTuple(args, "i;missing or invalid file descriptor argument to gpspacket.get", &fd))
         return NULL;
 
-    len = packet_get(fd, &self->getter);
+    len = packet_get(fd, &self->lexer);
     if (PyErr_Occurred())
 	return NULL;
 
     if (len == 0) {
-	self->getter.type = BAD_PACKET;
-	self->getter.outbuffer[0] = '\0';
+	self->lexer.type = BAD_PACKET;
+	self->lexer.outbuffer[0] = '\0';
     }
 
-    return Py_BuildValue("(i, s)", self->getter.type, self->getter.outbuffer);
+    return Py_BuildValue("(i, s)", self->lexer.type, self->lexer.outbuffer);
 }
 
 static PyObject *
-Getter_reset(GetterObject *self)
+Lexer_reset(LexerObject *self)
 {
-    packet_reset(&self->getter);
+    packet_reset(&self->lexer);
     if (PyErr_Occurred())
 	return NULL;
     return 0;
 }
 
 static void
-Getter_dealloc(GetterObject *self)
+Lexer_dealloc(LexerObject *self)
 {
     PyObject_Del(self);
 }
 
-static PyMethodDef Getter_methods[] = {
-    {"get",	(PyCFunction)Getter_get,	METH_VARARGS,
+static PyMethodDef Lexer_methods[] = {
+    {"get",	(PyCFunction)Lexer_get,	METH_VARARGS,
     		PyDoc_STR("Get a packet from a file descriptor.")},
-    {"reset",	(PyCFunction)Getter_reset,	METH_NOARGS,
-    		PyDoc_STR("Reset the packet getter to ground state.")},
+    {"reset",	(PyCFunction)Lexer_reset,	METH_NOARGS,
+    		PyDoc_STR("Reset the packet lexer to ground state.")},
     {NULL,		NULL}		/* sentinel */
 };
 
 static PyObject *
-Getter_getattr(GetterObject *self, char *name)
+Lexer_getattr(LexerObject *self, char *name)
 {
-    return Py_FindMethod(Getter_methods, (PyObject *)self, name);
+    return Py_FindMethod(Lexer_methods, (PyObject *)self, name);
 }
 
-PyDoc_STRVAR(Getter__doc__,
-"GPS packet getter object\n\
+PyDoc_STRVAR(Lexer__doc__,
+"GPS packet lexer object\n\
 \n\
 Fetch a single packet from file descriptor");
 
-static PyTypeObject Getter_Type = {
+static PyTypeObject Lexer_Type = {
 	/* The ob_type field must be initialized in the module init function
 	 * to be portable to Windows without using C++. */
 	PyObject_HEAD_INIT(NULL)
 	0,			/*ob_size*/
-	"gpspacket.getter",	/*tp_name*/
-	sizeof(GetterObject),	/*tp_basicsize*/
+	"gpspacket.lexer",	/*tp_name*/
+	sizeof(LexerObject),	/*tp_basicsize*/
 	0,			/*tp_itemsize*/
 	/* methods */
-	(destructor)Getter_dealloc, /*tp_dealloc*/
+	(destructor)Lexer_dealloc, /*tp_dealloc*/
 	0,			/*tp_print*/
-	(getattrfunc)Getter_getattr,			/*tp_getattr*/
+	(getattrfunc)Lexer_getattr,			/*tp_getattr*/
 	0,			/*tp_setattr*/
 	0,			/*tp_compare*/
 	0,			/*tp_repr*/
@@ -147,14 +145,14 @@ static PyTypeObject Getter_Type = {
         0,                      /*tp_setattro*/
         0,                      /*tp_as_buffer*/
         Py_TPFLAGS_DEFAULT,     /*tp_flags*/
-        Getter__doc__,          /*tp_doc*/
+        Lexer__doc__,          /*tp_doc*/
         0,                      /*tp_traverse*/
         0,                      /*tp_clear*/
         0,                      /*tp_richcompare*/
         0,                      /*tp_weaklistoffset*/
         0,                      /*tp_iter*/
         0,                      /*tp_iternext*/
-        Getter_methods,		/*tp_methods*/
+        Lexer_methods,		/*tp_methods*/
         0,                      /*tp_members*/
         0,                      /*tp_getset*/
         0,                      /*tp_base*/
@@ -162,23 +160,23 @@ static PyTypeObject Getter_Type = {
         0,                      /*tp_descr_get*/
         0,                      /*tp_descr_set*/
         0,                      /*tp_dictoffset*/
-        (initproc)Getter_init,	/*tp_init*/
+        (initproc)Lexer_init,	/*tp_init*/
         0,                      /*tp_alloc*/
         0,                      /*tp_new*/
         0,                      /*tp_free*/
         0,                      /*tp_is_gc*/
 };
 
-/* Function of no arguments returning new Getter object */
+/* Function of no arguments returning new Lexer object */
 
 static PyObject *
 gpspacket_new(PyObject *self, PyObject *args)
 {
-    GetterObject *rv;
+    LexerObject *rv;
 
     if (!PyArg_ParseTuple(args, ":new"))
 	return NULL;
-    rv = newGetterObject(args);
+    rv = newLexerObject(args);
     if (rv == NULL)
 	return NULL;
     return (PyObject *)rv;
@@ -190,7 +188,7 @@ PyDoc_STRVAR(register_report__doc__,
 callback must be a callable object expecting a string as parameter.");
 
 static PyObject *
-register_report(GetterObject *self, PyObject *args)
+register_report(LexerObject *self, PyObject *args)
 {
     PyObject *callback = NULL;
 
@@ -219,7 +217,7 @@ register_report(GetterObject *self, PyObject *args)
 
 static PyMethodDef gpspacket_methods[] = {
     {"new",		gpspacket_new,		METH_VARARGS,
-     PyDoc_STR("new() -> new packet-getter object")},
+     PyDoc_STR("new() -> new packet-lexer object")},
     {"register_report", (PyCFunction)register_report, METH_VARARGS,
 			register_report__doc__},
     {NULL,		NULL}		/* sentinel */
@@ -227,12 +225,12 @@ static PyMethodDef gpspacket_methods[] = {
 
 PyDoc_STRVAR(module_doc,
 "Python binding of the libgpsd module for recognizing GPS packets.\n\
-The new() function returns a new packet-getter instance.  Getter instances\n\
+The new() function returns a new packet-lexer instance.  Lexer instances\n\
 have two methods:\n\
     get() takes a file descriptor argument and returns a tuple consisting of\n\
 the integer packet type and string packet value.  On end of file it returns\n\
 (-1, '').\n\
-    reset() resets the packet-getter to its initial state.\n\
+    reset() resets the packet-lexer to its initial state.\n\
     The module also has a register_report() function that accepts a callback\n\
 for debug message reporting.  The callback will get two arguments, the error\n\
 level of the message and the message itself.\n\
@@ -243,7 +241,7 @@ initgpspacket(void)
 {
     PyObject *m;
 
-    if (PyType_Ready(&Getter_Type) < 0)
+    if (PyType_Ready(&Lexer_Type) < 0)
 	return;
 
     /* Create the module and add the functions */