diff options
author | Marius Vollmer <mvo@zagadka.de> | 2004-08-19 17:19:44 +0000 |
---|---|---|
committer | Marius Vollmer <mvo@zagadka.de> | 2004-08-19 17:19:44 +0000 |
commit | cc95e00ac63820cbc03ca858ff6b8e1015c9d168 (patch) | |
tree | 31ed97062f17f16438e0674bd963454f22fa6754 /libguile/script.c | |
parent | f76c6bb2342534158769cc55ce40edd17492f9c4 (diff) | |
download | guile-cc95e00ac63820cbc03ca858ff6b8e1015c9d168.tar.gz |
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
Diffstat (limited to 'libguile/script.c')
-rw-r--r-- | libguile/script.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libguile/script.c b/libguile/script.c index a8a84185f..5b62d65ce 100644 --- a/libguile/script.c +++ b/libguile/script.c @@ -451,13 +451,13 @@ scm_compile_shell_switches (int argc, char **argv) (i.e., the #f) with the script name. */ if (!SCM_NULLP (do_script)) { - SCM_SETCAR (do_script, scm_makfrom0str (argv[i])); + SCM_SETCAR (do_script, scm_from_locale_string (argv[i])); do_script = SCM_EOL; } else /* Construct an application of LOAD to the script name. */ tail = scm_cons (scm_cons2 (sym_load, - scm_makfrom0str (argv[i]), + scm_from_locale_string (argv[i]), SCM_EOL), tail); argv0 = argv[i]; @@ -471,7 +471,7 @@ scm_compile_shell_switches (int argc, char **argv) if (++i >= argc) scm_shell_usage (1, "missing argument to `-c' switch"); tail = scm_cons (scm_cons2 (sym_eval_string, - scm_makfrom0str (argv[i]), + scm_from_locale_string (argv[i]), SCM_EOL), tail); i++; @@ -489,7 +489,7 @@ scm_compile_shell_switches (int argc, char **argv) { if (++i < argc) tail = scm_cons (scm_cons2 (sym_load, - scm_makfrom0str (argv[i]), + scm_from_locale_string (argv[i]), SCM_EOL), tail); else |