[Python-checkins] python/dist/src/Include code.h,NONE,1.1.2.1 compile.h,2.37,2.37.2.1 symtable.h,2.9.18.1,2.9.18.2
jhylton@users.sourceforge.net
jhylton@users.sourceforge.net
Tue, 09 Jul 2002 06:22:02 -0700
Update of /cvsroot/python/python/dist/src/Include
In directory usw-pr-cvs1:/tmp/cvs-serv9917/Include
Modified Files:
Tag: ast-branch
compile.h symtable.h
Added Files:
Tag: ast-branch
code.h
Log Message:
Move PyCodeObject from compile.c to Objects/codeobject.c.
--- NEW FILE: code.h ---
/* Definitions for bytecode */
#ifndef Py_CODE_H
#define Py_CODE_H
#ifdef __cplusplus
extern "C" {
#endif
/* Bytecode object */
typedef struct {
PyObject_HEAD
int co_argcount; /* #arguments, except *args */
int co_nlocals; /* #local variables */
int co_stacksize; /* #entries needed for evaluation stack */
int co_flags; /* CO_..., see below */
PyObject *co_code; /* instruction opcodes */
PyObject *co_consts; /* list (constants used) */
PyObject *co_names; /* list of strings (names used) */
PyObject *co_varnames; /* tuple of strings (local variable names) */
PyObject *co_freevars; /* tuple of strings (free variable names) */
PyObject *co_cellvars; /* tuple of strings (cell variable names) */
/* The rest doesn't count for hash/cmp */
PyObject *co_filename; /* string (where it was loaded from) */
PyObject *co_name; /* string (name, for reference) */
int co_firstlineno; /* first source line number */
PyObject *co_lnotab; /* string (encoding addr<->lineno mapping) */
} PyCodeObject;
/* Masks for co_flags above */
#define CO_OPTIMIZED 0x0001
#define CO_NEWLOCALS 0x0002
#define CO_VARARGS 0x0004
#define CO_VARKEYWORDS 0x0008
#define CO_NESTED 0x0010
#define CO_GENERATOR 0x0020
/* XXX Temporary hack. Until generators are a permanent part of the
language, we need a way for a code object to record that generators
were *possible* when it was compiled. This is so code dynamically
compiled *by* a code object knows whether to allow yield stmts. In
effect, this passes on the "from __future__ import generators" state
in effect when the code block was compiled. */
#define CO_GENERATOR_ALLOWED 0x1000 /* no longer used in an essential way */
#define CO_FUTURE_DIVISION 0x2000
#define CO_MAXBLOCKS 20 /* Max static block nesting within a function */
extern DL_IMPORT(PyTypeObject) PyCode_Type;
#define PyCode_Check(op) ((op)->ob_type == &PyCode_Type)
#define PyCode_GetNumFree(op) (PyTuple_GET_SIZE((op)->co_freevars))
/* Public interface */
DL_IMPORT(PyCodeObject *) PyCode_New(
int, int, int, int, PyObject *, PyObject *, PyObject *, PyObject *,
PyObject *, PyObject *, PyObject *, PyObject *, int, PyObject *);
/* same as struct above */
DL_IMPORT(int) PyCode_Addr2Line(PyCodeObject *, int);
/* for internal use only */
#define _PyCode_GETCODEPTR(co, pp) \
((*(co)->co_code->ob_type->tp_as_buffer->bf_getreadbuffer) \
((co)->co_code, 0, (void **)(pp)))
#ifdef __cplusplus
}
#endif
#endif /* !Py_CODE_H */
Index: compile.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/compile.h,v
retrieving revision 2.37
retrieving revision 2.37.2.1
diff -C2 -d -r2.37 -r2.37.2.1
*** compile.h 12 Apr 2002 01:20:09 -0000 2.37
--- compile.h 9 Jul 2002 13:22:00 -0000 2.37.2.1
***************
*** 1,62 ****
-
- /* Definitions for bytecode */
-
#ifndef Py_COMPILE_H
#define Py_COMPILE_H
#ifdef __cplusplus
! extern "C" {
#endif
- /* Bytecode object */
- typedef struct {
- PyObject_HEAD
- int co_argcount; /* #arguments, except *args */
- int co_nlocals; /* #local variables */
- int co_stacksize; /* #entries needed for evaluation stack */
- int co_flags; /* CO_..., see below */
- PyObject *co_code; /* instruction opcodes */
- PyObject *co_consts; /* list (constants used) */
- PyObject *co_names; /* list of strings (names used) */
- PyObject *co_varnames; /* tuple of strings (local variable names) */
- PyObject *co_freevars; /* tuple of strings (free variable names) */
- PyObject *co_cellvars; /* tuple of strings (cell variable names) */
- /* The rest doesn't count for hash/cmp */
- PyObject *co_filename; /* string (where it was loaded from) */
- PyObject *co_name; /* string (name, for reference) */
- int co_firstlineno; /* first source line number */
- PyObject *co_lnotab; /* string (encoding addr<->lineno mapping) */
- } PyCodeObject;
-
- /* Masks for co_flags above */
- #define CO_OPTIMIZED 0x0001
- #define CO_NEWLOCALS 0x0002
- #define CO_VARARGS 0x0004
- #define CO_VARKEYWORDS 0x0008
- #define CO_NESTED 0x0010
- #define CO_GENERATOR 0x0020
- /* XXX Temporary hack. Until generators are a permanent part of the
- language, we need a way for a code object to record that generators
- were *possible* when it was compiled. This is so code dynamically
- compiled *by* a code object knows whether to allow yield stmts. In
- effect, this passes on the "from __future__ import generators" state
- in effect when the code block was compiled. */
- #define CO_GENERATOR_ALLOWED 0x1000 /* no longer used in an essential way */
- #define CO_FUTURE_DIVISION 0x2000
-
- extern DL_IMPORT(PyTypeObject) PyCode_Type;
-
- #define PyCode_Check(op) ((op)->ob_type == &PyCode_Type)
- #define PyCode_GetNumFree(op) (PyTuple_GET_SIZE((op)->co_freevars))
-
- #define CO_MAXBLOCKS 20 /* Max static block nesting within a function */
-
/* Public interface */
struct _node; /* Declare the existence of this type */
DL_IMPORT(PyCodeObject *) PyNode_Compile(struct _node *, char *);
- DL_IMPORT(PyCodeObject *) PyCode_New(
- int, int, int, int, PyObject *, PyObject *, PyObject *, PyObject *,
- PyObject *, PyObject *, PyObject *, PyObject *, int, PyObject *);
- /* same as struct above */
- DL_IMPORT(int) PyCode_Addr2Line(PyCodeObject *, int);
/* Future feature support */
--- 1,11 ----
#ifndef Py_COMPILE_H
#define Py_COMPILE_H
#ifdef __cplusplus
! //extern "C" {
#endif
/* Public interface */
struct _node; /* Declare the existence of this type */
DL_IMPORT(PyCodeObject *) PyNode_Compile(struct _node *, char *);
/* Future feature support */
***************
*** 76,83 ****
#define FUTURE_DIVISION "division"
! /* for internal use only */
! #define _PyCode_GETCODEPTR(co, pp) \
! ((*(co)->co_code->ob_type->tp_as_buffer->bf_getreadbuffer) \
! ((co)->co_code, 0, (void **)(pp)))
#ifdef __cplusplus
--- 25,47 ----
#define FUTURE_DIVISION "division"
! struct _mod; /* Declare the existence of this type */
! DL_IMPORT(PyCodeObject *) PyAST_Compile(struct _mod *, const char *,
! PyCompilerFlags *);
! DL_IMPORT(PyFutureFeatures *) PyFuture_FromAST(struct _mod *, const char *);
!
! #define DEFAULT_BLOCK_SIZE 32
! #define DEFAULT_BLOCKS 8
!
! struct instr {
! int i_opcode;
! int i_oparg;
! PyObject *i_arg;
! };
!
! struct basicblock {
! size_t b_iused;
! size_t b_ialloc;
! struct instr b_instr[DEFAULT_BLOCK_SIZE];
! };
#ifdef __cplusplus
Index: symtable.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/symtable.h,v
retrieving revision 2.9.18.1
retrieving revision 2.9.18.2
diff -C2 -d -r2.9.18.1 -r2.9.18.2
*** symtable.h 7 Jul 2002 17:47:41 -0000 2.9.18.1
--- symtable.h 9 Jul 2002 13:22:00 -0000 2.9.18.2
***************
*** 51,54 ****
--- 51,57 ----
DL_IMPORT(struct symtable *) PyNode_CompileSymtable(struct _node *, char *);
+ DL_IMPORT(struct symtable *) PySymtable_Build(mod_ty, const char *,
+ PyFutureFeatures *);
+
DL_IMPORT(void) PySymtable_Free(struct symtable *);