mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-01 04:10:18 +02:00
Code Activity

(scm_char_set_hash): bug fix: was overrunning the buffer and

Browse source 
calculating based on garbage.
	(scm_char_set_eq, scm_char_set_leq): fix argument number in error
	reporting: wasn't incremented due to macro coding.
	(scm_char_set): report argument number in error reporting: was
	hard coded to 1.  remove a couple of local variables.
This commit is contained in:
Gary Houston 2001-07-15 18:54:28 +00:00
parent 396f36cdbf
commit b87f5a8394
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
srfi/ChangeLog
View file

@ -3,6 +3,12 @@
* 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
opt arg to give default bound, as in final spec. don't allow opt arg to give default bound, as in final spec. don't allow
negative bounds. negative bounds.
(scm_char_set_hash): bug fix: was overrunning the buffer and
calculating based on garbage.
(scm_char_set_eq, scm_char_set_leq): fix argument number in error
reporting: wasn't incremented due to macro coding.
(scm_char_set): report argument number in error reporting: was
hard coded to 1. remove a couple of local variables.
2001-07-13 Marius Vollmer <mvo@zagadka.ping.de> 2001-07-13 Marius Vollmer <mvo@zagadka.ping.de>

21
srfi/srfi-14.c
View file

@ -126,7 +126,8 @@ SCM_DEFINE (scm_char_set_eq, "char-set=", 0, 0, 1,
SCM csi = SCM_CAR (char_sets); SCM csi = SCM_CAR (char_sets);
long *csi_data; long *csi_data;
SCM_VALIDATE_SMOB (argnum++, csi, charset); SCM_VALIDATE_SMOB (argnum, csi, charset);
argnum++;
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;
@ -155,7 +156,8 @@ SCM_DEFINE (scm_char_set_leq, "char-set<=", 0, 0, 1,
SCM csi = SCM_CAR (char_sets); SCM csi = SCM_CAR (char_sets);
long *csi_data; long *csi_data;
SCM_VALIDATE_SMOB (argnum++, csi, charset); SCM_VALIDATE_SMOB (argnum, csi, charset);
argnum++;
csi_data = (long *) SCM_SMOB_DATA (csi); csi_data = (long *) SCM_SMOB_DATA (csi);
if (prev_data) if (prev_data)
{ {
@ -200,7 +202,7 @@ 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 - 1; k++) for (k = 0; k < SCM_CHARSET_SIZE / sizeof (long); k++)
{ {
val = p[k] ^ val; val = p[k] ^ val;
} }
@ -458,21 +460,20 @@ SCM_DEFINE (scm_char_set, "char-set", 0, 0, 1,
"Return a character set containing all given characters.") "Return a character set containing all given characters.")
#define FUNC_NAME s_scm_char_set #define FUNC_NAME s_scm_char_set
{ {
SCM cs, ls; SCM cs;
long * p; long * p;
int argnum = 1;
SCM_VALIDATE_REST_ARGUMENT (rest); SCM_VALIDATE_REST_ARGUMENT (rest);
ls = rest;
cs = make_char_set (FUNC_NAME); cs = make_char_set (FUNC_NAME);
p = (long *) SCM_SMOB_DATA (cs); p = (long *) SCM_SMOB_DATA (cs);
while (!SCM_NULLP (ls)) while (!SCM_NULLP (rest))
{ {
SCM chr = SCM_CAR (ls);
int c; int c;
SCM_VALIDATE_CHAR_COPY (1, chr, c); SCM_VALIDATE_CHAR_COPY (argnum, SCM_CAR (rest), c);
ls = SCM_CDR (ls); argnum++;
rest = SCM_CDR (rest);
p[c / sizeof (long)] |= 1 << (c % sizeof (long)); p[c / sizeof (long)] |= 1 << (c % sizeof (long));
} }
return cs; return cs;