Issue 4842/5: Store acknowledgers in a Scheme_hash_table

[lilypond.git] / lily / include / grob-array.hh

diff --git a/lily/include/grob-array.hh b/lily/include/grob-array.hh
index ccbf8c82a889e9ad89198606d510b0f963c4f8ee..1a755fe66196c2bdbbf301c2217a068d06a010b0 100644 (file)
--- a/lily/include/grob-array.hh
+++ b/lily/include/grob-array.hh
@@ -31,7 +31,7 @@ public:
   SCM mark_smob () const;
   static const char type_p_name_[];
 private:
-  std::vector<Grob *> grobs_;
+  vector<Grob *> grobs_;
   bool ordered_;
 
 
@@ -43,18 +43,31 @@ public:
   Spanner *spanner (vsize i);
   Grob *grob (vsize i) const { return grobs_.at (i); }
   vsize size () const { return grobs_.size (); }
-  bool empty () const;
+  bool empty () const { return grobs_.empty (); }
   void remove_duplicates ();
-  void clear ();
+  void clear () { grobs_.clear (); }
   void add (Grob *x) { grobs_.push_back (x); }
-  void set_array (std::vector<Grob *> const &src);
-  std::vector<Grob *> &array_reference ();
-  std::vector<Grob *> const &array () const;
+  void set_array (vector<Grob *> const &src) { grobs_ = src; }
+  vector<Grob *> &array_reference () { return grobs_; }
+  vector<Grob *> const &array () const { return grobs_; }
   static SCM make_array ();
+
+  // Remove grobs that do not satisfy the predicate, leaving the order
+  // unchanged.
+  void filter (bool (*predicate) (const Grob *));
+
+  // Run a function on all grobs in this array.  If the function returns null,
+  // remove the original grob, reducing the size of the array.  If the function
+  // returns a Grob, replace the original grob with the returned Grob.
+  void filter_map (Grob * (*map_fun) (Grob *));
+
+  // Like src.filter_map (f), but store the result in this array instead of
+  // mutating the input.
+  void filter_map_assign (const Grob_array &src, Grob * (*map_fun) (Grob *));
 };
 
 
-std::vector<Grob *> const &ly_scm2link_array (SCM x);
+vector<Grob *> const &ly_scm2link_array (SCM x);
 SCM grob_list_to_grob_array (SCM lst);
 SCM grob_array_to_list (Grob_array *array);