mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-19 10:10:23 +02:00
Code Activity

Try to optimize scm_string for speed

Browse source 
* libguile/strings.c (scm_string): optimize for speed
This commit is contained in:
Michael Gran 2009-08-19 21:26:11 -07:00
parent f8ba2bb911
commit 9aa27c1a30
1 changed files with 32 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

26
libguile/strings.c
View file

@ -1008,11 +1008,12 @@ SCM_DEFINE (scm_string, "string", 0, 0, 1,
"@var{chrs}.") "@var{chrs}.")
#define FUNC_NAME s_scm_string #define FUNC_NAME s_scm_string
{ {
SCM result; SCM result = SCM_BOOL_F;
SCM rest; SCM rest;
size_t len; size_t len;
size_t p = 0; size_t p = 0;
long i; long i;
int wide = 0;
/* Verify that this is a list of chars. */ /* Verify that this is a list of chars. */
i = scm_ilength (chrs); i = scm_ilength (chrs);
@ -1025,6 +1026,8 @@ SCM_DEFINE (scm_string, "string", 0, 0, 1,
{ {
SCM elt = SCM_CAR (rest); SCM elt = SCM_CAR (rest);
SCM_VALIDATE_CHAR (SCM_ARGn, elt); SCM_VALIDATE_CHAR (SCM_ARGn, elt);
if (SCM_CHAR (elt) > 0xFF)
wide = 1;
rest = SCM_CDR (rest); rest = SCM_CDR (rest);
len--; len--;
scm_remember_upto_here_1 (elt); scm_remember_upto_here_1 (elt);
@ -1034,17 +1037,36 @@ SCM_DEFINE (scm_string, "string", 0, 0, 1,
len = (size_t) i; len = (size_t) i;
rest = chrs; rest = chrs;
if (wide == 0)
{
result = scm_i_make_string (len, NULL); result = scm_i_make_string (len, NULL);
result = scm_i_string_start_writing (result); result = scm_i_string_start_writing (result);
char *buf = scm_i_string_writable_chars (result);
while (len > 0 && scm_is_pair (rest)) while (len > 0 && scm_is_pair (rest))
{ {
SCM elt = SCM_CAR (rest); SCM elt = SCM_CAR (rest);
scm_i_string_set_x (result, p, SCM_CHAR (elt)); buf[p] = (unsigned char) SCM_CHAR (elt);
p++; p++;
rest = SCM_CDR (rest); rest = SCM_CDR (rest);
len--; len--;
scm_remember_upto_here_1 (elt); scm_remember_upto_here_1 (elt);
} }
}
else
{
result = scm_i_make_wide_string (len, NULL);
result = scm_i_string_start_writing (result);
scm_t_wchar *buf = scm_i_string_writable_wide_chars (result);
while (len > 0 && scm_is_pair (rest))
{
SCM elt = SCM_CAR (rest);
buf[p] = SCM_CHAR (elt);
p++;
rest = SCM_CDR (rest);
len--;
scm_remember_upto_here_1 (elt);
}
}
scm_i_string_stop_writing (); scm_i_string_stop_writing ();
if (len > 0) if (len > 0)