Commit 2771e522 authored by Guido van Rossum's avatar Guido van Rossum

'regs' is a read-only data member, not a function.

parent 3a1433ff
...@@ -146,23 +146,9 @@ reg_search(re, args) ...@@ -146,23 +146,9 @@ reg_search(re, args)
return newintobject((long)result); /* Position of the match or -1 */ return newintobject((long)result); /* Position of the match or -1 */
} }
static object *
reg_regs(re, args)
regexobject *re;
object *args;
{
if (!re->re_regs_valid) {
err_setstr(RegexError,
"regs only valid after successful match/search");
return NULL;
}
return makeresult(&re->re_regs);
}
static struct methodlist reg_methods[] = { static struct methodlist reg_methods[] = {
{"match", reg_match}, {"match", reg_match},
{"search", reg_search}, {"search", reg_search},
{"regs", reg_regs},
{NULL, NULL} /* sentinel */ {NULL, NULL} /* sentinel */
}; };
...@@ -171,6 +157,14 @@ reg_getattr(re, name) ...@@ -171,6 +157,14 @@ reg_getattr(re, name)
regexobject *re; regexobject *re;
char *name; char *name;
{ {
if (strcmp(name, "regs") == 0) {
if (!re->re_regs_valid) {
err_setstr(RegexError,
"regs only valid after successful match/search");
return NULL;
}
return makeresult(&re->re_regs);
}
return findmethod(reg_methods, (object *)re, name); return findmethod(reg_methods, (object *)re, name);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment