[Python-checkins] python/dist/src/Python newcompile.c, 1.1.2.96, 1.1.2.97

[jhylton at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1605

Modified Files:
      Tag: ast-branch
	newcompile.c 
Log Message:
Re-enable asserts in assemble_lnotab() after fixing if/elif/else problem.
Fiddle assemble_display() code.


Index: newcompile.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/Attic/newcompile.c,v
retrieving revision 1.1.2.96
retrieving revision 1.1.2.97
diff -C2 -d -r1.1.2.96 -r1.1.2.97
*** newcompile.c	23 Apr 2004 14:53:24 -0000	1.1.2.96
--- newcompile.c	23 Apr 2004 15:32:26 -0000	1.1.2.97
***************
*** 2911,2920 ****
      /* Dispatch the simple case first. */
      if (!i->i_hasarg) {
! 	    fprintf(stderr, "%5d %-20.20s %d\n",
  		    a->a_offset, opnames[i->i_opcode], i->i_lineno);
  	    return;
      }
      
!     fprintf(stderr, "%5d %-20.20s %d %d",
  	    a->a_offset, opnames[i->i_opcode], i->i_oparg, i->i_lineno);
      if (i->i_jrel) 
--- 2911,2920 ----
      /* Dispatch the simple case first. */
      if (!i->i_hasarg) {
! 	    fprintf(stderr, "%5d %-20.20s     %d\n",
  		    a->a_offset, opnames[i->i_opcode], i->i_lineno);
  	    return;
      }
      
!     fprintf(stderr, "%5d %-20.20s %3d %d",
  	    a->a_offset, opnames[i->i_opcode], i->i_oparg, i->i_lineno);
      if (i->i_jrel) 
***************
*** 2978,2985 ****
  	d_lineno = i->i_lineno - a->a_lineno;
  
- 	/* setup.py's get_platform() causes these asserts to fail.
  	assert(d_bytecode >= 0);
  	assert(d_lineno >= 0);
- 	*/
  
  	if (d_lineno == 0)
--- 2978,2983 ----
***************
*** 3058,3061 ****
--- 3056,3061 ----
  	int len = PyString_GET_SIZE(a->a_bytecode);
  	char *code;
+ 
+ 	assemble_display(a, i);
  	if (!i->i_hasarg)
  		size = 1;
***************
*** 3074,3078 ****
  	}
  	code = PyString_AS_STRING(a->a_bytecode) + a->a_offset;
- 	assemble_display(a, i);
  	a->a_offset += size;
  	if (ext > 0) {
--- 3074,3077 ----