[Ikvm-commit] ikvm/reflect/Emit ILGenerator.cs,1.40,1.41

[Jeroen F. <jfr...@us...>]

Update of /cvsroot/ikvm/ikvm/reflect/Emit
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6941/Emit

Modified Files:
	ILGenerator.cs 
Log Message:
Avoid importing System.Console and System.IO.TextWriter.

Index: ILGenerator.cs
===================================================================
RCS file: /cvsroot/ikvm/ikvm/reflect/Emit/ILGenerator.cs,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** ILGenerator.cs	16 Feb 2015 12:24:28 -0000	1.40
--- ILGenerator.cs	1 Jul 2016 08:41:04 -0000	1.41
***************
*** 830,834 ****
  			Universe u = moduleBuilder.universe;
  			Emit(OpCodes.Ldstr, text);
! 			Emit(OpCodes.Call, u.Import(typeof(Console)).GetMethod("WriteLine", new Type[] { u.System_String }));
  		}
  
--- 830,834 ----
  			Universe u = moduleBuilder.universe;
  			Emit(OpCodes.Ldstr, text);
! 			Emit(OpCodes.Call, u.System_Console.GetMethod("WriteLine", new Type[] { u.System_String }));
  		}
  
***************
*** 836,840 ****
  		{
  			Universe u = moduleBuilder.universe;
! 			Emit(OpCodes.Call, u.Import(typeof(Console)).GetMethod("get_Out"));
  			if (field.IsStatic)
  			{
--- 836,840 ----
  		{
  			Universe u = moduleBuilder.universe;
! 			Emit(OpCodes.Call, u.System_Console.GetMethod("get_Out"));
  			if (field.IsStatic)
  			{
***************
*** 846,850 ****
  				Emit(OpCodes.Ldfld, field);
  			}
! 			Emit(OpCodes.Callvirt, u.Import(typeof(System.IO.TextWriter)).GetMethod("WriteLine", new Type[] { field.FieldType }));
  		}
  
--- 846,850 ----
  				Emit(OpCodes.Ldfld, field);
  			}
! 			Emit(OpCodes.Callvirt, u.System_IO_TextWriter.GetMethod("WriteLine", new Type[] { field.FieldType }));
  		}
  
***************
*** 852,858 ****
  		{
  			Universe u = moduleBuilder.universe;
! 			Emit(OpCodes.Call, u.Import(typeof(Console)).GetMethod("get_Out"));
  			Emit(OpCodes.Ldloc, local);
! 			Emit(OpCodes.Callvirt, u.Import(typeof(System.IO.TextWriter)).GetMethod("WriteLine", new Type[] { local.LocalType }));
  		}
  
--- 852,858 ----
  		{
  			Universe u = moduleBuilder.universe;
! 			Emit(OpCodes.Call, u.System_Console.GetMethod("get_Out"));
  			Emit(OpCodes.Ldloc, local);
! 			Emit(OpCodes.Callvirt, u.System_IO_TextWriter.GetMethod("WriteLine", new Type[] { local.LocalType }));
  		}