[Python-checkins] python/dist/src/Python bltinmodule.c,2.261,2.261.2.1 ceval.c,2.314,2.314.2.1 compile.c,2.247.2.1,2.247.2.2 future.c,2.12.2.1,2.12.2.2 import.c,2.208,2.208.2.1 marshal.c,1.72,1.72.2.1 pythonrun.c,2.161.2.2,2.161.2.3 symtable.c,2.10.8.2,2.10.8.3 sysmodule.c,2.107,2.107.2.1 traceback.c,2.38,2.38.2.1

jhylton@users.sourceforge.net jhylton@users.sourceforge.net
Tue, 09 Jul 2002 06:22:04 -0700


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

Modified Files:
      Tag: ast-branch
	bltinmodule.c ceval.c compile.c future.c import.c marshal.c 
	pythonrun.c symtable.c sysmodule.c traceback.c 
Log Message:
Move PyCodeObject from compile.c to Objects/codeobject.c.



Index: bltinmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/bltinmodule.c,v
retrieving revision 2.261
retrieving revision 2.261.2.1
diff -C2 -d -r2.261 -r2.261.2.1
*** bltinmodule.c	30 Jun 2002 15:26:10 -0000	2.261
--- bltinmodule.c	9 Jul 2002 13:22:01 -0000	2.261.2.1
***************
*** 1,3 ****
- 
  /* Built-in functions */
  
--- 1,2 ----
***************
*** 5,8 ****
--- 4,8 ----
  
  #include "node.h"
+ #include "code.h"
  #include "compile.h"
  #include "eval.h"

Index: ceval.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/ceval.c,v
retrieving revision 2.314
retrieving revision 2.314.2.1
diff -C2 -d -r2.314 -r2.314.2.1
*** ceval.c	14 Jun 2002 13:53:29 -0000	2.314
--- ceval.c	9 Jul 2002 13:22:01 -0000	2.314.2.1
***************
*** 9,13 ****
  #include "Python.h"
  
! #include "compile.h"
  #include "frameobject.h"
  #include "eval.h"
--- 9,13 ----
  #include "Python.h"
  
! #include "code.h"
  #include "frameobject.h"
  #include "eval.h"

Index: compile.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/compile.c,v
retrieving revision 2.247.2.1
retrieving revision 2.247.2.2
diff -C2 -d -r2.247.2.1 -r2.247.2.2
*** compile.c	7 Jul 2002 17:47:42 -0000	2.247.2.1
--- compile.c	9 Jul 2002 13:22:01 -0000	2.247.2.2
***************
*** 16,19 ****
--- 16,20 ----
  #include "token.h"
  #include "graminit.h"
+ #include "code.h"
  #include "compile.h"
  #include "symtable.h"
***************
*** 4094,4104 ****
  	}
  	return tuple;
- }
- 
- PyCodeObject *
- PyAST_Compile(mod_ty mod, char *filename, PyCompilerFlags *flags)
- {
- 	/* XXX */
- 	return NULL;
  }
  
--- 4095,4098 ----

Index: future.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/future.c,v
retrieving revision 2.12.2.1
retrieving revision 2.12.2.2
diff -C2 -d -r2.12.2.1 -r2.12.2.2
*** future.c	7 Jul 2002 17:47:42 -0000	2.12.2.1
--- future.c	9 Jul 2002 13:22:01 -0000	2.12.2.2
***************
*** 4,7 ****
--- 4,8 ----
  #include "token.h"
  #include "graminit.h"
+ #include "code.h"
  #include "compile.h"
  #include "symtable.h"

Index: import.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/import.c,v
retrieving revision 2.208
retrieving revision 2.208.2.1
diff -C2 -d -r2.208 -r2.208.2.1
*** import.c	30 Jun 2002 15:26:10 -0000	2.208
--- import.c	9 Jul 2002 13:22:01 -0000	2.208.2.1
***************
*** 8,11 ****
--- 8,12 ----
  #include "errcode.h"
  #include "marshal.h"
+ #include "code.h"
  #include "compile.h"
  #include "eval.h"

