diff options
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/cgensupport.h | 3 | ||||
| -rw-r--r-- | Include/listobject.h | 2 | ||||
| -rw-r--r-- | Include/modsupport.h | 23 | ||||
| -rw-r--r-- | Include/pythonrun.h | 1 |
4 files changed, 5 insertions, 24 deletions
diff --git a/Include/cgensupport.h b/Include/cgensupport.h index 5c2cbd4..43818bc 100644 --- a/Include/cgensupport.h +++ b/Include/cgensupport.h @@ -29,8 +29,7 @@ typedef char *string; #define mknewlongobject(x) newintobject(x) #define mknewshortobject(x) newintobject((long)x) #define mknewfloatobject(x) newfloatobject(x) - -extern object *mknewcharobject PROTO((int c)); +#define mknewcharobject(c) mkvalue("c", c) extern int getiobjectarg PROTO((object *args, int nargs, int i, object **p_a)); extern int getilongarg PROTO((object *args, int nargs, int i, long *p_a)); diff --git a/Include/listobject.h b/Include/listobject.h index 519776a..f18877f 100644 --- a/Include/listobject.h +++ b/Include/listobject.h @@ -53,6 +53,8 @@ extern object *getlistitem PROTO((object *, int)); extern int setlistitem PROTO((object *, int, object *)); extern int inslistitem PROTO((object *, int, object *)); extern int addlistitem PROTO((object *, object *)); +extern object *getlistslice PROTO((object *, int, int)); +extern int setlistslice PROTO((object *, int, int, object *)); extern int sortlist PROTO((object *)); /* Macro, trading safety for speed */ diff --git a/Include/modsupport.h b/Include/modsupport.h index bb809c7..5c1bdf5 100644 --- a/Include/modsupport.h +++ b/Include/modsupport.h @@ -40,29 +40,8 @@ extern int vgetargs PROTO((object *, char *, va_list)); extern object *mkvalue PROTO((char *, ...)); extern object *vmkvalue PROTO((char *, va_list)); +/* The following are obsolete -- use getargs directly! */ #define getnoarg(v) getargs(v, "") #define getintarg(v, a) getargs(v, "i", a) -#define getintintarg(v, a, b) getargs(v, "(ii)", a, b) -#define getintintintarg(v, a, b, c) getargs(v, "(iii)", a, b, c) #define getlongarg(v, a) getargs(v, "l", a) -#define getlonglongarg(v, a, b) getargs(v, "(ll)", a, b) -#define getlonglongobjectarg(v, a, b, c) getargs(v, "(llO)", a, b, c) -#define getStrarg(v, a) getargs(v, "S", a) #define getstrarg(v, a) getargs(v, "s", a) -#define getstrstrarg(v, a, b) getargs(v, "(ss)", a, b) -#define getStrStrarg(v, a, b) getargs(v, "(SS)", a, b) -#define getstrstrintarg(v, a, b, c) getargs(v, "(ssi)", a, b, c) -#define getStrintarg(v, a, b) getargs(v, "(Si)", a, b) -#define getstrintarg(v, a, b) getargs(v, "(si)", a, b) -#define getintstrarg(v, a, b) getargs(v, "(is)", a, b) -#define getpointarg(v, a) getargs(v, "(ii)", a, (a)+1) -#define get3pointarg(v, a) getargs(v, "((ii)(ii)(ii))", \ - a, a+1, a+2, a+3, a+4, a+5) -#define getrectarg(v, a) getargs(v, "((ii)(ii))", a, a+1, a+2, a+3) -#define getrectintarg(v, a) getargs(v, "(((ii)(ii))i)", a, a+1, a+2, a+3, a+4) -#define getpointintarg(v, a) getargs(v, "((ii)i)", a, a+1, a+2) -#define getpointstrarg(v, a, b) getargs(v, "((ii)s)", a, a+1, b) -#define getrectpointarg(v, a) getargs(v, "(((ii)(ii))(ii))", \ - a, a+1, a+2, a+3, a+4, a+5) -#define getdoublearg(v, a) getargs(v, "d", a) -#define get2doublearg(v, a, b) getargs(v, "(dd)", a, b) diff --git a/Include/pythonrun.h b/Include/pythonrun.h index 6c6117b..c3c3aca 100644 --- a/Include/pythonrun.h +++ b/Include/pythonrun.h @@ -28,6 +28,7 @@ void initall PROTO((void)); int run PROTO((FILE *, char *)); +int run_command PROTO((char *)); int run_script PROTO((FILE *, char *)); int run_tty_1 PROTO((FILE *, char *)); int run_tty_loop PROTO((FILE *, char *)); |