[Python-checkins] python/dist/src/Include symtable.h,2.9.18.3,2.9.18.4

[jhylton@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Include
In directory usw-pr-cvs1:/tmp/cvs-serv17954/Include

Modified Files:
      Tag: ast-branch
	symtable.h 
Log Message:
Misc cleanup.

Remove st_pass and st_errors, which are no longer needed.
Change prototype of PyST_GetScope().
Revert const int change back to #define, since I want to use the
names in a switch().



Index: symtable.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/symtable.h,v
retrieving revision 2.9.18.3
retrieving revision 2.9.18.4
diff -C2 -d -r2.9.18.3 -r2.9.18.4
*** symtable.h	4 Aug 2002 20:53:33 -0000	2.9.18.3
--- symtable.h	23 Aug 2002 18:09:41 -0000	2.9.18.4
***************
*** 11,15 ****
  
  struct symtable {
- 	int st_pass;             /* pass == 1 or 2 */
  	const char *st_filename; /* name of file being compiled */
  	struct _symtable_entry *st_cur; /* current symbol table entry */
--- 11,14 ----
***************
*** 18,22 ****
  	PyObject *st_global;     /* borrowed ref to MODULE in st_symbols */
  	int st_nblocks;          /* number of blocks */
- 	int st_errors;           /* number of errors */
  	char *st_private;        /* name of current class or NULL */
  	int st_tmpname;          /* temporary name counter */
--- 17,20 ----
***************
*** 48,52 ****
  extern DL_IMPORT(PySTEntryObject *) \
  	PySTEntry_New(struct symtable *, identifier, block_ty, void *, int);
! DL_IMPORT(int) PyST_GetScope(PyObject *, PyObject *);
  
  DL_IMPORT(struct symtable *) PyNode_CompileSymtable(struct _node *, char *);
--- 46,50 ----
  extern DL_IMPORT(PySTEntryObject *) \
  	PySTEntry_New(struct symtable *, identifier, block_ty, void *, int);
! DL_IMPORT(int) PyST_GetScope(PySTEntryObject *, PyObject *);
  
  DL_IMPORT(struct symtable *) PyNode_CompileSymtable(struct _node *, char *);
***************
*** 78,83 ****
  #define SCOPE_OFF 11
  #define SCOPE_MASK 7
! const int LOCAL = 1, GLOBAL_EXPLICIT = 2, GLOBAL_IMPLICIT = 3, FREE = 4,
! 	CELL = 5;
  
  #define OPT_IMPORT_STAR 1
--- 76,85 ----
  #define SCOPE_OFF 11
  #define SCOPE_MASK 7
! 
! #define LOCAL 1
! #define GLOBAL_EXPLICIT 2
! #define GLOBAL_IMPLICIT 3
! #define FREE 4
! #define CELL 5
  
  #define OPT_IMPORT_STAR 1