From 0663588ee1f03c92ad6d4d0956a293d43e6f266d Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Wed, 7 Jan 2009 17:49:14 +0000 Subject: [PATCH] change _string/utf-16 and _string/ucs-4 so that #f = NULL (for consistency with other pointer types), and drop the /null variants svn: r13031 --- collects/mzlib/foreign.ss | 5 +- collects/scribblings/foreign/types.scrbl | 14 ++- src/foreign/foreign.c | 106 +++-------------------- src/foreign/foreign.ssc | 14 --- 4 files changed, 20 insertions(+), 119 deletions(-) diff --git a/collects/mzlib/foreign.ss b/collects/mzlib/foreign.ss index 87c1b45b57..34065bdbc0 100644 --- a/collects/mzlib/foreign.ss +++ b/collects/mzlib/foreign.ss @@ -695,9 +695,8 @@ ;; String types ;; The internal _string type uses the native ucs-4 encoding, also providing a -;; utf-16 type (note: the non-/null variants do not use #f as NULL). -(provide _string/ucs-4 _string/utf-16 - _string/ucs-4/null _string/utf-16/null) +;; utf-16 type +(provide _string/ucs-4 _string/utf-16) ;; 8-bit string encodings, #f is NULL (define ((false-or-op op) x) (and x (op x))) diff --git a/collects/scribblings/foreign/types.scrbl b/collects/scribblings/foreign/types.scrbl index b0bac7395d..ef209def38 100644 --- a/collects/scribblings/foreign/types.scrbl +++ b/collects/scribblings/foreign/types.scrbl @@ -165,27 +165,25 @@ pointer. @deftogether[( @defthing[_string/ucs-4 ctype?] -@defthing[_string/ucs-4/null ctype?] )]{ A type for Scheme's native Unicode strings, which are in UCS-4 format. -These correspond to the C @cpp{mzchar*} type used by PLT Scheme. The -@schemeidfont{/null} variant treats @scheme[#f] as @cpp{NULL} and -vice-versa.} +These correspond to the C @cpp{mzchar*} type used by PLT Scheme. As usual, the types +treat @scheme[#f] as @cpp{NULL} and vice-versa.} @deftogether[( @defthing[_string/utf-16 ctype?] -@defthing[_string/utf-16/null ctype?] )]{ -Unicode strings in UTF-16 format. The @schemeidfont{/null} variant -treats @scheme[#f] as @cpp{NULL} and vice-versa.} +Unicode strings in UTF-16 format. As usual, the types treat +@scheme[#f] as @cpp{NULL} and vice-versa.} @defthing[_path ctype?]{ -Simple @cpp{char*} strings, corresponding to Scheme's paths.} +Simple @cpp{char*} strings, corresponding to Scheme's paths. As usual, +the types treat @scheme[#f] as @cpp{NULL} and vice-versa.} @defthing[_symbol ctype?]{ diff --git a/src/foreign/foreign.c b/src/foreign/foreign.c index 7e312b9b3f..89dd22d2b3 100644 --- a/src/foreign/foreign.c +++ b/src/foreign/foreign.c @@ -703,16 +703,6 @@ Scheme_Object *utf16_pointer_to_ucs4_string(unsigned short *utf) #define FOREIGN_string_ucs_4 (18) /* Type Name: string/ucs-4 (string_ucs_4) - * LibFfi type: ffi_type_pointer - * C type: mzchar* - * Predicate: SCHEME_CHAR_STRINGP() - * Scheme->C: SCHEME_CHAR_STR_VAL() - * S->C offset: 0 - * C->Scheme: scheme_make_char_string_without_copying() - */ - -#define FOREIGN_string_ucs_4_null (19) -/* Type Name: string/ucs-4/null (string_ucs_4_null) * LibFfi type: ffi_type_pointer * C type: mzchar* * Predicate: SCHEME_FALSEP_OR_CHAR_STRINGP() @@ -721,18 +711,8 @@ Scheme_Object *utf16_pointer_to_ucs4_string(unsigned short *utf) * C->Scheme: scheme_make_char_string_without_copying() */ -#define FOREIGN_string_utf_16 (20) +#define FOREIGN_string_utf_16 (19) /* Type Name: string/utf-16 (string_utf_16) - * LibFfi type: ffi_type_pointer - * C type: unsigned short* - * Predicate: SCHEME_CHAR_STRINGP() - * Scheme->C: ucs4_string_to_utf16_pointer() - * S->C offset: 0 - * C->Scheme: utf16_pointer_to_ucs4_string() - */ - -#define FOREIGN_string_utf_16_null (21) -/* Type Name: string/utf-16/null (string_utf_16_null) * LibFfi type: ffi_type_pointer * C type: unsigned short* * Predicate: SCHEME_FALSEP_OR_CHAR_STRINGP() @@ -744,7 +724,7 @@ Scheme_Object *utf16_pointer_to_ucs4_string(unsigned short *utf) /* Byte strings -- not copying C strings, #f is NULL. * (note: these are not like char* which is just a pointer) */ -#define FOREIGN_bytes (22) +#define FOREIGN_bytes (20) /* Type Name: bytes * LibFfi type: ffi_type_pointer * C type: char* @@ -754,7 +734,7 @@ Scheme_Object *utf16_pointer_to_ucs4_string(unsigned short *utf) * C->Scheme: (==NULL)?scheme_false:scheme_make_byte_string_without_copying() */ -#define FOREIGN_path (23) +#define FOREIGN_path (21) /* Type Name: path * LibFfi type: ffi_type_pointer * C type: char* @@ -764,7 +744,7 @@ Scheme_Object *utf16_pointer_to_ucs4_string(unsigned short *utf) * C->Scheme: (==NULL)?scheme_false:scheme_make_path_without_copying() */ -#define FOREIGN_symbol (24) +#define FOREIGN_symbol (22) /* Type Name: symbol * LibFfi type: ffi_type_pointer * C type: char* @@ -777,7 +757,7 @@ Scheme_Object *utf16_pointer_to_ucs4_string(unsigned short *utf) /* This is for any C pointer: #f is NULL, cpointer values as well as * ffi-obj and string values pass their pointer. When used as a return * value, either a cpointer object or #f is returned. */ -#define FOREIGN_pointer (25) +#define FOREIGN_pointer (23) /* Type Name: pointer * LibFfi type: ffi_type_pointer * C type: void* @@ -789,7 +769,7 @@ Scheme_Object *utf16_pointer_to_ucs4_string(unsigned short *utf) /* This is used for passing and Scheme_Object* value as is. Useful for * functions that know about Scheme_Object*s, like MzScheme's. */ -#define FOREIGN_scheme (26) +#define FOREIGN_scheme (24) /* Type Name: scheme * LibFfi type: ffi_type_pointer * C type: Scheme_Object* @@ -802,7 +782,7 @@ Scheme_Object *utf16_pointer_to_ucs4_string(unsigned short *utf) /* Special type, not actually used for anything except to mark values * that are treated like pointers but not referenced. Used for * creating function types. */ -#define FOREIGN_fpointer (27) +#define FOREIGN_fpointer (25) /* Type Name: fpointer * LibFfi type: ffi_type_pointer * C type: void* @@ -830,9 +810,7 @@ typedef union _ForeignAny { double x_doubleS; int x_bool; mzchar* x_string_ucs_4; - mzchar* x_string_ucs_4_null; unsigned short* x_string_utf_16; - unsigned short* x_string_utf_16_null; char* x_bytes; char* x_path; char* x_symbol; @@ -842,7 +820,7 @@ typedef union _ForeignAny { } ForeignAny; /* This is a tag that is used to identify user-made struct types. */ -#define FOREIGN_struct (28) +#define FOREIGN_struct (26) /*****************************************************************************/ /* Type objects */ @@ -963,9 +941,7 @@ static int ctype_sizeof(Scheme_Object *type) case FOREIGN_doubleS: return sizeof(double); case FOREIGN_bool: return sizeof(int); case FOREIGN_string_ucs_4: return sizeof(mzchar*); - case FOREIGN_string_ucs_4_null: return sizeof(mzchar*); case FOREIGN_string_utf_16: return sizeof(unsigned short*); - case FOREIGN_string_utf_16_null: return sizeof(unsigned short*); case FOREIGN_bytes: return sizeof(char*); case FOREIGN_path: return sizeof(char*); case FOREIGN_symbol: return sizeof(char*); @@ -1242,9 +1218,7 @@ static Scheme_Object *C2SCHEME(Scheme_Object *type, void *src, case FOREIGN_doubleS: return scheme_make_double(REF_CTYPE(double)); case FOREIGN_bool: return (REF_CTYPE(int)?scheme_true:scheme_false); case FOREIGN_string_ucs_4: return scheme_make_char_string_without_copying(REF_CTYPE(mzchar*)); - case FOREIGN_string_ucs_4_null: return scheme_make_char_string_without_copying(REF_CTYPE(mzchar*)); case FOREIGN_string_utf_16: return utf16_pointer_to_ucs4_string(REF_CTYPE(unsigned short*)); - case FOREIGN_string_utf_16_null: return utf16_pointer_to_ucs4_string(REF_CTYPE(unsigned short*)); case FOREIGN_bytes: return (REF_CTYPE(char*)==NULL)?scheme_false:scheme_make_byte_string_without_copying(REF_CTYPE(char*)); case FOREIGN_path: return (REF_CTYPE(char*)==NULL)?scheme_false:scheme_make_path_without_copying(REF_CTYPE(char*)); case FOREIGN_symbol: return scheme_intern_symbol(REF_CTYPE(char*)); @@ -1496,9 +1470,9 @@ static void* SCHEME2C(Scheme_Object *type, void *dst, long delta, delta += (sizeof(int)-sizeof(mzchar*)); } #endif - if (SCHEME_CHAR_STRINGP(val)) { + if (SCHEME_FALSEP_OR_CHAR_STRINGP(val)) { mzchar* tmp; - tmp = (mzchar*)(SCHEME_CHAR_STR_VAL(val)); + tmp = (mzchar*)(ucs4_string_or_null_to_ucs4_pointer(val)); if (basetype_p == NULL ||tmp == NULL) { (((mzchar**)W_OFFSET(dst,delta))[0]) = tmp; return NULL; @@ -1510,54 +1484,12 @@ static void* SCHEME2C(Scheme_Object *type, void *dst, long delta, scheme_wrong_type("Scheme->C","string/ucs-4",0,1,&(val)); return NULL; /* hush the compiler */ } - case FOREIGN_string_ucs_4_null: -#ifdef SCHEME_BIG_ENDIAN - if (sizeof(mzchar*)C","string/ucs-4/null",0,1,&(val)); - return NULL; /* hush the compiler */ - } case FOREIGN_string_utf_16: #ifdef SCHEME_BIG_ENDIAN if (sizeof(unsigned short*)C","string/utf-16",0,1,&(val)); - return NULL; /* hush the compiler */ - } - case FOREIGN_string_utf_16_null: -#ifdef SCHEME_BIG_ENDIAN - if (sizeof(unsigned short*)C","string/utf-16/null",0,1,&(val)); + scheme_wrong_type("Scheme->C","string/utf-16",0,1,&(val)); return NULL; /* hush the compiler */ } case FOREIGN_bytes: @@ -2986,13 +2918,6 @@ void scheme_init_foreign(Scheme_Env *env) t->scheme_to_c = ((Scheme_Object*)(void*)(&ffi_type_pointer)); t->c_to_scheme = ((Scheme_Object*)FOREIGN_string_ucs_4); scheme_add_global("_string/ucs-4", (Scheme_Object*)t, menv); - s = scheme_intern_symbol("string/ucs-4/null"); - t = (ctype_struct*)scheme_malloc_tagged(sizeof(ctype_struct)); - t->so.type = ctype_tag; - t->basetype = (s); - t->scheme_to_c = ((Scheme_Object*)(void*)(&ffi_type_pointer)); - t->c_to_scheme = ((Scheme_Object*)FOREIGN_string_ucs_4_null); - scheme_add_global("_string/ucs-4/null", (Scheme_Object*)t, menv); s = scheme_intern_symbol("string/utf-16"); t = (ctype_struct*)scheme_malloc_tagged(sizeof(ctype_struct)); t->so.type = ctype_tag; @@ -3000,13 +2925,6 @@ void scheme_init_foreign(Scheme_Env *env) t->scheme_to_c = ((Scheme_Object*)(void*)(&ffi_type_pointer)); t->c_to_scheme = ((Scheme_Object*)FOREIGN_string_utf_16); scheme_add_global("_string/utf-16", (Scheme_Object*)t, menv); - s = scheme_intern_symbol("string/utf-16/null"); - t = (ctype_struct*)scheme_malloc_tagged(sizeof(ctype_struct)); - t->so.type = ctype_tag; - t->basetype = (s); - t->scheme_to_c = ((Scheme_Object*)(void*)(&ffi_type_pointer)); - t->c_to_scheme = ((Scheme_Object*)FOREIGN_string_utf_16_null); - scheme_add_global("_string/utf-16/null", (Scheme_Object*)t, menv); s = scheme_intern_symbol("bytes"); t = (ctype_struct*)scheme_malloc_tagged(sizeof(ctype_struct)); t->so.type = ctype_tag; diff --git a/src/foreign/foreign.ssc b/src/foreign/foreign.ssc index 37bc900f46..4a19b20652 100755 --- a/src/foreign/foreign.ssc +++ b/src/foreign/foreign.ssc @@ -653,13 +653,6 @@ Scheme_Object *utf16_pointer_to_ucs4_string(unsigned short *utf) ) (defctype 'string/ucs-4 - 'ftype "pointer" - 'ctype "mzchar*" - 'pred "SCHEME_CHAR_STRINGP" - 's->c "SCHEME_CHAR_STR_VAL" - 'c->s "scheme_make_char_string_without_copying") - -(defctype 'string/ucs-4/null 'ftype "pointer" 'ctype "mzchar*" 'pred "SCHEME_FALSEP_OR_CHAR_STRINGP" @@ -667,13 +660,6 @@ Scheme_Object *utf16_pointer_to_ucs4_string(unsigned short *utf) 'c->s "scheme_make_char_string_without_copying") (defctype 'string/utf-16 - 'ftype "pointer" - 'ctype "unsigned short*" - 'pred "SCHEME_CHAR_STRINGP" - 's->c "ucs4_string_to_utf16_pointer" - 'c->s "utf16_pointer_to_ucs4_string") - -(defctype 'string/utf-16/null 'ftype "pointer" 'ctype "unsigned short*" 'pred "SCHEME_FALSEP_OR_CHAR_STRINGP"