[Nice-commit] Nice/src/gnu/expr PrimProcedure.java,1.9,1.10 Compilation.java,1.25,1.26

[Daniel B. <bo...@us...>]

Update of /cvsroot/nice/Nice/src/gnu/expr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18703/src/gnu/expr

Modified Files:
	PrimProcedure.java Compilation.java 
Log Message:
Stop wrapping ClassCastException into gnu.mypping.WrongType. This is only
useful in unityped languages like Kawa. This reduces bytecode length and
removes the need for adding the WrongType class in generated jars.


Index: PrimProcedure.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/gnu/expr/PrimProcedure.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PrimProcedure.java	25 Aug 2003 18:09:10 -0000	1.9
--- PrimProcedure.java	24 Mar 2005 14:47:07 -0000	1.10
***************
*** 385,390 ****
              : argTypes[i-1];
  	Target target =
! 	  source == null ? CheckedTarget.getInstance(arg_type, name, i)
! 	  : CheckedTarget.getInstance(arg_type, source, i);
  	args[i].compileNotePosition(comp, target);
  	if (parameterCopies != null && parameterCopies[i] != null)
--- 385,389 ----
              : argTypes[i-1];
  	Target target =
!           StackTarget.getInstance(arg_type);
  	args[i].compileNotePosition(comp, target);
  	if (parameterCopies != null && parameterCopies[i] != null)

Index: Compilation.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/gnu/expr/Compilation.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Compilation.java	3 Sep 2004 18:24:33 -0000	1.25
--- Compilation.java	24 Mar 2005 14:47:07 -0000	1.26
***************
*** 1114,1119 ****
  		Type ptype = var.getType();
  		if (ptype != Type.pointer_type)
! 		  CheckedTarget.emitCheckedCoerce(this, source,
! 						  k, ptype);
  		var = var.nextDecl();
  	      }
--- 1114,1118 ----
  		Type ptype = var.getType();
  		if (ptype != Type.pointer_type)
!                   StackTarget.convert(this, Type.pointer_type, ptype);
  		var = var.nextDecl();
  	      }