diff options
| author | Guido van Rossum <guido@python.org> | 1994-08-01 11:34:53 +0000 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1994-08-01 11:34:53 +0000 |
| commit | 31bcad2a833517df724fc6ca8335190170174b8f (patch) | |
| tree | 4467846eced619192a031837d76b2186f28a395f /Include/frameobject.h | |
| parent | c660f7fcd25eb9d5c9ce72899c5f4a66141136d8 (diff) | |
| download | cpython-31bcad2a833517df724fc6ca8335190170174b8f.tar.gz | |
Merge alpha100 branch back to main trunk
Diffstat (limited to 'Include/frameobject.h')
| -rw-r--r-- | Include/frameobject.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Include/frameobject.h b/Include/frameobject.h index 5eeb2ada52..24588811f9 100644 --- a/Include/frameobject.h +++ b/Include/frameobject.h @@ -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 |