mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-30 00:40:20 +02:00
Code Activity

* srfi-14.c: Allocate correct memory size for charsets (32 bytes),

Browse source 
use this value for initializing and comparing charsets.
	(scm_char_set_hash): Use ``better'' hash algorithm which produces
	more values.
This commit is contained in:
Martin Grabmüller 2001-07-16 15:47:02 +00:00
parent 63bcad1964
commit cebf3d62d9
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
srfi/ChangeLog
View file

@ -1,3 +1,10 @@
2001-07-16 Martin Grabmueller <mgrabmue@cs.tu-berlin.de>
* srfi-14.c: Allocate correct memory size for charsets (32 bytes),
use this value for initializing and comparing charsets.
(scm_char_set_hash): Use ``better'' hash algorithm which produces
more values.
2001-07-15 Gary Houston <ghouston@arglist.com> 2001-07-15 Gary Houston <ghouston@arglist.com>
* srfi-14.c (scm_char_set_hash): recognise 0 instead of #f in the * srfi-14.c (scm_char_set_hash): recognise 0 instead of #f in the

12
srfi/srfi-14.c
View file

@ -94,8 +94,8 @@ make_char_set (const char * func_name)
{ {
long * p; long * p;
p = scm_must_malloc (SCM_CHARSET_SIZE, func_name); p = scm_must_malloc (SCM_CHARSET_SIZE / sizeof (char), func_name);
memset (p, 0, SCM_CHARSET_SIZE); memset (p, 0, SCM_CHARSET_SIZE / sizeof (char));
SCM_RETURN_NEWSMOB (scm_tc16_charset, p); SCM_RETURN_NEWSMOB (scm_tc16_charset, p);
} }
@ -131,7 +131,8 @@ SCM_DEFINE (scm_char_set_eq, "char-set=", 0, 0, 1,
csi_data = (long *) SCM_SMOB_DATA (csi); csi_data = (long *) SCM_SMOB_DATA (csi);
if (cs1_data == NULL) if (cs1_data == NULL)
cs1_data = csi_data; cs1_data = csi_data;
else if (memcmp (cs1_data, csi_data, SCM_CHARSET_SIZE) != 0) else if (memcmp (cs1_data, csi_data,
SCM_CHARSET_SIZE / sizeof (char)) != 0)
return SCM_BOOL_F; return SCM_BOOL_F;
char_sets = SCM_CDR (char_sets); char_sets = SCM_CDR (char_sets);
} }
@ -204,7 +205,8 @@ SCM_DEFINE (scm_char_set_hash, "char-set-hash", 1, 1, 0,
p = (long *) SCM_SMOB_DATA (cs); p = (long *) SCM_SMOB_DATA (cs);
for (k = 0; k < SCM_CHARSET_SIZE / sizeof (long); k++) for (k = 0; k < SCM_CHARSET_SIZE / sizeof (long); k++)
{ {
val = p[k] ^ val; if (p[k] != 0)
val = p[k] + (val << 1);
} }
return SCM_MAKINUM (val % bnd); return SCM_MAKINUM (val % bnd);
} }
@ -1368,7 +1370,7 @@ scm_c_init_srfi_14 (void)
if (!initialized) if (!initialized)
{ {
scm_tc16_charset = scm_make_smob_type ("character-set", scm_tc16_charset = scm_make_smob_type ("character-set",
SCM_CHARSET_SIZE * sizeof (long)); SCM_CHARSET_SIZE / sizeof (char));
scm_set_smob_free (scm_tc16_charset, charset_free); scm_set_smob_free (scm_tc16_charset, charset_free);
scm_set_smob_print (scm_tc16_charset, charset_print); scm_set_smob_print (scm_tc16_charset, charset_print);
initialized = 1; initialized = 1;