mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-24 21:41:29 -08:00
Code Issues Projects Releases Packages Wiki Activity

clean up functions creating base strings from C strings

Browse source 
Make functions behave as documented, remove use of legacy names.
    Fixes #462.
This commit is contained in:
Marius Gerbershagen 2019-01-04 13:31:07 +01:00
parent 2b7822769a
commit 24dcb778cf
33 changed files with 129 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/c/string.d
View file

@ -106,13 +106,14 @@ ecl_alloc_adjustable_extended_string(cl_index l)
/*
ecl_make_simple_base_string(s) creates a simple-base string from C string s.
ecl_make_constant_base_string(s) does the same, but without copying the C string.
*/
cl_object
ecl_make_simple_base_string(char *s, cl_fixnum l)
ecl_make_constant_base_string(const char *s, cl_fixnum l)
{
cl_object x = ecl_alloc_object(t_base_string);
x->base_string.elttype = ecl_aet_bc;
x->base_string.flags = 0; /* no fill pointer, no adjustable */
x->base_string.flags = 0; /* no fill pointer, not adjustable */
x->base_string.displaced = ECL_NIL;
if (l < 0) l = strlen(s);
x->base_string.dim = (x->base_string.fillp = l);
@ -121,10 +122,10 @@ ecl_make_simple_base_string(char *s, cl_fixnum l)
}
cl_object
make_base_string_copy(const char *s)
ecl_make_simple_base_string(const char *s, cl_fixnum l)
{
cl_object x;
cl_index l = strlen(s);
if (l < 0) l = strlen(s);
x = ecl_alloc_simple_base_string(l);
memcpy(x->base_string.self, s, l);
@ -137,7 +138,7 @@ ecl_cstring_to_base_string_or_nil(const char *s)
if (s == NULL)
return ECL_NIL;
else
return make_base_string_copy(s);
return ecl_make_simple_base_string(s,-1);
}
bool