X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fstd-vector.hh;h=76a11bb9252237189463c667290df2cd01ecc183;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=022d107b02e67a3cae17499b7240073a2b62e03b;hpb=767e42120b317f7ab2ca3e7a079bc4c2a0f7a776;p=lilypond.git

diff --git a/flower/include/std-vector.hh b/flower/include/std-vector.hh
index 022d107b02..76a11bb925 100644
--- a/flower/include/std-vector.hh
+++ b/flower/include/std-vector.hh
@@ -1,326 +1,266 @@
 /*
-  std-vector.hh -- declare std::vector
+  std-vector.hh -- declare vector
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2006--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef STD_VECTOR_HH
 #define STD_VECTOR_HH
 
-#include <algorithm> // reverse, sort
+#if 0
+
+/*
+  leads to dubious crashes - libstdc++  bug?
+*/
+#ifndef NDEBUG
+#define _GLIBCXX_DEBUG 1
+#endif
+#endif
+
+#include <algorithm>   /* find, reverse, sort */
+#include <functional>  /* unary_function */
+#include <cassert>
+#include <string>
+
+using namespace std;
 
-#if !STD_VECTOR
-/* Also declare vector, in the wrong way.  */
-#include <algorithm>
-#include <iostream>
-#include <sstream>
+#if HAVE_BOOST_LAMBDA_LAMBDA_HPP
+#include <boost/lambda/lambda.hpp>
 #endif
 
+template<typename T>
+int default_compare (T const &a, T const &b)
+{
+  if (a < b)
+    return -1;
+  else if (b < a)
+    return 1;
+  else
+    return 0;
+}
+
+template<typename T>
+int default_compare (T *const &a, T *const &b)
+{
+  if (a < b)
+    return -1;
+  else if (a > b)
+    return 1;
+  else
+    return 0;
+}
 
 #include "compare.hh"
 
-#if STD_VECTOR
+#ifndef VSIZE
+#define VSIZE
+typedef size_t vsize;
+#define VPOS ((vsize) -1)
+#endif
 
+#if HAVE_STL_DATA_METHOD
+#include <vector>
+#else /* !HAVE_STL_DATA_METHOD */
 #define vector __vector
 #include <vector>
 #undef vector
 
 namespace std {
 
-  #ifndef VSIZE
-  #define VSIZE
-  typedef size_t vsize;
-  #define VPOS UINT_MAX
-  #endif
-
   /* Interface without pointer arithmetic (iterator) semantics.  */
-  template<typename T>
-  class vector : public __vector<T>
+  template<typename T, typename A=std::allocator<T> >
+  class vector : public __vector<T, A>
   {
   public:
     typedef typename __vector<T>::iterator iterator;
     typedef typename __vector<T>::const_iterator const_iterator;
 
-    vector<T> () : __vector<T> ()
-    {
-    }
-
-    vector<T> (const_iterator b, const_iterator e) : __vector<T> (b, e)
-    {
-    }
-
-    iterator
-    iter (vsize n)
-    {
-      if (n == VPOS)
-	return this->end ();
-      return __vector<T>::begin () + n;
-    }
-
-    const_iterator
-    iter (vsize n) const
-    {
-      if (n == VPOS)
-	return this->end ();
-      return __vector<T>::begin () + n;
-    }
-    
-    void
-    insert (T k, vsize i)
+    vector<T, A> () : __vector<T, A> ()
     {
-      __vector<T>::insert (this->iter (i), k);
     }
 
-    void
-    insert (vector<T> &v, vsize i)
+    vector<T, A> (vector<T, A> const& v) : __vector<T, A> (v)
     {
-      __vector<T>::insert (iter (i), v.begin (), v.end ());
     }
 
-    void
-    concat (vector<T> const &v)
+    vector<T, A> (const_iterator b, const_iterator e) : __vector<T, A> (b, e)
     {
-      __vector<T>::insert (this->end (), v.begin (), v.end ());
     }
 
-    /* Flower-Array compatibility.  */
-    T const &
-    boundary (int dir, vsize i) const
+    T*
+    data ()
     {
-      assert (dir);
-      if (dir == 1)
-	return this->top (i);
-      else
-	return this->at (i);
+      return &(*this)[0];
     }
 
-    T &
-    boundary (int dir, vsize i)
+    T const*
+    data () const
     {
-      assert (dir);
-      if (dir == 1)
-	return this->top (i);
-      else
-	return this->at (i);
+      return &(*this)[0];
     }
+  };
 
-    T const &
-    elem (vsize i) const
-    {
-      return this->at (i);
-    }
+} /* namespace std */
 
