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

Revert "Make literal strings (i.e., returned by `read') read-only."

Browse source 
This reverts commit fb2f8886c4.

The rationale is that `read' must return mutable strings, as reported
by szgyg <szgyg@ludens.elte.hu>.
This commit is contained in:
Ludovic Courtès 2008-10-09 22:21:33 +02:00
parent 89bc270db3
commit 45a9f43049
5 changed files with 12 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

37
libguile/strings.c
View file

@ -217,12 +217,6 @@ get_str_buf_start (SCM *str, SCM *buf, size_t *start)
*buf = STRING_STRINGBUF (*str);
}
SCM
scm_i_make_read_only_string (SCM str)
{
return scm_i_substring_read_only (str, 0, STRING_LENGTH (str));
}
SCM
scm_i_substring (SCM str, size_t start, size_t end)
{
@ -240,28 +234,15 @@ scm_i_substring (SCM str, size_t start, size_t end)
SCM
scm_i_substring_read_only (SCM str, size_t start, size_t end)
{
SCM result;
if (SCM_UNLIKELY (STRING_LENGTH (str) == 0))
/* We want the empty string to be `eq?' with the read-only empty
string. */
result = str;
else
{
SCM buf;
size_t str_start;
get_str_buf_start (&str, &buf, &str_start);
scm_i_pthread_mutex_lock (&stringbuf_write_mutex);
SET_STRINGBUF_SHARED (buf);
scm_i_pthread_mutex_unlock (&stringbuf_write_mutex);
result = scm_double_cell (RO_STRING_TAG, SCM_UNPACK (buf),
(scm_t_bits) str_start + start,
(scm_t_bits) end - start);
}
return result;
SCM buf;
size_t str_start;
get_str_buf_start (&str, &buf, &str_start);
scm_i_pthread_mutex_lock (&stringbuf_write_mutex);
SET_STRINGBUF_SHARED (buf);
scm_i_pthread_mutex_unlock (&stringbuf_write_mutex);
return scm_double_cell (RO_STRING_TAG, SCM_UNPACK(buf),
(scm_t_bits)str_start + start,
(scm_t_bits) end - start);
}
SCM