SCM val = get_property (prop_sym);
- if (val == SCM_UNDEFINED)
+ if (val == SCM_EOL)
; // Not defined in context.
else if (gh_apply (type_p, scm_listify (val, SCM_UNDEFINED))
== SCM_BOOL_T) // defined and right type: do it
SCM name = e->get_elt_property ("meta");
name = scm_assoc (ly_symbol2scm ("name"), name);
- scm_display (name, errport);
+ scm_display (gh_cdr(name), errport);
scm_puts(" \\push #'",errport);
- scm_display (elt_prop_sym,errport);
+ scm_write (elt_prop_sym,errport);
scm_puts ( " = #",errport);
- if (gh_string_p (val))
- scm_puts ("\"", errport);
- scm_display (val, scm_current_error_port ());
- if (gh_string_p (val))
- scm_puts ("\"", errport);
+ scm_write (val, scm_current_error_port ());
scm_puts ("\n", errport);
}
else
/*
- we don't print a warning if VAL == #f, because we would
+ we don't print a warning if VAL == (), because we would
get lots of warnings when we restore stuff to default, eg.
- slurDash = #1 [...] slurDash = ##f
+ slurDash = #1 [...] slurDash = ()
should not cause "type error: slurDash expects number not
- boolean"
+ boolean
*/
- if (val != SCM_BOOL_F)
+ if (val != SCM_EOL)
{ // not the right type: error message.
SCM errport = scm_current_error_port ();
warning (_("Wrong type for property"));
scm_display (prop_sym, errport);
- scm_puts (", type predicate: ", errport);
- scm_display (type_p, errport);
+ scm_puts (", type: ", errport);
+
+ SCM typefunc = scm_eval2 (ly_symbol2scm ("type-name"), SCM_EOL);
+
+ scm_display (gh_call1 (typefunc, type_p), errport);
scm_puts (", value found: ", errport);
- scm_display (val, errport);
+ scm_write (val, errport);
scm_puts (" type: ", errport);
scm_display (ly_type (val), errport);
scm_puts ("\n", errport);