2002-08-04 Han-Wen <hanwen@cs.uu.nl>
- * lily/lily-guile.cc: change gh_str02scm scm_makfrom0str.
+ * lily/lily-guile.cc: change gh_str02scm to scm_makfrom0str.
2002-08-04 Werner Lemberg <wl@gnu.org>
r2 r1 c
}
}
- \context Lyrics = "soprano" \lyrics {
+ \context Lyrics = "soprano-1" \lyrics {
hey __ stop?
hey __ STOP!!!
}
*/
SCM ly_last (SCM list);
-SCM ly_str02scm (char const*c);
SCM ly_write2scm (SCM s);
SCM ly_deep_copy (SCM);
SCM ly_truncate_list (int k, SCM l );
SCM ly_quote_scm (SCM s);
-SCM ly_type (SCM);
bool type_check_assignment (SCM val, SCM sym, SCM type_symbol) ;
String print_scm_val (SCM val);
SCM ly_number2string (SCM s);
parse_symbol_list (grobs), static_properties); \
\
static_properties= scm_acons (ly_symbol2scm ("description"), \
- ly_str02scm (desc), static_properties); \
+ scm_makfrom0str (desc), static_properties); \
\
static_properties= scm_acons (ly_symbol2scm ("interfaces-acked"), \
parse_symbol_list (acked), static_properties); \
SCM
index_get_cell (SCM s, Direction d)
{
+
assert (d);
return (d == LEFT) ? ly_car (s) : ly_cdr (s);
}
}
LY_DEFINE(ly_warning,"ly-warn", 1, 0, 0,
- (SCM str),"Scheme callable function to issue the warning @code{msg}.
-")
+ (SCM str),"Scheme callable function to issue the warning @code{msg}.")
{
- assert (gh_string_p (str));
+ SCM_ASSERT_TYPE (gh_string_p (str), str, SCM_ARG1, __FUNCTION__, "string");
warning ("lily-guile: " + ly_scm2string (str));
return SCM_BOOL_T;
}
gh_scm2double (ly_cdr (s)));
}
-SCM
-ly_type (SCM exp)
-{
- char const * cp = "unknown";
- if (gh_number_p (exp))
- {
- cp = "number";
- }
- else if (gh_string_p (exp))
- {
- cp = "string";
- }
- else if (gh_procedure_p (exp))
- {
- cp = "procedure";
- }
- else if (gh_boolean_p (exp))
- {
- cp = "boolean";
- }
- else if (gh_pair_p (exp))
- {
- cp = "list";
- }
-
- return scm_makfrom0str (cp);
-}
/*
convert without too many decimals, and leave a space at the end.
leaves a space at the end.
")
{
- assert (gh_number_p (s));
+ SCM_ASSERT_TYPE (gh_number_p (s), s, SCM_ARG1, __FUNCTION__, "number");
char str[400]; // ugh.
internal_ly_parse_scm (Parse_start * ps)
{
/*
+
This is actually pretty wasteful: we stuff the rest of the entire
file down GUILE, while we usually need only a bit of it.
+
+ TODO: implement read_only_string_port(), (preferably in GUILE ?)
+
*/
- SCM str = ly_str02scm (ps->str);
+ SCM str = scm_makfrom0str (ps->str);
SCM port = scm_mkstrport (SCM_INUM0, str, SCM_OPN | SCM_RDNG,
"ly_eval_scm_0str");
void
Tab_note_heads_engraver::process_music ()
{
- /*
- for (int i=0; i < tabstring_reqs_.size (); i++) {
- Music * tabstring_req = tabstring_reqs_[i];
-
- size_t lenp;
- char* tab_string_as_string = gh_scm2newstr(tabstring_req->get_mus_property ("text"), &lenp);
- }
- */
-
for (int i=0; i < note_reqs_.size (); i++)
{
SCM stringTunings = get_property ("stringTunings");