dmbcs/guile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* scm_validate.h, chars.c, ports.c, print.c, read.c, strings.c,

Browse source 
strop.c: Use SCM_VALIDATE_ICHR, SCM_VALIDATE_ICHR_COPY instead of
SCM_VALIDATE_CHAR, SCM_VALIDATE_CHAR_COPY.  Change made for
consistency with the other macros dealing with immediate
characters.  (Similar to INT -> INUM change a week or so ago).
This commit is contained in:
Greg J. Badros 2000-01-11 19:19:59 +00:00
commit 9a8351bc15
7 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

58
libguile/chars.c
View file

@ -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