#include "international.hh"
#include "libc-extension.hh"
#include "lily-guile.hh"
-#include "string.hh"
+#include "std-string.hh"
#include "misc.hh"
#include "warn.hh"
#include "version.hh"
{
SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string");
- String nm = ly_scm2string (name);
- String file_name = global_path.find (nm);
- if (file_name.is_empty ())
+ string nm = ly_scm2string (name);
+ string file_name = global_path.find (nm);
+ if (file_name.empty ())
return SCM_BOOL_F;
- return scm_makfrom0str (file_name.to_str0 ());
+ return scm_makfrom0str (file_name.c_str ());
}
/*
sz = scm_to_int (size);
}
- String contents = gulp_file_to_string (ly_scm2string (name), true, sz);
- return scm_from_locale_stringn (contents.get_str0 (), contents.length ());
+ string contents = gulp_file_to_string (ly_scm2string (name), true, sz);
+ return scm_from_locale_stringn (contents.c_str (), contents.length ());
}
LY_DEFINE (ly_error, "ly:error",
0, 0, 0, (),
"Return name of output backend.")
{
- return scm_makfrom0str (output_backend_global.to_str0 ());
+ return scm_makfrom0str (output_backend_global.c_str ());
}
LY_DEFINE (ly_output_formats, "ly:output-formats",
"Formats passed to --format as a list of strings, "
"used for the output.")
{
- Array<String> output_formats = split_string (output_format_global, ',');
+ vector<string> output_formats = string_split (output_format_global, ',');
SCM lst = SCM_EOL;
int output_formats_count = output_formats.size ();
for (int i = 0; i < output_formats_count; i++)
- lst = scm_cons (scm_makfrom0str (output_formats[i].to_str0 ()), lst);
+ lst = scm_cons (scm_makfrom0str (output_formats[i].c_str ()), lst);
return lst;
}
0, 0, 0, (),
"Return effective prefix.")
{
- return scm_makfrom0str (prefix_directory.to_str0 ());
+ return scm_makfrom0str (prefix_directory.c_str ());
}
LY_DEFINE (ly_chain_assoc_get, "ly:chain-assoc-get",