diff options
-rw-r--r-- | libguile/chars.c | 58 | ||||
-rw-r--r-- | libguile/ports.c | 2 | ||||
-rw-r--r-- | libguile/print.c | 2 | ||||
-rw-r--r-- | libguile/read.c | 2 | ||||
-rw-r--r-- | libguile/scm_validate.h | 6 | ||||
-rw-r--r-- | libguile/strings.c | 4 | ||||
-rw-r--r-- | libguile/strop.c | 4 |
7 files changed, 39 insertions, 39 deletions
diff --git a/libguile/chars.c b/libguile/chars.c index 0c04e1d34..b603510c2 100644 --- a/libguile/chars.c +++ b/libguile/chars.c @@ -66,8 +66,8 @@ SCM_DEFINE1 (scm_char_eq_p, "char=?", scm_tc7_rpsubr, "Return #t iff X is the same character as Y, else #f.") #define FUNC_NAME s_scm_char_eq_p { - SCM_VALIDATE_CHAR (1,x); - SCM_VALIDATE_CHAR (2,y); + SCM_VALIDATE_ICHR (1,x); + SCM_VALIDATE_ICHR (2,y); return SCM_BOOL(SCM_ICHR(x) == SCM_ICHR(y)); } #undef FUNC_NAME @@ -78,8 +78,8 @@ SCM_DEFINE1 (scm_char_less_p, "char<?", scm_tc7_rpsubr, "Return #t iff X is less than Y in the Ascii sequence, else #f.") #define FUNC_NAME s_scm_char_less_p { - SCM_VALIDATE_CHAR (1,x); - SCM_VALIDATE_CHAR (2,y); + SCM_VALIDATE_ICHR (1,x); + SCM_VALIDATE_ICHR (2,y); return SCM_BOOL(SCM_ICHR(x) < SCM_ICHR(y)); } #undef FUNC_NAME @@ -89,8 +89,8 @@ SCM_DEFINE1 (scm_char_leq_p, "char<=?", scm_tc7_rpsubr, "Return #t iff X is less than or equal to Y in the Ascii sequence, else #f.") #define FUNC_NAME s_scm_char_leq_p { - SCM_VALIDATE_CHAR (1,x); - SCM_VALIDATE_CHAR (2,y); + SCM_VALIDATE_ICHR (1,x); + SCM_VALIDATE_ICHR (2,y); return SCM_BOOL(SCM_ICHR(x) <= SCM_ICHR(y)); } #undef FUNC_NAME @@ -100,8 +100,8 @@ SCM_DEFINE1 (scm_char_gr_p, "char>?", scm_tc7_rpsubr, "Return #t iff X is greater than Y in the Ascii sequence, else #f.") #define FUNC_NAME s_scm_char_gr_p { - SCM_VALIDATE_CHAR (1,x); - SCM_VALIDATE_CHAR (2,y); + SCM_VALIDATE_ICHR (1,x); + SCM_VALIDATE_ICHR (2,y); return SCM_BOOL(SCM_ICHR(x) > SCM_ICHR(y)); } #undef FUNC_NAME @@ -111,8 +111,8 @@ SCM_DEFINE1 (scm_char_geq_p, "char>=?", scm_tc7_rpsubr, "Return #t iff X is greater than or equal to Y in the Ascii sequence, else #f.") #define FUNC_NAME s_scm_char_geq_p { - SCM_VALIDATE_CHAR (1,x); - SCM_VALIDATE_CHAR (2,y); + SCM_VALIDATE_ICHR (1,x); + SCM_VALIDATE_ICHR (2,y); return SCM_BOOL(SCM_ICHR(x) >= SCM_ICHR(y)); } #undef FUNC_NAME @@ -122,8 +122,8 @@ SCM_DEFINE1 (scm_char_ci_eq_p, "char-ci=?", scm_tc7_rpsubr, "Return #t iff X is the same character as Y ignoring case, else #f.") #define FUNC_NAME s_scm_char_ci_eq_p { - SCM_VALIDATE_CHAR (1,x); - SCM_VALIDATE_CHAR (2,y); + SCM_VALIDATE_ICHR (1,x); + SCM_VALIDATE_ICHR (2,y); return SCM_BOOL(scm_upcase(SCM_ICHR(x))==scm_upcase(SCM_ICHR(y))); } #undef FUNC_NAME @@ -133,8 +133,8 @@ SCM_DEFINE1 (scm_char_ci_less_p, "char-ci<?", scm_tc7_rpsubr, "Return #t iff X is less than Y in the Ascii sequence ignoring case, else #f.") #define FUNC_NAME s_scm_char_ci_less_p { - SCM_VALIDATE_CHAR (1,x); - SCM_VALIDATE_CHAR (2,y); + SCM_VALIDATE_ICHR (1,x); + SCM_VALIDATE_ICHR (2,y); return SCM_BOOL((scm_upcase(SCM_ICHR(x))) < scm_upcase(SCM_ICHR(y))); } #undef FUNC_NAME @@ -144,8 +144,8 @@ SCM_DEFINE1 (scm_char_ci_leq_p, "char-ci<=?", scm_tc7_rpsubr, "Return #t iff X is less than or equal to Y in the Ascii sequence ignoring case, else #f.") #define FUNC_NAME s_scm_char_ci_leq_p { - SCM_VALIDATE_CHAR (1,x); - SCM_VALIDATE_CHAR (2,y); + SCM_VALIDATE_ICHR (1,x); + SCM_VALIDATE_ICHR (2,y); return SCM_BOOL(scm_upcase(SCM_ICHR(x)) <= scm_upcase(SCM_ICHR(y))); } #undef FUNC_NAME @@ -155,8 +155,8 @@ SCM_DEFINE1 (scm_char_ci_gr_p, "char-ci>?", scm_tc7_rpsubr, "Return #t iff X is greater than Y in the Ascii sequence ignoring case, else #f.") #define FUNC_NAME s_scm_char_ci_gr_p { - SCM_VALIDATE_CHAR (1,x); - SCM_VALIDATE_CHAR (2,y); + SCM_VALIDATE_ICHR (1,x); + SCM_VALIDATE_ICHR (2,y); return SCM_BOOL(scm_upcase(SCM_ICHR(x)) > scm_upcase(SCM_ICHR(y))); } #undef FUNC_NAME @@ -166,8 +166,8 @@ SCM_DEFINE1 (scm_char_ci_geq_p, "char-ci>=?", scm_tc7_rpsubr, "Return #t iff X is greater than or equal to Y in the Ascii sequence ignoring case, else #f.") #define FUNC_NAME s_scm_char_ci_geq_p { - SCM_VALIDATE_CHAR (1,x); - SCM_VALIDATE_CHAR (2,y); + SCM_VALIDATE_ICHR (1,x); + SCM_VALIDATE_ICHR (2,y); return SCM_BOOL(scm_upcase(SCM_ICHR(x)) >= scm_upcase(SCM_ICHR(y))); } #undef FUNC_NAME @@ -179,7 +179,7 @@ SCM_DEFINE (scm_char_alphabetic_p, "char-alphabetic?", 1, 0, 0, Alphabetic means the same thing as the isalpha C library function.") #define FUNC_NAME s_scm_char_alphabetic_p { - SCM_VALIDATE_CHAR (1,chr); + SCM_VALIDATE_ICHR (1,chr); return SCM_BOOL(isascii(SCM_ICHR(chr)) && isalpha(SCM_ICHR(chr))); } #undef FUNC_NAME @@ -190,7 +190,7 @@ SCM_DEFINE (scm_char_numeric_p, "char-numeric?", 1, 0, 0, Numeric means the same thing as the isdigit C library function.") #define FUNC_NAME s_scm_char_numeric_p { - SCM_VALIDATE_CHAR (1,chr); + SCM_VALIDATE_ICHR (1,chr); return SCM_BOOL(isascii(SCM_ICHR(chr)) && isdigit(SCM_ICHR(chr))); } #undef FUNC_NAME @@ -201,7 +201,7 @@ SCM_DEFINE (scm_char_whitespace_p, "char-whitespace?", 1, 0, 0, Whitespace means the same thing as the isspace C library function.") #define FUNC_NAME s_scm_char_whitespace_p { - SCM_VALIDATE_CHAR (1,chr); + SCM_VALIDATE_ICHR (1,chr); return SCM_BOOL(isascii(SCM_ICHR(chr)) && isspace(SCM_ICHR(chr))); } #undef FUNC_NAME @@ -214,7 +214,7 @@ SCM_DEFINE (scm_char_upper_case_p, "char-upper-case?", 1, 0, 0, Uppercase means the same thing as the isupper C library function.") #define FUNC_NAME s_scm_char_upper_case_p { - SCM_VALIDATE_CHAR (1,chr); + SCM_VALIDATE_ICHR (1,chr); return SCM_BOOL(isascii(SCM_ICHR(chr)) && isupper(SCM_ICHR(chr))); } #undef FUNC_NAME @@ -226,7 +226,7 @@ SCM_DEFINE (scm_char_lower_case_p, "char-lower-case?", 1, 0, 0, Lowercase means the same thing as the islower C library function.") #define FUNC_NAME s_scm_char_lower_case_p { - SCM_VALIDATE_CHAR (1,chr); + SCM_VALIDATE_ICHR (1,chr); return SCM_BOOL(isascii(SCM_ICHR(chr)) && islower(SCM_ICHR(chr))); } #undef FUNC_NAME @@ -240,7 +240,7 @@ Uppercase and lowercase are as defined by the isupper and islower C library functions.") #define FUNC_NAME s_scm_char_is_both_p { - SCM_VALIDATE_CHAR (1,chr); + SCM_VALIDATE_ICHR (1,chr); return SCM_BOOL(isascii(SCM_ICHR(chr)) && (isupper(SCM_ICHR(chr)) || islower(SCM_ICHR(chr)))); } #undef FUNC_NAME @@ -253,7 +253,7 @@ SCM_DEFINE (scm_char_to_integer, "char->integer", 1, 0, 0, "Return the number corresponding to ordinal position of CHR in the Ascii sequence.") #define FUNC_NAME s_scm_char_to_integer { - SCM_VALIDATE_CHAR (1,chr); + SCM_VALIDATE_ICHR (1,chr); return scm_ulong2num((unsigned long)SCM_ICHR(chr)); } #undef FUNC_NAME @@ -276,7 +276,7 @@ SCM_DEFINE (scm_char_upcase, "char-upcase", 1, 0, 0, "Return the uppercase character version of CHR.") #define FUNC_NAME s_scm_char_upcase { - SCM_VALIDATE_CHAR (1,chr); + SCM_VALIDATE_ICHR (1,chr); return SCM_MAKICHR(scm_upcase(SCM_ICHR(chr))); } #undef FUNC_NAME @@ -287,7 +287,7 @@ SCM_DEFINE (scm_char_downcase, "char-downcase", 1, 0, 0, "Return the lowercase character version of CHR.") #define FUNC_NAME s_scm_char_downcase { - SCM_VALIDATE_CHAR (1,chr); + SCM_VALIDATE_ICHR (1,chr); return SCM_MAKICHR(scm_downcase(SCM_ICHR(chr))); } #undef FUNC_NAME diff --git a/libguile/ports.c b/libguile/ports.c index 487f571dd..9dd44d3e2 100644 --- a/libguile/ports.c +++ b/libguile/ports.c @@ -973,7 +973,7 @@ not supplied, the current input port is used.") { int c; - SCM_VALIDATE_CHAR (1,cobj); + SCM_VALIDATE_ICHR (1,cobj); if (SCM_UNBNDP (port)) port = scm_cur_inp; else diff --git a/libguile/print.c b/libguile/print.c index 8e708b612..4c3e87418 100644 --- a/libguile/print.c +++ b/libguile/print.c @@ -1021,7 +1021,7 @@ SCM_DEFINE (scm_write_char, "write-char", 1, 1, 0, if (SCM_UNBNDP (port)) port = scm_cur_outp; - SCM_VALIDATE_CHAR (1,chr); + SCM_VALIDATE_ICHR (1,chr); SCM_VALIDATE_OPORT_VALUE (2,port); scm_putc ((int) SCM_ICHR (chr), SCM_COERCE_OUTPORT (port)); diff --git a/libguile/read.c b/libguile/read.c index 5ebb1b366..c47e86f68 100644 --- a/libguile/read.c +++ b/libguile/read.c @@ -709,7 +709,7 @@ SCM_DEFINE (scm_read_hash_extend, "read-hash-extend", 2, 0, 0, SCM this; SCM prev; - SCM_VALIDATE_CHAR (1,chr); + SCM_VALIDATE_ICHR (1,chr); SCM_ASSERT (SCM_FALSEP (proc) || SCM_NIMP(proc), proc, SCM_ARG2, FUNC_NAME); diff --git a/libguile/scm_validate.h b/libguile/scm_validate.h index 99fc5a01c..5a883cc7c 100644 --- a/libguile/scm_validate.h +++ b/libguile/scm_validate.h @@ -1,4 +1,4 @@ -/* $Id: scm_validate.h,v 1.15 2000-01-09 13:41:53 ghouston Exp $ */ +/* $Id: scm_validate.h,v 1.16 2000-01-11 19:19:59 gjb Exp $ */ /* Copyright (C) 1999 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify @@ -95,9 +95,9 @@ do { SCM_ASSERT(SCM_BOOLP(flag), flag, pos, FUNC_NAME); \ cvar = (SCM_BOOL_T == flag)? 1: 0; } while (0) -#define SCM_VALIDATE_CHAR(pos,scm) SCM_MAKE_VALIDATE(pos,scm,ICHRP) +#define SCM_VALIDATE_ICHR(pos,scm) SCM_MAKE_VALIDATE(pos,scm,ICHRP) -#define SCM_VALIDATE_CHAR_COPY(pos,scm,cvar) \ +#define SCM_VALIDATE_ICHR_COPY(pos,scm,cvar) \ do { SCM_ASSERT(SCM_ICHRP(scm), scm, pos, FUNC_NAME); \ cvar = SCM_ICHR(scm); } while (0) diff --git a/libguile/strings.c b/libguile/strings.c index 27f56ba11..3e3312d55 100644 --- a/libguile/strings.c +++ b/libguile/strings.c @@ -258,7 +258,7 @@ SCM_DEFINE (scm_make_string, "make-string", 1, 1, 0, res = scm_makstr (i, 0); if (!SCM_UNBNDP (chr)) { - SCM_VALIDATE_CHAR (2,chr); + SCM_VALIDATE_ICHR (2,chr); { unsigned char *dst = SCM_UCHARS (res); char c = SCM_ICHR (chr); @@ -299,7 +299,7 @@ SCM_DEFINE (scm_string_set_x, "string-set!", 3, 0, 0, { SCM_VALIDATE_RWSTRING (1,str); SCM_VALIDATE_INUM_RANGE (2,k,0,SCM_LENGTH(str)); - SCM_VALIDATE_CHAR (3,chr); + SCM_VALIDATE_ICHR (3,chr); SCM_UCHARS (str)[SCM_INUM (k)] = SCM_ICHR (chr); return SCM_UNSPECIFIED; } diff --git a/libguile/strop.c b/libguile/strop.c index 9e37beadc..18448f468 100644 --- a/libguile/strop.c +++ b/libguile/strop.c @@ -186,7 +186,7 @@ SCM_DEFINE (scm_substring_fill_x, "substring-fill!", 4, 0, 0, SCM_VALIDATE_STRING (1,str); SCM_VALIDATE_INUM_COPY (2,start,i); SCM_VALIDATE_INUM_COPY (3,end,e); - SCM_VALIDATE_CHAR_COPY (4,fill,c); + SCM_VALIDATE_ICHR_COPY (4,fill,c); SCM_ASSERT_RANGE (2,start,i <= SCM_LENGTH (str) && i >= 0); SCM_ASSERT_RANGE (3,end,e <= SCM_LENGTH (str) && e >= 0); while (i<e) SCM_CHARS (str)[i++] = c; @@ -243,7 +243,7 @@ SCM_DEFINE (scm_string_fill_x, "string-fill!", 2, 0, 0, register char *dst, c; register long k; SCM_VALIDATE_STRING_COPY (1,str,dst); - SCM_VALIDATE_CHAR_COPY (2,chr,c); + SCM_VALIDATE_ICHR_COPY (2,chr,c); for (k = SCM_LENGTH (str)-1;k >= 0;k--) dst[k] = c; return SCM_UNSPECIFIED; } |