Index: marshal.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/marshal.c,v
retrieving revision 1.72
retrieving revision 1.72.2.1
diff -C2 -d -r1.72 -r1.72.2.1
*** marshal.c	14 Jun 2002 01:07:39 -0000	1.72
--- marshal.c	9 Jul 2002 13:22:01 -0000	1.72.2.1
***************
*** 7,10 ****
--- 7,11 ----
  #include "Python.h"
  #include "longintrepr.h"
+ #include "code.h"
  #include "compile.h"
  #include "marshal.h"

Index: pythonrun.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/pythonrun.c,v
retrieving revision 2.161.2.2
retrieving revision 2.161.2.3
diff -C2 -d -r2.161.2.2 -r2.161.2.3
*** pythonrun.c	7 Jul 2002 18:18:18 -0000	2.161.2.2
--- pythonrun.c	9 Jul 2002 13:22:01 -0000	2.161.2.3
***************
*** 10,13 ****
--- 10,14 ----
  #include "parsetok.h"
  #include "errcode.h"
+ #include "code.h"
  #include "compile.h"
  #include "symtable.h"

Index: symtable.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/symtable.c,v
retrieving revision 2.10.8.2
retrieving revision 2.10.8.3
diff -C2 -d -r2.10.8.2 -r2.10.8.3
*** symtable.c	7 Jul 2002 20:50:10 -0000	2.10.8.2
--- symtable.c	9 Jul 2002 13:22:01 -0000	2.10.8.3
***************
*** 1,4 ****
--- 1,5 ----
  #include "Python.h"
  #include "Python-ast.h"
+ #include "code.h"
  #include "compile.h"
  #include "symtable.h"
***************
*** 15,18 ****
--- 16,20 ----
  	if (k == NULL)
  		goto fail;
+ 	/* XXX do we need the lookup code anymore? */
  	v = PyDict_GetItem(st->st_symbols, k);
  	if (v) {
***************
*** 390,394 ****
  		if (s->v.Print.dest)
  			VISIT(st, expr, s->v.Print.dest);
! 		VISIT_SEQ(st, expr, s->v.Print.value);
  		break;
          case For_kind:
--- 392,396 ----
  		if (s->v.Print.dest)
  			VISIT(st, expr, s->v.Print.dest);
! 		VISIT_SEQ(st, expr, s->v.Print.values);
  		break;
          case For_kind:
***************
*** 466,473 ****
  		/* nothing to do here */
  		break;
- 	default:
- 		PyErr_Format(PyExc_AssertionError,
- 			     "invalid statement kind: %d\n", s->kind);
- 		return 0;
  	}
  	return 1;
--- 468,471 ----
***************
*** 544,551 ****
  		VISIT_SEQ(st, expr, e->v.Tuple.elts);
  		break;
- 	default:
- 		PyErr_Format(PyExc_AssertionError,
- 			     "invalid expression kind: %d\n", e->kind);
- 		return 0;
  	}
  	return 1;
--- 542,545 ----

Index: sysmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/sysmodule.c,v
retrieving revision 2.107
retrieving revision 2.107.2.1
diff -C2 -d -r2.107 -r2.107.2.1
*** sysmodule.c	30 Jun 2002 15:26:10 -0000	2.107
--- sysmodule.c	9 Jul 2002 13:22:01 -0000	2.107.2.1
***************
*** 16,20 ****
  
  #include "Python.h"
! #include "compile.h"
  #include "frameobject.h"
  
--- 16,20 ----
  
  #include "Python.h"
! #include "code.h"
  #include "frameobject.h"
  

Index: traceback.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/traceback.c,v
retrieving revision 2.38
retrieving revision 2.38.2.1
diff -C2 -d -r2.38 -r2.38.2.1
*** traceback.c	14 Apr 2002 20:12:41 -0000	2.38
--- traceback.c	9 Jul 2002 13:22:01 -0000	2.38.2.1
***************
*** 4,8 ****
  #include "Python.h"
  
! #include "compile.h"
  #include "frameobject.h"
  #include "structmember.h"
--- 4,8 ----
  #include "Python.h"
  
! #include "code.h"
  #include "frameobject.h"
  #include "structmember.h"