/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2005--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
}
SCM
-Grob_array::mark_smob (SCM s)
+Grob_array::mark_smob () const
{
- (void) s;
-
#if 0 /* see System::derived_mark () const */
- Grob_array *ga = Grob_array::unsmob (s);
- for (vsize i = 0; i < ga->grobs_.size (); i++)
- scm_gc_mark (ga->grobs_[i]->self_scm ());
+ for (vsize i = 0; i < grobs_.size (); i++)
+ scm_gc_mark (grobs_[i]->self_scm ());
#endif
return SCM_UNDEFINED;
}
int
-Grob_array::print_smob (SCM arr, SCM port, scm_print_state *)
+Grob_array::print_smob (SCM port, scm_print_state *) const
{
scm_puts ("#<Grob_array", port);
-
- Grob_array *grob_arr = unsmob (arr);
- for (vsize i = 0; i < grob_arr->size (); i++)
+ for (vsize i = 0; i < size (); i++)
{
- scm_display (grob_arr->grob (i)->self_scm (), port);
+ scm_display (grob (i)->self_scm (), port);
scm_puts (" ", port);
}
scm_puts (">", port);
grob_list_to_grob_array (SCM lst)
{
SCM arr_scm = Grob_array::make_array ();
- Grob_array *ga = Grob_array::unsmob (arr_scm);
+ Grob_array *ga = unsmob<Grob_array> (arr_scm);
for (SCM s = lst; scm_is_pair (s); s = scm_cdr (s))
- ga->add (Grob::unsmob (scm_car (s)));
+ ga->add (unsmob<Grob> (scm_car (s)));
return arr_scm;
}