if (scm_is_pair (handle)) {
yylval = scm_cdr (handle);
- if (Pitch::unsmob (yylval))
+ if (Pitch::is_smob (yylval))
return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
else if (scm_is_symbol (yylval))
return DRUM_PITCH;
SCM v = scm_car (p);
if (Music *m = Music::unsmob (v))
{
- if (!Input::unsmob (m->get_property ("origin")))
+ if (!Input::is_smob (m->get_property ("origin")))
m->set_spot (override_input (here_input ()));
}
if (Music *m = Music::unsmob (sval))
{
- if (!Input::unsmob (m->get_property ("origin")))
+ if (!Input::is_smob (m->get_property ("origin")))
m->set_spot (override_input (here_input ()));
}
{
Lilypond_version current ( MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL );
Lilypond_version ver (s);
- if (int (ver) < oldest_version)
+ if (!ver)
+ {
+ non_fatal_error (_f ("Invalid version string \"%s\"", s));
+ return false;
+ }
+ if (ver < oldest_version)
{
non_fatal_error (_f ("file too old: %s (oldest supported: %s)", ver.to_string (), oldest_version.to_string ()));
non_fatal_error (_ ("consider updating the input with the convert-ly script"));