[Psyco-checkins] CVS: psyco/c/Python frames.c,1.1,1.2 pycompiler.c,1.36,1.37

[Armin R. <ar...@us...>]

Update of /cvsroot/psyco/psyco/c/Python
In directory sc8-pr-cvs1:/tmp/cvs-serv23752/Python

Modified Files:
	frames.c pycompiler.c 
Log Message:
working...

Index: frames.c
===================================================================
RCS file: /cvsroot/psyco/psyco/c/Python/frames.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** frames.c	17 Jan 2003 14:41:42 -0000	1.1
--- frames.c	30 Jan 2003 18:41:49 -0000	1.2
***************
*** 214,218 ****
  				false, false);
  	LOC_CONTINUATION = vinfo_new(rsrc);
- 	psyco_assert_coherent(po);
  	return (PyObject*) po;
  
--- 214,217 ----
***************
*** 235,239 ****
  	/* compile the function */
  	po = (PsycoObject*) o;
! 	mp = psyco_first_merge_point(po->pr.merge_points);
  	return (PyObject*) psyco_compile_code(po, mp);
  }
--- 234,238 ----
  	/* compile the function */
  	po = (PsycoObject*) o;
! 	mp = PsycoObject_Ready(po);
  	return (PyObject*) psyco_compile_code(po, mp);
  }
***************
*** 251,254 ****
--- 250,255 ----
  	po = (PsycoObject*) o;
  	mp = psyco_exact_merge_point(po->pr.merge_points, po->pr.next_instr);
+ 	if (mp != NULL)
+ 		psyco_delete_unused_vars(po, &mp->entries);
  	return (PyObject*) psyco_compile_code(po, mp);
  }

Index: pycompiler.c
===================================================================
RCS file: /cvsroot/psyco/psyco/c/Python/pycompiler.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** pycompiler.c	17 Jan 2003 14:41:49 -0000	1.36
--- pycompiler.c	30 Jan 2003 18:41:50 -0000	1.37
***************
*** 3124,3127 ****
--- 3124,3128 ----
  #endif
  		SAVE_NEXT_INSTR(next_instr);
+ 		psyco_delete_unused_vars(po, &mp->entries);
  		code1 = psyco_compile(po, mp, true);
  		if (code1 != NULL)