#include "international.hh"
#include "libc-extension.hh"
#include "lily-guile.hh"
-#include "std-string.hh"
#include "misc.hh"
#include "warn.hh"
#include "version.hh"
"The file is looked up using the search path. ")
{
SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string");
- int sz = -1;
+ int sz = INT_MAX;
if (size != SCM_UNDEFINED)
{
SCM_ASSERT_TYPE (scm_is_number (size), size, SCM_ARG2, __FUNCTION__, "number");
snprintf (str, sizeof (str), "%08.4f", r);
}
else
- snprintf (str, sizeof (str), "%d", scm_to_int (s));
+ snprintf (str, sizeof (str), "%d", int (scm_to_int (s)));
return scm_makfrom0str (str);
}
1, 1, 0, (SCM file_name, SCM mode),
"Redirect stderr to FILE-NAME, opened with MODE.")
{
- SCM_ASSERT_TYPE (scm_string_p (file_name), file_name, SCM_ARG1,
+ SCM_ASSERT_TYPE (scm_is_string (file_name), file_name, SCM_ARG1,
__FUNCTION__, "file_name");
char const *m = "w";
if (mode != SCM_UNDEFINED && scm_string_p (mode))
LY_DEFINE (ly_camel_case_to_lisp_identifier, "ly:camel-case->lisp-identifier",
1, 0, 0, (SCM name_sym),
- "Convert FooBar to foo-bar style symbol.")
+ "Convert FooBar_Bla to foo-bar-bla style symbol.")
{
SCM_ASSERT_TYPE(scm_is_symbol (name_sym), name_sym,
SCM_ARG1, __FUNCTION__, "symbol");
*/
const string in = ly_symbol2string (name_sym);
-
- vector<char> out;
-
- /* don't add '-' before first character */
- out.push_back (tolower (in[0]));
-
- for (size_t inpos = 1; inpos < in.size (); inpos++)
- {
- if (isupper (in[inpos]))
- out.push_back ('-');
- out.push_back (tolower (in[inpos]));
- }
+ string result = camel_case_to_lisp_identifier (in);
- string result (&out[0], out.size ());
return ly_symbol2scm (result.c_str ());
}