mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add "varargs" attribute.

This commit is contained in:
Guido van Rossum 1991-12-16 13:07:24 +00:00
parent 3ddee714d1
commit c06022966f
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Include/methodobject.h
View File

@ -30,13 +30,15 @@ extern typeobject Methodtype;
typedef object *(*method) FPROTO((object *, object *));
extern object *newmethodobject PROTO((char *, method, object *));
extern object *newmethodobject PROTO((char *, method, object *, int));
extern method getmethod PROTO((object *));
extern object *getself PROTO((object *));
extern int getvarargs PROTO((object *));
struct methodlist {
char *ml_name;
method ml_meth;
char *ml_name;
method ml_meth;
int ml_varargs;
};
extern object *findmethod PROTO((struct methodlist *, object *, char *));

25
Objects/methodobject.c
View File

@ -30,16 +30,18 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
typedef struct {
OB_HEAD
char *m_name;
method m_meth;
object *m_self;
char *m_name;
method m_meth;
object *m_self;
int m_varargs;
} methodobject;
object *
newmethodobject(name, meth, self)
newmethodobject(name, meth, self, varargs)
char *name; /* static string */
method meth;
object *self;
int varargs;
{
methodobject *op = NEWOBJ(methodobject, &Methodtype);
if (op != NULL) {
@ -48,6 +50,7 @@ newmethodobject(name, meth, self)
if (self != NULL)
INCREF(self);
op->m_self = self;
op->m_varargs = varargs;
}
return (object *)op;
}
@ -74,6 +77,17 @@ getself(op)
return ((methodobject *)op) -> m_self;
}
int
getvarargs(op)
object *op;
{
if (!is_methodobject(op)) {
err_badcall();
return -1;
}
return ((methodobject *)op) -> m_varargs;
}
/* Methods (the standard built-in methods, that is) */
static void
@ -168,7 +182,8 @@ findmethod(ml, op, name)
return listmethods(ml);
for (; ml->ml_name != NULL; ml++) {
if (strcmp(name, ml->ml_name) == 0)
return newmethodobject(ml->ml_name, ml->ml_meth, op);
return newmethodobject(ml->ml_name, ml->ml_meth,
op, ml->ml_varargs);
}
err_setstr(AttributeError, name);
return NULL;

2
Python/modsupport.c
View File

@ -45,7 +45,7 @@ initmodule(name, methods)
for (ml = methods; ml->ml_name != NULL; ml++) {
sprintf(namebuf, "%s.%s", name, ml->ml_name);
v = newmethodobject(strdup(namebuf), ml->ml_meth,
(object *)NULL);
(object *)NULL, ml->ml_varargs);
/* XXX The strdup'ed memory is never freed */
if (v == NULL || dictinsert(d, ml->ml_name, v) != 0) {
fprintf(stderr, "initializing module: %s\n", name);