* strings.h, deprecated.h (SCM_STRING_COERCE_0TERMINATION_X):

[bpt/guile.git] / libguile / strings.h

diff --git a/libguile/strings.h b/libguile/strings.h
index 8e915d4..09edabb 100644 (file)
--- a/libguile/strings.h
+++ b/libguile/strings.h
@@ -26,19 +26,30 @@
 
 \f
 
-#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
 
 \f
 
 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);
 
-\f
+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 */