|
@@ -300,8 +300,9 @@ static PyGetSetDef BNode_getsetters[] = {
|
|
|
|
|
|
|
|
|
|
static PyObject *
|
|
static PyObject *
|
|
-Term_repr (TermObject *term_obj)
|
|
|
|
|
|
+Term_repr (PyObject *self)
|
|
{
|
|
{
|
|
|
|
+ TermObject *term_obj = (TermObject *)self;
|
|
LSUP_Term *term = term_obj->ob_struct;
|
|
LSUP_Term *term = term_obj->ob_struct;
|
|
char *term_repr_ptn = "<%s @%p> '%s'";
|
|
char *term_repr_ptn = "<%s @%p> '%s'";
|
|
char *term_nt;
|
|
char *term_nt;
|
|
@@ -309,18 +310,19 @@ Term_repr (TermObject *term_obj)
|
|
PyErr_SetString (PyExc_ValueError, "Error serializing term.");
|
|
PyErr_SetString (PyExc_ValueError, "Error serializing term.");
|
|
return NULL;
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
+
|
|
char *term_repr = malloc (
|
|
char *term_repr = malloc (
|
|
strlen (term_repr_ptn) +
|
|
strlen (term_repr_ptn) +
|
|
strlen (term_nt) +
|
|
strlen (term_nt) +
|
|
- strlen (term_obj->tp_name) + 32); // 32 for pointer address + NUL
|
|
|
|
- if (UNLIKELY (!term_repr)) return PyErr_NoMemory;
|
|
|
|
|
|
+ strlen (self->ob_type->tp_name) + 32); // 32 for ptr addr + NUL
|
|
|
|
+ if (UNLIKELY (!term_repr)) return PyErr_NoMemory();
|
|
sprintf (
|
|
sprintf (
|
|
term_repr, term_repr_ptn,
|
|
term_repr, term_repr_ptn,
|
|
- term_obj->tp_name, term->obj, term_nt);
|
|
|
|
|
|
+ self->ob_type->tp_name, term_obj, term_nt);
|
|
|
|
|
|
PyObject *result = PyUnicode_FromString (term_repr);
|
|
PyObject *result = PyUnicode_FromString (term_repr);
|
|
free (term_repr);
|
|
free (term_repr);
|
|
- if (UNLIKELY (!result)) return PyErr_NoMemory;
|
|
|
|
|
|
+ if (UNLIKELY (!result)) return PyErr_NoMemory();
|
|
|
|
|
|
Py_INCREF (result);
|
|
Py_INCREF (result);
|
|
return result;
|
|
return result;
|
|
@@ -328,12 +330,13 @@ Term_repr (TermObject *term_obj)
|
|
|
|
|
|
|
|
|
|
static PyObject *
|
|
static PyObject *
|
|
-Term_str (PyObject *term_obj)
|
|
|
|
|
|
+Term_str (PyObject *self)
|
|
{
|
|
{
|
|
|
|
+ TermObject *term_obj = (TermObject *)self;
|
|
LSUP_Term *term = term_obj->ob_struct;
|
|
LSUP_Term *term = term_obj->ob_struct;
|
|
|
|
|
|
PyObject *result = PyUnicode_FromString (term->data);
|
|
PyObject *result = PyUnicode_FromString (term->data);
|
|
- if (UNLIKELY (!result)) return PyErr_NoMemory;
|
|
|
|
|
|
+ if (UNLIKELY (!result)) return PyErr_NoMemory();
|
|
|
|
|
|
Py_INCREF (result);
|
|
Py_INCREF (result);
|
|
return result;
|
|
return result;
|