/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
smobify_self ();
}
-Music_iterator::Music_iterator (Music_iterator const &)
-{
- assert (false);
-}
-
Music_iterator::~Music_iterator ()
{
}
if (ly_is_procedure (ctor))
{
iter = scm_call_0 (ctor);
- p = Music_iterator::unsmob (iter);
+ p = unsmob<Music_iterator> (iter);
}
else
{
void
Music_iterator::substitute_outlet (Context *f, Context *t)
{
- if (get_outlet () == f)
- set_context (t);
- derived_substitute (f, t);
+ if (f != t)
+ {
+ if (get_outlet () == f)
+ set_context (t);
+ derived_substitute (f, t);
+ }
}
void
Music_iterator::get_iterator (Music *m) const
{
SCM ip = get_static_get_iterator (m);
- Music_iterator *p = Music_iterator::unsmob (ip);
+ Music_iterator *p = unsmob<Music_iterator> (ip);
p->init_context (m, get_outlet ());
/****************************************************************/
-const char Music_iterator::type_p_name_[] = "ly:iterator?";
+const char * const Music_iterator::type_p_name_ = "ly:iterator?";
SCM
-Music_iterator::mark_smob ()
+Music_iterator::mark_smob () const
{
derived_mark ();
/*
}
int
-Music_iterator::print_smob (SCM sm, SCM port, scm_print_state *)
+Music_iterator::print_smob (SCM port, scm_print_state *) const
{
char s[1000];
- Music_iterator *iter = Music_iterator::unsmob (sm);
- sprintf (s, "#<%s>", iter->class_name ());
+ sprintf (s, "#<%s>", class_name ());
scm_puts (s, port);
return 1;
}