X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-array.cc;h=f5228dfd7148d91296dac7765b8b197cb162f34c;hb=77267b700c377fd170abcbf4863728937038eb5e;hp=785b5c215a42af5918f57fcd732042855f932db2;hpb=b4d2043223a86826764bc531e684a864c97605fe;p=lilypond.git

diff --git a/lily/grob-array.cc b/lily/grob-array.cc
index 785b5c215a..f5228dfd71 100644
--- a/lily/grob-array.cc
+++ b/lily/grob-array.cc
@@ -1,77 +1,66 @@
 /*
-  grob-array.cc -- implement Grob_array
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "grob-array.hh"
 #include "item.hh"
 #include "spanner.hh"
 
-#include "ly-smobs.icc"
 
 Item *
-Grob_array::item (int i)
+Grob_array::item (vsize i)
 {
-  return dynamic_cast<Item*> (grobs_.elem (i));
+  return dynamic_cast<Item *> (grobs_.at (i));
 }
 
-Spanner*
-Grob_array::spanner (int i)
+Spanner *
+Grob_array::spanner (vsize i)
 {
-  return dynamic_cast<Spanner*> (grobs_.elem (i));
+  return dynamic_cast<Spanner *> (grobs_.at (i));
 }
 
 Grob_array::Grob_array ()
 {
-  ordered_ = false;
-}
-
-Link_array<Grob> &
-Grob_array::array_reference ()
-{
-  return grobs_;
-}
-
-
-Link_array<Grob> const &
-Grob_array::array () const
-{
-  return grobs_;
+  ordered_ = true;
 }
 
-
 SCM
-Grob_array::mark_smob (SCM s)
+Grob_array::mark_smob () const
 {
-  (void) s;
-  
 #if 0  /* see System::derived_mark () const */
-  Grob_array *ga = unsmob_grob_array (s); 
-  for (int i = 0; i < ga->grobs_.size(); i++)
-    scm_gc_mark (ga->grobs_[i]->self_scm ());
-#endif  
+  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 (int i = 0; i < grob_arr->size(); i++)
+  for (vsize i = 0; i < size (); i++)
     {
-      scm_display (grob_arr->grob (i)->self_scm (), port);
-      scm_puts (" " , port);
+      scm_display (grob (i)->self_scm (), port);
+      scm_puts (" ", port);
     }
   scm_puts (">", port);
   return 1;
 }
-  
 
 SCM
 Grob_array::make_array ()
@@ -81,37 +70,75 @@ Grob_array::make_array ()
 }
 
 void
-Grob_array::clear ()
+Grob_array::remove_duplicates ()
 {
-  grobs_.clear ();
+  assert (!ordered_);
+
+  uniquify (grobs_);
 }
 
-bool
-Grob_array::is_empty () const
+void
+Grob_array::filter (bool (*predicate) (const Grob *))
 {
-  return grobs_.is_empty ();
+  vsize new_size = 0;
+  for (vsize i = 0; i < grobs_.size (); ++i)
+    if (predicate (grobs_[i]))
+      grobs_[new_size++] = grobs_[i];
+  grobs_.resize (new_size);
+  // could call grobs_.shrink_to_fit () with C++11
 }
 
 void
-Grob_array::set_array (Link_array<Grob> const &src)
+Grob_array::filter_map (Grob * (*map_fun) (Grob *))
 {
-  grobs_ = src;  
+  vsize new_size = 0;
+  for (vsize i = 0; i < grobs_.size (); ++i)
+    if (Grob *grob = map_fun (grobs_[i]))
+      grobs_[new_size++] = grob;
+  grobs_.resize (new_size);
+  // could call grobs_.shrink_to_fit () with C++11
 }
 
-IMPLEMENT_SIMPLE_SMOBS (Grob_array);
-IMPLEMENT_TYPE_P (Grob_array, "ly:grob-array?");
+void
+Grob_array::filter_map_assign (const Grob_array &src,
+                               Grob * (*map_fun) (Grob *))
+{
+  if (&src != this)
+    {
+      grobs_.resize (0);
+      grobs_.reserve (src.grobs_.size ());
+      for (vsize i = 0; i < src.grobs_.size (); i++)
+        if (Grob *grob = map_fun (src.grobs_[i]))
+          grobs_.push_back (grob);
+      // could call grobs_.shrink_to_fit () with C++11
+    }
+  else
+    filter_map (map_fun);
+}
 
-IMPLEMENT_DEFAULT_EQUAL_P (Grob_array);
+const char * const Grob_array::type_p_name_ = "ly:grob-array?";
 
 
 SCM
 grob_list_to_grob_array (SCM lst)
 {
   SCM arr_scm = Grob_array::make_array ();
-  Grob_array *ga = unsmob_grob_array (arr_scm);
+  Grob_array *ga = unsmob<Grob_array> (arr_scm);
   for (SCM s = lst; scm_is_pair (s); s = scm_cdr (s))
+    ga->add (unsmob<Grob> (scm_car (s)));
+  return arr_scm;
+}
+
+SCM
+grob_array_to_list (Grob_array *array)
+{
+  SCM list = SCM_EOL;
+  SCM *tail = &list;
+
+  for (vsize i = 0; i < array->size (); i++)
     {
-      ga->add (unsmob_grob (scm_car (s)));
+      *tail = scm_cons (array->grob (i)->self_scm (), SCM_EOL);
+      tail = SCM_CDRLOC (*tail);
     }
-  return arr_scm;
+  return list;
 }