[Dotgnu-pnet-commits] CVS: pnet/engine int_proto.h,1.28,1.29 int_table.c,1.30,1.31 lib_encoding.c,1.5,1.6

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/engine
In directory subversions:/tmp/cvs-serv4785/engine

Modified Files:
        int_proto.h int_table.c lib_encoding.c 
Log Message:


Integrate the culture-determination code.


Index: int_proto.h
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/int_proto.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** int_proto.h 5 Nov 2002 01:01:04 -0000       1.28
--- int_proto.h 14 Nov 2002 04:07:25 -0000      1.29
***************
*** 360,363 ****
--- 360,366 ----
  extern ILString * _IL_NumberFormatter_FormatReal(ILExecThread * _thread, 
ILDouble d, ILString * format, ILInt32 buflen);
  
+ extern ILInt32 _IL_CultureInfo_InternalCultureID(ILExecThread * _thread);
+ extern ILString * _IL_CultureInfo_InternalCultureName(ILExecThread * _thread);
+ 
  extern ILBool _IL_Debugger_InternalIsAttached(ILExecThread * _thread);
  extern void _IL_Debugger_Break(ILExecThread * _thread);

Index: int_table.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/int_table.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** int_table.c 5 Nov 2002 01:01:04 -0000       1.30
--- int_table.c 14 Nov 2002 04:07:25 -0000      1.31
***************
*** 1824,1827 ****
--- 1824,1836 ----
  #endif
  
+ #ifndef _IL_CultureInfo_suppressed
+ 
+ IL_METHOD_BEGIN(CultureInfo_Methods)
+       IL_METHOD("InternalCultureID", "()i", 
_IL_CultureInfo_InternalCultureID, marshal_ip)
+       IL_METHOD("InternalCultureName", "()oSystem.String;", 
_IL_CultureInfo_InternalCultureName, marshal_pp)
+ IL_METHOD_END
+ 
+ #endif
+ 
  #if !defined(HAVE_LIBFFI)
  
***************
*** 2378,2381 ****
--- 2387,2393 ----
  #ifndef _IL_CryptoMethods_suppressed
        {"CryptoMethods", "Platform", CryptoMethods_Methods},
+ #endif
+ #ifndef _IL_CultureInfo_suppressed
+       {"CultureInfo", "System.Globalization", CultureInfo_Methods},
  #endif
  #ifndef _IL_Debugger_suppressed

Index: lib_encoding.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/lib_encoding.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** lib_encoding.c      16 Jun 2002 11:36:01 -0000      1.5
--- lib_encoding.c      14 Nov 2002 04:07:25 -0000      1.6
***************
*** 164,167 ****
--- 164,193 ----
  }
  
+ /*
+  * private static int InternalCultureID();
+  */
+ ILInt32 _IL_CultureInfo_InternalCultureID(ILExecThread *_thread)
+ {
+       return (ILInt32)ILGetCultureID();
+ }
+ 
+ /*
+  * private static String InternalCultureName();
+  */
+ ILString *_IL_CultureInfo_InternalCultureName(ILExecThread *_thread)
+ {
+       char *name = ILGetCultureName();
+       if(!name)
+       {
+               return ILStringCreate(_thread, "iv");
+       }
+       else
+       {
+               ILString *str = ILStringCreate(_thread, name);
+               ILFree(name);
+               return str;
+       }
+ }
+ 
  #ifdef        __cplusplus
  };