/*
- std-vector.hh -- declare vector
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
+ Copyright (C) 2006--2015 Jan Nieuwenhuizen <janneke@gnu.org>
- (c) 2006 Jan Nieuwenhuizen <janneke@gnu.org>
+ 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/>.
*/
#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 "config.hh" /* needed at least for HAVE_STL_DATA_METHOD */
#include <algorithm> /* find, reverse, sort */
#include <functional> /* unary_function */
#include <cassert>
+#include <string>
using namespace std;
-#if HAVE_BOOST_LAMBDA
-#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)
+ else if (b < a)
return 1;
else
return 0;
#if HAVE_STL_DATA_METHOD
#include <vector>
#else /* !HAVE_STL_DATA_METHOD */
-#define vector __vector
+#define vector __flower_vector
#include <vector>
#undef vector
-namespace std {
+namespace std
+{
+
+/* Interface without pointer arithmetic (iterator) semantics. */
+template<typename T, typename A = std::allocator<T> >
+class vector : public __flower_vector<T, A>
+{
+public:
+ typedef typename __flower_vector<T>::iterator iterator;
+ typedef typename __flower_vector<T>::const_iterator const_iterator;
+
+ vector<T, A> () : __flower_vector<T, A> ()
+ {
+ }
+
+ vector<T, A> (size_t n) : __flower_vector<T, A> (n)
+ {
+ }
+
+ vector<T, A> (vector<T, A> const &v) : __flower_vector<T, A> (v)
+ {
+ }
- /* Interface without pointer arithmetic (iterator) semantics. */
- template<typename T, typename A=std::allocator<T> >
- class vector : public __vector<T, A>
+ vector<T, A> (const_iterator b, const_iterator e) : __flower_vector<T, A> (b, e)
{
- public:
- typedef typename __vector<T>::iterator iterator;
- typedef typename __vector<T>::const_iterator const_iterator;
-
- vector<T, A> () : __vector<T, A> ()
- {
- }
-
- vector<T, A> (vector<T, A> const& v) : __vector<T, A> (v)
- {
- }
-
- vector<T, A> (const_iterator b, const_iterator e) : __vector<T, A> (b, e)
- {
- }
-
- T*
- data ()
- {
- return &(*this)[0];
- }
-
- T const*
- data () const
- {
- return &(*this)[0];
- }
- };
+ }
+
+ T *
+ data ()
+ {
+ return &(*this)[0];
+ }
+
+ T const *
+ data () const
+ {
+ return &(*this)[0];
+ }
+};
} /* namespace std */
}
template<typename T>
-T&
+T &
back (vector<T> &v, vsize i)
{
return v[v.size () - i - 1];
template<typename T>
void
-concat (vector<T> &v, vector<T> const& w)
+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)
+template<typename T, typename Compare>
+vsize
+lower_bound (vector<T> const &v,
+ T const &key,
+ Compare less,
+ vsize b = 0, vsize e = VPOS)
{
- if (*lo >= *hi)
- return;
-
- 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);
-}
+ if (e == VPOS)
+ e = v.size ();
+ typename vector<T>::const_iterator i = lower_bound (v.begin () + b,
+ v.begin () + e,
+ key,
+ less);
-template<typename T>
-void
-binary_search_bounds (vector<T*> const &table,
- T const *key, int (*compare) (T *const &, T *const &),
- vsize *lo,
- vsize *hi)
-{
- vsize cmp;
- int result;
-
- /* binary search */
- do
- {
- cmp = (*lo + *hi) / 2;
-
- result = (*compare) ((T *) key, table[cmp]);
-
- if (result < 0)
- *hi = cmp;
- else
- *lo = cmp;
- }
- while (*hi - *lo > 1);
+ return i - v.begin ();
}
-#if 0
-/* FIXME: what if COMPARE is named: int operator == (T const&, T const&),
- wouldn't that work for most uses of BINARY_SEARCH?
-*/
-template<typename T>
+template<typename T, typename Compare>
vsize
-binary_search (vector<T> const &v,
- T const &key, int (*compare) (T const &, T const &),
- vsize b=0, vsize e=VPOS)
+upper_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 = find (v.begin () + b,
- v.begin () + e,
- key);
- if (i != v.end ())
- return i - v.begin ();
- return VPOS;
+
+ typename vector<T>::const_iterator i = upper_bound (v.begin () + b,
+ v.begin () + e,
+ key,
+ less);
+
+ return i - v.begin ();
}
-#else // c&p from array.icc; cannot easily use stl_algo:find b.o. compare func.
-template<class T>
+
+template<typename T, typename Compare>
vsize
-binary_search (vector<T> const &table,
- T const &key,
- int (*compare) (T const &, T const &),
- vsize lo=0,
- vsize hi=VPOS)
+binary_search (vector<T> const &v,
+ T const &key,
+ Compare less,
+ vsize b = 0, vsize e = VPOS)
{
- if (hi == VPOS)
- hi = table.size ();
+ vsize lb = lower_bound (v, key, less, b, e);
- if (lo >= hi)
+ if (lb == v.size () || less (key, v[lb]))
return VPOS;
-
- binary_search_bounds (table, key, compare, &lo, &hi);
-
- if (! (*compare) (key, table[lo]))
- return lo;
-
- /* not found */
- return VPOS;
+ return lb;
}
-
-#endif
-
-
-#if 0
-/* FIXME: the COMPARE functionality is broken? */
-template<typename T>
+template<typename T, typename Compare>
void
-vector_sort (vector<T> &v, int (*compare) (T const &, T const &),
- vsize lower=VPOS, vsize upper=VPOS)
+vector_sort (vector<T> &v,
+ Compare less,
+ vsize b = 0, vsize e = VPOS)
{
- typename vector<T>::iterator b = v.begin ();
- typename vector<T>::iterator e = v.begin ();
- if (lower == VPOS)
- {
- lower = 0;
- upper = v.size ();
- }
- sort (b + lower, e + upper, compare);
-}
-#else
+ 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);
+ sort (v.begin () + b, v.begin () + e, less);
}
-#endif
template<typename T>
void
return find (v.begin (), v.end (), key);
}
-#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
-
template<typename T> struct del : public unary_function<T, void>
{
- void operator() (T x)
+ void operator () (T x)
{
delete x;
x = 0;
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, const string &infix);
+
+#define iterof(i,s) typeof((s).begin()) i((s).begin())
#endif /* STD_VECTOR_HH */
projects / lilypond.git / blobdiff