mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 00:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

- experimental: added two new attributes to the match object:

Browse source 
"lastgroup" is the name of the last matched capturing group,
  "lastindex" is the index of the same group.  if no group was
  matched, both attributes are set to None.

  the (?P#) feature will be removed in the next relase.
This commit is contained in:
Fredrik Lundh 2000-07-02 22:25:39 +00:00
parent c9c02c4cf3
commit c2301730b8
4 changed files with 38 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Modules/_sre.c
View file

@ -1104,9 +1104,10 @@ _compile(PyObject* self_, PyObject* args)
PyObject* code;
int groups = 0;
PyObject* groupindex = NULL;
if (!PyArg_ParseTuple(args, "OiO!|iO", &pattern, &flags,
PyObject* indexgroup = NULL;
if (!PyArg_ParseTuple(args, "OiO!|iOO", &pattern, &flags,
&PyString_Type, &code,
&groups, &groupindex))
&groups, &groupindex, &indexgroup))
return NULL;
self = PyObject_NEW(PatternObject, &Pattern_Type);
@ -1127,6 +1128,9 @@ _compile(PyObject* self_, PyObject* args)
Py_XINCREF(groupindex);
self->groupindex = groupindex;
Py_XINCREF(indexgroup);
self->indexgroup = indexgroup;
return (PyObject*) self;
}
@ -1883,7 +1887,28 @@ match_getattr(MatchObject* self, char* name)
PyErr_Clear();
/* attributes */
if (!strcmp(name, "lastindex")) {
/* experimental */
if (self->index >= 0)
return Py_BuildValue("i", self->index);
Py_INCREF(Py_None);
return Py_None;
}
if (!strcmp(name, "lastgroup")) {
/* experimental */
if (self->pattern->indexgroup) {
PyObject* result = PySequence_GetItem(
self->pattern->indexgroup, self->index
);
if (result)
return result;
PyErr_Clear();
}
Py_INCREF(Py_None);
return Py_None;
}
if (!strcmp(name, "string")) {
Py_INCREF(self->string);
return self->string;
@ -1900,15 +1925,6 @@ match_getattr(MatchObject* self, char* name)
if (!strcmp(name, "endpos"))
return Py_BuildValue("i", 0); /* FIXME */
if (!strcmp(name, "index")) {
/* experimental */
if (self->index < 0) {
Py_INCREF(Py_None);
return Py_None;
} else
return Py_BuildValue("i", self->index);
}
PyErr_SetString(PyExc_AttributeError, name);
return NULL;
}