/*
- 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
+#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 HAVE_BOOST_LAMBDA
+#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 (a > b)
- return 1;
- else
- return 0;
+ if (a < b)
+ return -1;
+ else if (b < a)
+ return 1;
+ else
+ return 0;
}
template<typename T>
return 0;
}
-#if !STD_VECTOR
-/* Also declare vector, in the wrong way. */
-#include <algorithm>
-#include <iostream>
-#include <sstream>
-#endif
-
#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
-
- 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];
- }
-
- template<typename T>
- T &
- boundary (vector<T> &v, int dir, vsize i)
- {
- assert (dir);
- return v[dir == -1 ? i : v.size () - 1 - i];
- }
-
- template<typename T>
- T const &
- back (vector<T> const &v, vsize i)
- {
- return v[v.size () - i - 1];
- }
-
- template<typename T>
- T&
- back (vector<T> &v, vsize i)
+ /* Interface without pointer arithmetic (iterator) semantics. */
+ template<typename T, typename A=std::allocator<T> >
+ class vector : public __vector<T, A>
{
- return v[v.size () - i - 1];
- }
+ public:
+ typedef typename __vector<T>::iterator iterator;
+ typedef typename __vector<T>::const_iterator const_iterator;
- template<typename T>
- void
- concat (vector<T> &v, vector<T> const& w)
- {
- v.insert (v.end (), w.begin (), w.end ());
- }
-
- template<class T>
- void
- binary_search_bounds (vector<T> const &table,
- T const &key, int (*compare) (T const &, T const &),
- vsize *lo,
- vsize *hi)
- {
- if (*lo >= *hi)
- return;
+ vector<T, A> () : __vector<T, A> ()
+ {
+ }
- int cmp;
- int result;
+ vector<T, A> (vector<T, A> const& v) : __vector<T, A> (v)
+ {
+ }
- /* binary search */
- do
- {
- cmp = (*lo + *hi) / 2;
+ vector<T, A> (const_iterator b, const_iterator e) : __vector<T, A> (b, e)
+ {
+ }
- result = (*compare) (key, table[cmp]);
+ T*
+ data ()
+ {
+ return &(*this)[0];
+ }
- if (result < 0)
- *hi = cmp;
- else
- *lo = cmp;
- }
- while (*hi - *lo > 1);
- }
+ T const*
+ data () const
+ {
+ return &(*this)[0];
+ }
+ };
-#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;
- if (e == VPOS)
- e = v.size ();
- typename vector<T>::const_iterator i = find (v.begin () + b,
- v.begin () + 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>
- 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 ();
+} /* namespace std */
- if (lo >= hi)
- return VPOS;
+#endif /* !HAVE_STL_DATA_METHOD */
- binary_search_bounds (table, key, compare, &lo, &hi);
+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];
+}
- if (! (*compare) (key, table[lo]))
- return lo;
+template<typename T>
+T &
+boundary (vector<T> &v, int dir, vsize i)
+{
+ assert (dir);
+ return v[dir == -1 ? i : v.size () - 1 - i];
+}
- /* not found */
- return VPOS;
- }
+template<typename T>
+T const &
+back (vector<T> const &v, vsize i)
+{
+ return v[v.size () - i - 1];
+}
+template<typename T>
+T&
+back (vector<T> &v, vsize i)
+{
+ return v[v.size () - i - 1];
+}
-#endif
+template<typename T>
+void
+concat (vector<T> &v, vector<T> const& w)
+{
+ v.insert (v.end (), w.begin (), w.end ());
+}
+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 ();
+}
-#if 0
- /* FIXME: the COMPARE functionality is broken? */
- 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
+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 ();
- // ugh, c&p
- template<typename T> void
- vector_sort (vector<T> &v, int (*compare) (T const &, T const &),
- vsize lower=VPOS, vsize upper=VPOS)
- {
- if (lower == VPOS)
- {
- lower = 0;
- upper = v.size () - 1;
- }
- if (upper == VPOS || lower >= upper)
- return;
- swap (v[lower], v[(lower + upper) / 2]);
- vsize last = lower;
- for (vsize i = lower +1; i <= upper; i++)
- if (compare (v[i], v[lower]) < 0)
- swap (v[++last], v[i]);
- swap (v[lower], v[last]);
- vector_sort (v, compare, lower, last - 1);
- vector_sort (v, compare, last + 1, upper);
- }
-#endif
-
- template<typename T>
- void
- reverse (vector<T> &v)
- {
- // CHECKME: for a simple vector, like vector<int>, this should
- // expand to memrev.
- ::std::reverse (v.begin (), v.end ());
- }
+ typename vector<T>::const_iterator i = upper_bound (v.begin () + b,
+ v.begin () + e,
+ key,
+ less);
- template<typename T>
- void
- uniq (vector<T> &v)
- {
- v.erase (unique (v.begin (), v.end ()), v.end ());
- }
+ return i - v.begin ();
+}
- template<typename T>
- typename vector<T>::const_iterator
- find (vector<T> const &v, T const &key)
- {
- return ::std::find (v.begin (), v.end (), key);
- }
+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);
-#if HAVE_BOOST_LAMBDA
-#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
+ if (lb == v.size () || less (key, v[lb]))
+ return VPOS;
+ return lb;
+}
- template<typename T> struct del : public unary_function<T, void>
- {
- void operator() (T x)
- {
- delete x;
- x = 0;
- }
- };
+template<typename T, typename Compare>
+void
+vector_sort (vector<T> &v,
+ Compare less,
+ vsize b=0, vsize e=VPOS)
+{
+ if (e == VPOS)
+ e = v.size ();
- template<typename T>
- void
- junk_pointers (vector<T> &v)
- {
- // Hmm.
- ::std::for_each (v.begin (), v.end (), del<T> ());
- v.clear ();
- }
-#endif /* HAVE_BOOST_LAMBDA */
+ 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 ());
}
-#else /* ! STD_VECTOR */
+template<typename T>
+void
+uniq (vector<T> &v)
+{
+ v.erase (unique (v.begin (), v.end ()), v.end ());
+}
-namespace std {
+template<typename T>
+typename vector<T>::const_iterator
+find (vector<T> const &v, T const &key)
+{
+ return find (v.begin (), v.end (), key);
+}
-#ifndef Array
-#define vector Array
-#endif
+#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
- using namespace std;
-
-#ifndef VSIZE
-#define VSIZE
- typedef int vsize;
-#define VPOS -1
-#endif
+template<typename T> struct del : public unary_function<T, void>
+{
+ void operator() (T x)
+ {
+ delete x;
+ x = 0;
+ }
+};
+template<typename T>
+void
+junk_pointers (vector<T> &v)
+{
+ // Hmm.
+ for_each (v.begin (), v.end (), del<T> ());
+ v.clear ();
}
+#endif /* HAVE_BOOST_LAMBDA */
-#include "array.hh"
-#include "parray.hh"
-
-#endif /* !STD_VECTOR */
+vector<string> string_split (string str, char c);
+string string_join (vector<string> const &strs, string infix);
-using namespace std;
+#define iterof(i,s) typeof((s).begin()) i((s).begin())
#endif /* STD_VECTOR_HH */
projects / lilypond.git / blobdiff