Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-07-09 22:17:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

string-concatenate now takes an optional <separator> argument

Browse source
This commit is contained in:
Alex Shinn 2009-12-29 22:19:08 +09:00
parent e2d7291269
commit 3087302be6
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/chibi/sexp.h
View file

@ -810,7 +810,7 @@ SEXP_API sexp sexp_length(sexp ctx, sexp ls);
SEXP_API sexp sexp_c_string(sexp ctx, char *str, sexp_sint_t slen); SEXP_API sexp sexp_c_string(sexp ctx, char *str, sexp_sint_t slen);
SEXP_API sexp sexp_make_string(sexp ctx, sexp len, sexp ch); SEXP_API sexp sexp_make_string(sexp ctx, sexp len, sexp ch);
SEXP_API sexp sexp_substring (sexp ctx, sexp str, sexp start, sexp end); SEXP_API sexp sexp_substring (sexp ctx, sexp str, sexp start, sexp end);
SEXP_API sexp sexp_string_concatenate (sexp ctx, sexp str_ls); SEXP_API sexp sexp_string_concatenate (sexp ctx, sexp str_ls, sexp sep);
SEXP_API sexp sexp_intern(sexp ctx, char *str); SEXP_API sexp sexp_intern(sexp ctx, char *str);
SEXP_API sexp sexp_string_to_symbol(sexp ctx, sexp str); SEXP_API sexp sexp_string_to_symbol(sexp ctx, sexp str);
SEXP_API sexp sexp_make_vector(sexp ctx, sexp len, sexp dflt); SEXP_API sexp sexp_make_vector(sexp ctx, sexp len, sexp dflt);

2
opcodes.c
View file

@ -104,7 +104,7 @@ _FN2OPT(SEXP_FIXNUM, SEXP_CHAR, "make-string", sexp_make_character(' '), sexp_ma
_FN3(SEXP_STRING, SEXP_STRING, "string-cmp", 0, sexp_string_cmp), _FN3(SEXP_STRING, SEXP_STRING, "string-cmp", 0, sexp_string_cmp),
_FN3(SEXP_STRING, SEXP_FIXNUM, "substring", 0, sexp_substring), _FN3(SEXP_STRING, SEXP_FIXNUM, "substring", 0, sexp_substring),
_FN1(SEXP_STRING, "string->symbol", 0, sexp_string_to_symbol), _FN1(SEXP_STRING, "string->symbol", 0, sexp_string_to_symbol),
_FN1(SEXP_PAIR, "string-concatenate", 0, sexp_string_concatenate), _FN2OPT(SEXP_PAIR, SEXP_STRING, "string-concatenate", SEXP_FALSE, sexp_string_concatenate),
_FN2(0, SEXP_PAIR, "memq", 0, sexp_memq), _FN2(0, SEXP_PAIR, "memq", 0, sexp_memq),
_FN2(0, SEXP_PAIR, "assq", 0, sexp_assq), _FN2(0, SEXP_PAIR, "assq", 0, sexp_assq),
_FN3(SEXP_ENV, SEXP_PAIR, "make-syntactic-closure", 0, sexp_make_synclo), _FN3(SEXP_ENV, SEXP_PAIR, "make-syntactic-closure", 0, sexp_make_synclo),

18
sexp.c
View file

@ -646,21 +646,29 @@ sexp sexp_substring (sexp ctx, sexp str, sexp start, sexp end) {
return res; return res;
} }
sexp sexp_string_concatenate (sexp ctx, sexp str_ls) { sexp sexp_string_concatenate (sexp ctx, sexp str_ls, sexp sep) {
sexp res, ls; sexp res, ls;
sexp_uint_t len=0; sexp_uint_t len=0, i=0, sep_len=0;
char *p; char *p, *csep;
for (ls=str_ls; sexp_pairp(ls); ls=sexp_cdr(ls)) for (ls=str_ls; sexp_pairp(ls); ls=sexp_cdr(ls), i++)
if (! sexp_stringp(sexp_car(ls))) if (! sexp_stringp(sexp_car(ls)))
return sexp_type_exception(ctx, "not a string", sexp_car(ls)); return sexp_type_exception(ctx, "not a string", sexp_car(ls));
else else
len += sexp_string_length(sexp_car(ls)); len += sexp_string_length(sexp_car(ls));
if (sexp_stringp(sep) && ((sep_len=sexp_string_length(sep)) > 0)) {
csep = sexp_string_data(sep);
len += sep_len*(i-1);
}
res = sexp_make_string(ctx, sexp_make_fixnum(len), SEXP_VOID); res = sexp_make_string(ctx, sexp_make_fixnum(len), SEXP_VOID);
p = sexp_string_data(res); p = sexp_string_data(res);
for (ls=str_ls; sexp_pairp(ls); ls=sexp_cdr(ls)) { for (ls=str_ls; sexp_pairp(ls); ls=sexp_cdr(ls)) {
len = sexp_string_length(sexp_car(ls)); len = sexp_string_length(sexp_car(ls));
memcpy(p, sexp_string_data(sexp_car(ls)), len); memcpy(p, sexp_string_data(sexp_car(ls)), len);
p += len; p += len;
if (sep_len && sexp_pairp(sexp_cdr(ls))) {
memcpy(p, csep, sep_len);
p += sep_len;
}
} }
*p = '\0'; *p = '\0';
return res; return res;
@ -990,7 +998,7 @@ sexp sexp_get_output_string (sexp ctx, sexp out) {
} else { } else {
ls = sexp_port_cookie(out); ls = sexp_port_cookie(out);
} }
res = sexp_string_concatenate(ctx, ls); res = sexp_string_concatenate(ctx, ls, SEXP_FALSE);
sexp_gc_release2(ctx); sexp_gc_release2(ctx);
return res; return res;
} }