mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
Merge alpha100 branch back to main trunk
This commit is contained in:
parent
2979b01ff8
commit
b6775db241
176 changed files with 5302 additions and 3668 deletions
|
@ -5,7 +5,7 @@ extern "C" {
|
|||
#endif
|
||||
|
||||
/***********************************************************
|
||||
Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
|
||||
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
|
||||
Amsterdam, The Netherlands.
|
||||
|
||||
All Rights Reserved
|
||||
|
@ -52,6 +52,7 @@ typedef struct _frame {
|
|||
int f_iblock; /* index in f_blockstack */
|
||||
int f_lasti; /* Last instruction if called */
|
||||
int f_lineno; /* Current line number */
|
||||
object *f_trace; /* Trace function */
|
||||
} frameobject;
|
||||
|
||||
|
||||
|
@ -70,11 +71,11 @@ frameobject * newframeobject PROTO(
|
|||
/* List access macros */
|
||||
|
||||
#ifdef NDEBUG
|
||||
#define GETITEM(v, i) GETLISTITEM((listobject *)(v), (i))
|
||||
#define GETITEM(v, i) GETTUPLEITEM((tupleobject *)(v), (i))
|
||||
#define GETITEMNAME(v, i) GETSTRINGVALUE((stringobject *)GETITEM((v), (i)))
|
||||
#else
|
||||
#define GETITEM(v, i) getlistitem((v), (i))
|
||||
#define GETITEMNAME(v, i) getstringvalue(getlistitem((v), (i)))
|
||||
#define GETITEM(v, i) gettupleitem((v), (i))
|
||||
#define GETITEMNAME(v, i) getstringvalue(GETITEM(v, i))
|
||||
#endif
|
||||
|
||||
#define GETUSTRINGVALUE(s) ((unsigned char *)GETSTRINGVALUE(s))
|
||||
|
@ -95,6 +96,11 @@ block *pop_block PROTO((frameobject *));
|
|||
|
||||
object **extend_stack PROTO((frameobject *, int, int));
|
||||
|
||||
/* Conversions between "fast locals" and locals in dictionary */
|
||||
|
||||
void locals_2_fast PROTO((frameobject *, int));
|
||||
void fast_2_locals PROTO((frameobject *));
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue