summaryrefslogtreecommitdiff
path: root/libguile/strings.h
diff options
context:
space:
mode:
authorMarius Vollmer <mvo@zagadka.de>2004-08-10 13:20:59 +0000
committerMarius Vollmer <mvo@zagadka.de>2004-08-10 13:20:59 +0000
commitc829a4274f35bae62cae06312335a0596504a333 (patch)
tree8a291b19c91a9e07fcde676d6b5944255fb1666f /libguile/strings.h
parent8d3fd10b91080f629c822c843bc87eca72b31dbc (diff)
downloadguile-c829a4274f35bae62cae06312335a0596504a333.tar.gz
* strings.h, deprecated.h (SCM_STRING_COERCE_0TERMINATION_X):
Moved from string.h to deprecated.h. * deprecated.c, deprecated.h (SCM_CHARS, SCM_LENGTH): Removed. * strings.h, strings.c (SCM_MAKE_STRING_TAG): Rename dto SCM_I_MAKE_STRING_TAG, changed all uses. (SCM_STRING_CHARS, SCM_STRING_UCHARS, SCM_STRING_LENGTH): Renamed to SCM_I_STRING_CHARS, SCM_I_STRING_UCHARS, and SCM_I_LENGTH respectively. For a short time, the old names are still there as aliases. Not all uses have been changed yet, but the ones in strings.c have. (SCM_STRING_MAX_LEN): Do not hardcode to 24 bits, compute from SCM_T_BITS_MAX. (scm_is_string, scm_from_locale_string, scm_from_locale_stringn, scm_take_locale_string, scm_take_locale_stringn, scm_to_locale_string, scm_to_locale_stringn, scm_to_locale_stringbuf): New. (scm_c_string2str, scm_c_substring2str): Deprecated by moving to deprecated.[hc]. Implemented in terms of the new functions above. (scm_take_str, scm_take0str, scm_mem2string, scm_str2string, scm_makfrom0str): Reimplemented in terms of the new functions from above. They will be discouraged shortly. (scm_substring): Do not use scm_mem2string. (scm_i_allocate_string_pointers, scm_i_free_string_pointers): New, to replace similar code from posix.c, simpos.c, and dynl.c. (scm_string_append): Use memcpy instead of explicit loop. Do not use register keyword. Use plain 'char' instead of 'unsigned char'.
Diffstat (limited to 'libguile/strings.h')
-rw-r--r--libguile/strings.h52
1 files changed, 31 insertions, 21 deletions
diff --git a/libguile/strings.h b/libguile/strings.h
index 8e915d470..09edabbcb 100644
--- a/libguile/strings.h
+++ b/libguile/strings.h
@@ -26,19 +26,30 @@
-#define SCM_STRINGP(x) (!SCM_IMP (x) && (SCM_TYP7 (x) == scm_tc7_string))
-#define SCM_STRING_UCHARS(x) ((unsigned char *) (SCM_CELL_WORD_1 (x)))
-#define SCM_STRING_CHARS(x) ((char *) (SCM_CELL_WORD_1 (x)))
-#define SCM_SET_STRING_CHARS(s, c) (SCM_SET_CELL_WORD_1 ((s), (c)))
-#define SCM_STRING_MAX_LENGTH ((1UL << 24) - 1UL)
-#define SCM_STRING_LENGTH(x) ((size_t) (SCM_CELL_WORD_0 (x) >> 8))
-#define SCM_MAKE_STRING_TAG(l) ((((scm_t_bits) (l)) << 8) + scm_tc7_string)
-#define SCM_SET_STRING_LENGTH(s, l) (SCM_SET_CELL_WORD_0 ((s), SCM_MAKE_STRING_TAG (l)))
+#define SCM_STRING_MAX_LENGTH ((SCM_T_BITS_MAX-255)/256)
+
+#define SCM_I_MAKE_STRING_TAG(l) ((((scm_t_bits) (l)) << 8) + scm_tc7_string)
+#define SCM_I_STRINGP(x) (!SCM_IMP (x) && (SCM_TYP7 (x) == scm_tc7_string))
+#define SCM_I_STRING_UCHARS(x) ((unsigned char *) (SCM_CELL_WORD_1 (x)))
+#define SCM_I_STRING_CHARS(x) ((char *) (SCM_CELL_WORD_1 (x)))
+#define SCM_I_STRING_LENGTH(x) ((size_t) (SCM_CELL_WORD_0 (x) >> 8))
+
+#define SCM_STRINGP SCM_I_STRINGP
+#define SCM_STRING_CHARS SCM_I_STRING_CHARS
+#define SCM_STRING_UCHARS SCM_I_STRING_UCHARS
+#define SCM_STRING_LENGTH SCM_I_STRING_LENGTH
SCM_API SCM scm_string_p (SCM x);
SCM_API SCM scm_string (SCM chrs);
+SCM_API SCM scm_make_string (SCM k, SCM chr);
+SCM_API SCM scm_string_length (SCM str);
+SCM_API SCM scm_string_ref (SCM str, SCM k);
+SCM_API SCM scm_string_set_x (SCM str, SCM k, SCM chr);
+SCM_API SCM scm_substring (SCM str, SCM start, SCM end);
+SCM_API SCM scm_string_append (SCM args);
+
SCM_API SCM scm_makfromstrs (int argc, char **argv);
SCM_API SCM scm_take_str (char *s, size_t len);
SCM_API SCM scm_take0str (char *s);
@@ -47,23 +58,22 @@ SCM_API SCM scm_str2string (const char *src);
SCM_API SCM scm_makfrom0str (const char *src);
SCM_API SCM scm_makfrom0str_opt (const char *src);
SCM_API SCM scm_allocate_string (size_t len);
-SCM_API SCM scm_make_string (SCM k, SCM chr);
-SCM_API SCM scm_string_length (SCM str);
-SCM_API SCM scm_string_ref (SCM str, SCM k);
-SCM_API SCM scm_string_set_x (SCM str, SCM k, SCM chr);
-SCM_API SCM scm_substring (SCM str, SCM start, SCM end);
-SCM_API SCM scm_string_append (SCM args);
-SCM_API void scm_init_strings (void);
-SCM_API char *scm_c_string2str (SCM obj, char *str, size_t *lenp);
-SCM_API char *scm_c_substring2str (SCM obj, char *str, size_t start, size_t len);
-
+SCM_API int scm_is_string (SCM x);
+SCM_API SCM scm_from_locale_string (const char *str);
+SCM_API SCM scm_from_locale_stringn (const char *str, size_t len);
+SCM_API SCM scm_take_locale_string (char *str);
+SCM_API SCM scm_take_locale_stringn (char *str, size_t len);
+SCM_API char *scm_to_locale_string (SCM str);
+SCM_API char *scm_to_locale_stringn (SCM str, size_t *lenp);
+SCM_API size_t scm_to_locale_stringbuf (SCM str, char *buf, size_t max_len);
-#if (SCM_ENABLE_DEPRECATED == 1)
+/* internal utility functions. */
-#define SCM_STRING_COERCE_0TERMINATION_X(x) (x)
+SCM_API char **scm_i_allocate_string_pointers (SCM list);
+SCM_API void scm_i_free_string_pointers (char **pointers);
-#endif
+SCM_API void scm_init_strings (void);
#endif /* SCM_STRINGS_H */