-    T &
-    elem (vsize i)
-    {
-      return this->at (i);
-    }
+#endif /* !HAVE_STL_DATA_METHOD */
 
-#if 1 // FIXME, silly, but keep for s/r
-    T const &
-    elem_ref (vsize i) const
-    {
-      return elem (i);
-    }
+template<typename T>
+T const &
+boundary (vector<T> const &v, int dir, vsize i)
+{
+  assert (dir);
+  return v[dir == -1 ? i : v.size () - 1 - i];
+}
 
-    T &
-    elem_ref (vsize i)
-    {
-      return elem (i);
-    }
-#endif
+template<typename T>
+T &
+boundary (vector<T> &v, int dir, vsize i)
+{
+  assert (dir);
+  return v[dir == -1 ? i : v.size () - 1 - i];
+}
 
-#if 0
-    T *
-    remove_array ()
-    {
-      // FIXME, no algorithm for this?
-      T *p = new T[this->size ()];
-      for (vsize i = 0; i < this->size (); i++)
-	p[i] = (*this)[i];
-      this->clear ();
-      return p;
-    }
-#else
-    T *
-    remove_array ()
-    {
-      T *p = &(*this)[0];
-      // forget array?
-      //this->resize (0);
-      return p;
-    }
-#endif
+template<typename T>
+T const &
+back (vector<T> const &v, vsize i)
+{
+  return v[v.size () - i - 1];
+}
 
-    void
-    reverse ()
-    {
-      // CHECKME: for a simple vector, like vector<int>, this should
-      // expand to memrev.
-      ::std::reverse (this->begin (), this->end ());
-    }
+template<typename T>
+T&
+back (vector<T> &v, vsize i)
+{
+  return v[v.size () - i - 1];
+}
 
-    void swap (vsize i, vsize j)
-    {
-      T t ((*this)[i]);
-      (*this)[i] = (*this)[j];
-      (*this)[j] = t;
-    }
+template<typename T>
+void
+concat (vector<T> &v, vector<T> const& w)
+{
+  v.insert (v.end (), w.begin (), w.end ());
+}
 
-    T const &
-    top (vsize i) const
-    {
-      return (*this)[this->size () - i - 1];
-    }
+template<typename T, typename Compare>
+vsize
+lower_bound (vector<T> const &v,
+	     T const &key,
+	     Compare less,
+	     vsize b=0, vsize e=VPOS)
+{
+  if (e == VPOS)
+    e = v.size ();
+  typename vector<T>::const_iterator i = lower_bound (v.begin () + b,
+						      v.begin () + e,
+						      key,
+						      less);
+
+  return i - v.begin ();
+}
 
-    T&
-    top (vsize i)
-    {
-      return (*this)[this->size () - i - 1];
-    }
-  };
-  
-#if 0
-  template<typename T>
-  vsize
-  //  binary_search (std::vector<T> const &v,
-  binary_search (vector<T> const &v,
-		 T const &key, int (*compare) (T const &, T const &),
-		 vsize b=0, vsize e=VPOS)
-  {
-    //(void) compare;
-    typename vector<T>::const_iterator i = find (v.iter (b), v.iter (e), key);
-    if (i != v.end ())
-      return i - v.begin ();
-    return VPOS;
-  }
-#else // c&p from array.icc; cannot easily use stl_algo:find b.o. compare func.
-  template<class T>
-  void
-  binary_search_bounds (vector<T> const &table,
-			T const &key, int (*compare) (T const &, T const &),
-			vsize *lo,
-			vsize *hi)
-  {
-    int cmp;
-    int result;
-
-    /* binary search */
-    do
-      {
-	cmp = (*lo + *hi) / 2;
-
-	result = (*compare) (key, table[cmp]);
-
-	if (result < 0)
-	  *hi = cmp;
-	else
-	  *lo = cmp;
-      }
-    while (*hi - *lo > 1);
-  }
+template<typename T, typename Compare>
+vsize
+upper_bound (vector<T> const &v,
+	     T const &key,
+	     Compare less,
+	     vsize b=0, vsize e=VPOS)
+{
+  if (e == VPOS)
+    e = v.size ();
 
-  template<class T>
-  vsize
-  binary_search (vector<T> const &table,
-		 T const &key, int (*compare) (T const &, T const &),
-		 vsize lo=0,
-		 vsize hi=VPOS)
-  {
-    if (hi == VPOS)
-      hi = table.size ();
+  typename vector<T>::const_iterator i = upper_bound (v.begin () + b,
+						      v.begin () + e,
+						      key,
+						      less);
 
-    binary_search_bounds (table, key, compare, &lo, &hi);
+  return i - v.begin ();
+}
 
-    if (! (*compare) (key, table[lo]))
-      return lo;
+template<typename T, typename Compare>
+vsize
+binary_search (vector<T> const &v,
+	       T const &key,
+	       Compare less=less<T> (),
+	       vsize b=0, vsize e=VPOS)
+{
+  vsize lb = lower_bound (v, key, less, b, e);
 
-    /* not found */
+  if (lb == v.size () || less (key, v[lb]))
     return VPOS;
-  }
-#endif
-
+  return lb;
+}
 
