mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-21 11:10:21 +02:00
Rename 'scm_c_make_char' to 'scm_i_make_char'.
* libguile/chars.c, libguile/chars.h, libguile/ports.c, libguile/print.c, libguile/read.c, libguile/srfi-13.c, libguile/strings.c, libguile/vm-engine.c: Rename 'scm_c_make_char' to 'scm_i_make_char'.
This commit is contained in:
parent
2d49ffa588
commit
579dd2da44
8 changed files with 34 additions and 34 deletions
|
@ -53,7 +53,7 @@
|
|||
} while (0)
|
||||
|
||||
#define REF_IN_CHARSET(s, i, cs) \
|
||||
(scm_is_true (scm_char_set_contains_p ((cs), scm_c_make_char (scm_i_string_ref (s, i)))))
|
||||
(scm_is_true (scm_char_set_contains_p ((cs), scm_i_make_char (scm_i_string_ref (s, i)))))
|
||||
|
||||
SCM_DEFINE (scm_string_null_p, "string-null?", 1, 0, 0,
|
||||
(SCM str),
|
||||
|
@ -133,7 +133,7 @@ SCM_DEFINE (scm_string_any, "string-any-c-code", 2, 2, 0,
|
|||
while (cstart < cend)
|
||||
{
|
||||
res = scm_call_1 (char_pred,
|
||||
scm_c_make_char (scm_i_string_ref (s, cstart)));
|
||||
scm_i_make_char (scm_i_string_ref (s, cstart)));
|
||||
if (scm_is_true (res))
|
||||
break;
|
||||
cstart++;
|
||||
|
@ -200,7 +200,7 @@ SCM_DEFINE (scm_string_every, "string-every-c-code", 2, 2, 0,
|
|||
while (cstart < cend)
|
||||
{
|
||||
res = scm_call_1 (char_pred,
|
||||
scm_c_make_char (scm_i_string_ref (s, cstart)));
|
||||
scm_i_make_char (scm_i_string_ref (s, cstart)));
|
||||
if (scm_is_false (res))
|
||||
break;
|
||||
cstart++;
|
||||
|
@ -758,7 +758,7 @@ SCM_DEFINE (scm_string_trim, "string-trim", 1, 3, 0,
|
|||
{
|
||||
SCM res;
|
||||
|
||||
res = scm_call_1 (char_pred, scm_c_make_char (scm_i_string_ref (s, cstart)));
|
||||
res = scm_call_1 (char_pred, scm_i_make_char (scm_i_string_ref (s, cstart)));
|
||||
if (scm_is_false (res))
|
||||
break;
|
||||
cstart++;
|
||||
|
@ -834,7 +834,7 @@ SCM_DEFINE (scm_string_trim_right, "string-trim-right", 1, 3, 0,
|
|||
{
|
||||
SCM res;
|
||||
|
||||
res = scm_call_1 (char_pred, scm_c_make_char (scm_i_string_ref (s, cend - 1)));
|
||||
res = scm_call_1 (char_pred, scm_i_make_char (scm_i_string_ref (s, cend - 1)));
|
||||
if (scm_is_false (res))
|
||||
break;
|
||||
cend--;
|
||||
|
@ -928,7 +928,7 @@ SCM_DEFINE (scm_string_trim_both, "string-trim-both", 1, 3, 0,
|
|||
{
|
||||
SCM res;
|
||||
|
||||
res = scm_call_1 (char_pred, scm_c_make_char (scm_i_string_ref (s, cstart)));
|
||||
res = scm_call_1 (char_pred, scm_i_make_char (scm_i_string_ref (s, cstart)));
|
||||
if (scm_is_false (res))
|
||||
break;
|
||||
cstart++;
|
||||
|
@ -937,7 +937,7 @@ SCM_DEFINE (scm_string_trim_both, "string-trim-both", 1, 3, 0,
|
|||
{
|
||||
SCM res;
|
||||
|
||||
res = scm_call_1 (char_pred, scm_c_make_char (scm_i_string_ref (s, cend - 1)));
|
||||
res = scm_call_1 (char_pred, scm_i_make_char (scm_i_string_ref (s, cend - 1)));
|
||||
if (scm_is_false (res))
|
||||
break;
|
||||
cend--;
|
||||
|
@ -1698,7 +1698,7 @@ SCM_DEFINE (scm_string_index, "string-index", 2, 2, 0,
|
|||
while (cstart < cend)
|
||||
{
|
||||
SCM res;
|
||||
res = scm_call_1 (char_pred, scm_c_make_char (scm_i_string_ref (s, cstart)));
|
||||
res = scm_call_1 (char_pred, scm_i_make_char (scm_i_string_ref (s, cstart)));
|
||||
if (scm_is_true (res))
|
||||
goto found;
|
||||
cstart++;
|
||||
|
@ -1764,7 +1764,7 @@ SCM_DEFINE (scm_string_index_right, "string-index-right", 2, 2, 0,
|
|||
{
|
||||
SCM res;
|
||||
cend--;
|
||||
res = scm_call_1 (char_pred, scm_c_make_char (scm_i_string_ref (s, cend)));
|
||||
res = scm_call_1 (char_pred, scm_i_make_char (scm_i_string_ref (s, cend)));
|
||||
if (scm_is_true (res))
|
||||
goto found;
|
||||
}
|
||||
|
@ -1850,7 +1850,7 @@ SCM_DEFINE (scm_string_skip, "string-skip", 2, 2, 0,
|
|||
while (cstart < cend)
|
||||
{
|
||||
SCM res;
|
||||
res = scm_call_1 (char_pred, scm_c_make_char (scm_i_string_ref (s, cstart)));
|
||||
res = scm_call_1 (char_pred, scm_i_make_char (scm_i_string_ref (s, cstart)));
|
||||
if (scm_is_false (res))
|
||||
goto found;
|
||||
cstart++;
|
||||
|
@ -1917,7 +1917,7 @@ SCM_DEFINE (scm_string_skip_right, "string-skip-right", 2, 2, 0,
|
|||
{
|
||||
SCM res;
|
||||
cend--;
|
||||
res = scm_call_1 (char_pred, scm_c_make_char (scm_i_string_ref (s, cend)));
|
||||
res = scm_call_1 (char_pred, scm_i_make_char (scm_i_string_ref (s, cend)));
|
||||
if (scm_is_false (res))
|
||||
goto found;
|
||||
}
|
||||
|
@ -1983,7 +1983,7 @@ SCM_DEFINE (scm_string_count, "string-count", 2, 2, 0,
|
|||
while (cstart < cend)
|
||||
{
|
||||
SCM res;
|
||||
res = scm_call_1 (char_pred, scm_c_make_char (scm_i_string_ref (s, cstart)));
|
||||
res = scm_call_1 (char_pred, scm_i_make_char (scm_i_string_ref (s, cstart)));
|
||||
if (scm_is_true (res))
|
||||
count++;
|
||||
cstart++;
|
||||
|
@ -2240,7 +2240,7 @@ string_titlecase_x (SCM str, size_t start, size_t end)
|
|||
str = scm_i_string_start_writing (str);
|
||||
for(i = start; i < end; i++)
|
||||
{
|
||||
ch = scm_c_make_char (scm_i_string_ref (str, i));
|
||||
ch = scm_i_make_char (scm_i_string_ref (str, i));
|
||||
if (scm_is_true (scm_char_alphabetic_p (ch)))
|
||||
{
|
||||
if (!in_word)
|
||||
|
@ -2338,7 +2338,7 @@ string_reverse_x (SCM str, size_t cstart, size_t cend)
|
|||
cend--;
|
||||
while (cstart < cend)
|
||||
{
|
||||
tmp = scm_c_make_char (scm_i_string_ref (str, cstart));
|
||||
tmp = scm_i_make_char (scm_i_string_ref (str, cstart));
|
||||
scm_i_string_set_x (str, cstart, scm_i_string_ref (str, cend));
|
||||
scm_i_string_set_x (str, cend, SCM_CHAR (tmp));
|
||||
cstart++;
|
||||
|
@ -2575,7 +2575,7 @@ SCM_DEFINE (scm_string_fold, "string-fold", 3, 2, 0,
|
|||
result = knil;
|
||||
while (cstart < cend)
|
||||
{
|
||||
result = scm_call_2 (kons, scm_c_make_char (scm_i_string_ref (s, cstart)), result);
|
||||
result = scm_call_2 (kons, scm_i_make_char (scm_i_string_ref (s, cstart)), result);
|
||||
cstart++;
|
||||
}
|
||||
|
||||
|
@ -2603,7 +2603,7 @@ SCM_DEFINE (scm_string_fold_right, "string-fold-right", 3, 2, 0,
|
|||
result = knil;
|
||||
while (cstart < cend)
|
||||
{
|
||||
result = scm_call_2 (kons, scm_c_make_char (scm_i_string_ref (s, cend-1)), result);
|
||||
result = scm_call_2 (kons, scm_i_make_char (scm_i_string_ref (s, cend-1)), result);
|
||||
cend--;
|
||||
}
|
||||
|
||||
|
@ -2760,7 +2760,7 @@ SCM_DEFINE (scm_string_for_each, "string-for-each", 2, 2, 0,
|
|||
4, end, cend);
|
||||
while (cstart < cend)
|
||||
{
|
||||
scm_call_1 (proc, scm_c_make_char (scm_i_string_ref (s, cstart)));
|
||||
scm_call_1 (proc, scm_i_make_char (scm_i_string_ref (s, cstart)));
|
||||
cstart++;
|
||||
}
|
||||
|
||||
|
@ -3217,7 +3217,7 @@ SCM_DEFINE (scm_string_filter, "string-filter", 2, 2, 0,
|
|||
while (idx < cend)
|
||||
{
|
||||
SCM res, ch;
|
||||
ch = scm_c_make_char (scm_i_string_ref (s, idx));
|
||||
ch = scm_i_make_char (scm_i_string_ref (s, idx));
|
||||
res = scm_call_1 (char_pred, ch);
|
||||
if (scm_is_true (res))
|
||||
ls = scm_cons (ch, ls);
|
||||
|
@ -3368,7 +3368,7 @@ SCM_DEFINE (scm_string_delete, "string-delete", 2, 2, 0,
|
|||
idx = cstart;
|
||||
while (idx < cend)
|
||||
{
|
||||
SCM res, ch = scm_c_make_char (scm_i_string_ref (s, idx));
|
||||
SCM res, ch = scm_i_make_char (scm_i_string_ref (s, idx));
|
||||
res = scm_call_1 (char_pred, ch);
|
||||
if (scm_is_false (res))
|
||||
ls = scm_cons (ch, ls);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue