/*
- std-vector.hh -- declare std::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
-#include <algorithm> // reverse, sort
+#if 0
-#if !STD_VECTOR
-/* Also declare vector, in the wrong way. */
-#include <algorithm>
-#include <iostream>
-#include <sstream>
+/*
+ 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;
+
+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
-#define vector __vector
+#if HAVE_STL_DATA_METHOD
+#include <vector>
+#else /* !HAVE_STL_DATA_METHOD */
+#define vector __flower_vector
#include <vector>
#undef vector
-namespace std {
+namespace std
+{
- #ifndef VSIZE
- #define VSIZE
- typedef size_t vsize;
- #define VPOS UINT_MAX
- #endif
+/* 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;
- /* Interface without pointer arithmetic (iterator) semantics. */
- template<typename T>
- class vector : public __vector<T>
+ vector<T, A> () : __flower_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)
- {
- }
-
- void
- concat (vector<T> const &v)
- {
- __vector<T>::insert (this->end (), v.begin (), v.end ());
- }
-
- /* Flower-Array compatibility. */
- T const &
- boundary (int dir, vsize i) const
- {
- assert (dir);
- if (dir == 1)
- return this->top (i);
- else
- return this->at (i);
- }
-
- T &
- boundary (int dir, vsize i)
- {
- assert (dir);
- if (dir == 1)
- return this->top (i);
- else
- return this->at (i);
- }
-
- T const &
- elem (vsize i) const
- {
- return this->at (i);
- }
-
- T &
- elem (vsize i)
- {
- return this->at (i);
- }
-
-#if 1 // FIXME, silly, but keep for s/r
- T const &
- elem_ref (vsize i) const
- {
- return elem (i);
- }
-
- T &
- elem_ref (vsize i)
- {
- return elem (i);
- }
-#endif
+ }
-#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
+ vector<T, A> (size_t n) : __flower_vector<T, A> (n)
+ {
+ }
- void
- reverse ()
- {
- // CHECKME: for a simple vector, like vector<int>, this should
- // expand to memrev.
- ::std::reverse (this->begin (), this->end ());
- }
-
- void swap (vsize i, vsize j)
- {
- T t ((*this)[i]);
- (*this)[i] = (*this)[j];
- (*this)[j] = t;
- }
-
- T const &
- top (vsize i) const
- {
- return (*this)[this->size () - i - 1];
- }
-
- 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)
+ vector<T, A> (vector<T, A> const &v) : __flower_vector<T, A> (v)
{
- //(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)
+
+ vector<T, A> (const_iterator b, const_iterator e) : __flower_vector<T, A> (b, e)
{
- 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<class T>
- vsize
- binary_search (vector<T> const &table,
- T const &key, int (*compare) (T const &, T const &),
- vsize lo=0,
- vsize hi=VPOS)
+ T *
+ data ()
{
- if (hi == VPOS)
- hi = table.size ();
+ return &(*this)[0];
+ }
- binary_search_bounds (table, key, compare, &lo, &hi);
+ T const *
+ data () const
+ {
+ return &(*this)[0];
+ }
+};
- if (! (*compare) (key, table[lo]))
- return lo;
+} /* namespace std */
- /* not found */
- return VPOS;
- }
-#endif
+#endif /* !HAVE_STL_DATA_METHOD */
+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 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>
+T &
+boundary (vector<T> &v, int dir, vsize i)
{
- 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);
+ assert (dir);
+ return v[dir == -1 ? i : v.size () - 1 - i];
}
-
-#endif
+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];
+}
+template<typename T>
+void
+concat (vector<T> &v, vector<T> const &w)
+{
+ v.insert (v.end (), w.begin (), w.end ());
+}
-#else /* ! STD_VECTOR */
+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 ();
+}
-namespace std {
+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 ();
-#ifndef Array
-#define vector Array
-#endif
+ typename vector<T>::const_iterator i = upper_bound (v.begin () + b,
+ v.begin () + e,
+ key,
+ less);
- using namespace std;
-
-#ifndef VSIZE
-#define VSIZE
- typedef int vsize;
-#define VPOS -1
-#endif
+ return i - v.begin ();
+}
+
+template<typename T, typename Compare>
+vsize
+binary_search (vector<T> const &v,
+ T const &key,
+ Compare less,
+ vsize b = 0, vsize e = VPOS)
+{
+ vsize lb = lower_bound (v, key, less, b, e);
+ if (lb == v.size () || less (key, v[lb]))
+ return VPOS;
+ return lb;
}
+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 ();
-#endif /* STD_VECTOR */
+ sort (v.begin () + b, v.begin () + e, less);
+}
template<typename T>
-int default_compare (T const &a, T const &b)
+void
+reverse (vector<T> &v)
{
- if (a < b)
- return -1;
- else if (a > b)
- return 1;
- else
- return 0;
+ // CHECKME: for a simple vector, like vector<int>, this should
+ // expand to memrev.
+ reverse (v.begin (), v.end ());
}
-
-#include "array.hh"
+template<typename T>
+void
+uniq (vector<T> &v)
+{
+ v.erase (unique (v.begin (), v.end ()), v.end ());
+}
+
+template<typename T>
+typename vector<T>::const_iterator
+find (vector<T> const &v, T const &key)
+{
+ return find (v.begin (), v.end (), key);
+}
+
+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 ();
+}
+
+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