-#if 0
-  /* FIXME: the simple test works, but lily barfs.  */
-  template<typename T>
-  void
-  vector_sort (vector<T> &v, int (*compare) (T const &, T const &),
-	       vsize lower=VPOS, vsize upper=VPOS)
-  {
-    typename vector<T>::iterator b = v.begin ();
-    typename vector<T>::iterator e = v.begin ();
-    if (lower == VPOS)
-      {
-	lower = 0;
-	upper = v.size ();
-      }
-    ::std::sort (b + lower, e + upper, compare);
-  }
-#else
-  // ugh, c&p
-template<typename T> void
-vector_sort (vector<T> &v, int (*compare) (T const &, T const &),
-	     vsize lower=VPOS, vsize upper=VPOS)
+template<typename T, typename Compare>
+void
+vector_sort (vector<T> &v,
+	     Compare less,
+	     vsize b=0, vsize e=VPOS)
 {
-  if (lower == VPOS)
-    {
-      lower = 0;
-      upper = v.size () - 1;
-    }
-  if (upper == VPOS || lower >= upper)
-    return;
-  v.swap (lower, (lower + upper) / 2);
-  vsize last = lower;
-  for (vsize i = lower +1; i <= upper; i++)
-    if (compare (v[i], v[lower]) < 0)
-      v.swap (++last, i);
-  v.swap (lower, last);
-  vector_sort (v, compare, lower, last - 1);
-  vector_sort (v, compare, last + 1, upper);
-}
-  
-#endif
+  if (e == VPOS)
+    e = v.size ();
 
+  sort (v.begin () + b, v.begin () + e, less);
 }
 
+template<typename T>
+void
+reverse (vector<T> &v)
+{
+  // CHECKME: for a simple vector, like vector<int>, this should
+  // expand to memrev.
+  reverse (v.begin (), v.end ());
+}
 
+template<typename T>
+void
+uniq (vector<T> &v)
+{
+  v.erase (unique (v.begin (), v.end ()), v.end ());
+}
 
-#else /* ! STD_VECTOR */
-
-namespace std {
-
-#ifndef Array  
-#define vector Array
-#endif
-
-  using namespace std;
-  
-#ifndef VSIZE
-#define VSIZE
-  typedef int vsize;
-#define VPOS -1
-#endif
-
+template<typename T>
+typename vector<T>::const_iterator
+find (vector<T> const &v, T const &key)
+{
+  return find (v.begin (), v.end (), key);
 }
 
+#if HAVE_BOOST_LAMBDA_LAMBDA_HPP
+#include <boost/lambda/lambda.hpp>
+using namespace boost::lambda;
+template<typename T>
+void
+junk_pointers (vector<T> &v)
+{
+  for_each (v.begin (), v.end (), (delete _1, _1 = 0));
+  v.clear ();
+}
+#else
 
-#endif /* STD_VECTOR */
+template<typename T> struct del : public unary_function<T, void>
+{
+  void operator() (T x)
+  {
+    delete x;
+    x = 0;
+  }
+};
 
 template<typename T>
-int default_compare (T const &a, T const &b)
+void
+junk_pointers (vector<T> &v)
 {
-   if (a < b)
-     return -1;
-   else if (a > b)
-     return 1;
-   else
-     return 0;
+  // Hmm.
+  for_each (v.begin (), v.end (), del<T> ());
+  v.clear ();
 }
- 
+#endif /* HAVE_BOOST_LAMBDA */
+
+vector<string> string_split (string str, char c);
+string string_join (vector<string> const &strs, string infix);
 
-#include "array.hh"
+#define iterof(i,s) typeof((s).begin()) i((s).begin())
 
 #endif /* STD_VECTOR_HH */