mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-16 20:19:48 +08:00
285b36d6a5
2003-11-11 Doug Gregor <gregod@cs.rpi.edu> * docs/html/debug.html: Document libstdc++ debug mode. * docs/html/debug_mode.html: Document libstdc++ debug mode design. * docs/html/test.html: Document how to test under debug mode. * docs/html/17_intro/howto.html: Document debug-mode macros. * include/Makefile.am: Install debug-mode headers. * src/Makefile.am: Include debug.cc. * include/bits/basic_string.tcc: (basic_string::_S_construct): Fix NULL pointer check. (__is_null_pointer): New. Add precondition annotations. * include/bits/stream_iterator.h (istream_iterator, ostream_iterator): Added precondition annotations. * include/bits/streambuf_iterator.h (istreambuf_iterator): Ditto. * include/bits/stl_queue.h (queue, priority_queue): Ditto. * include/bits/stl_stack.h (stack): Ditto. * include/bits/basic_string.h (basic_string): Ditto. * include/bits/basic_string.tcc (basic_string): Ditto. * include/std/std_memory.h (auto_ptr): Ditto. * include/std/std_valarray.h (valarray): Ditto. * include/bits/stl_algo.h: Added algorithm precondition annotations. * include/bits/stl_algobase.h: Added algorithm precondition annotations. * include/bits/stl_numeric.h: Ditto. * include/ext/algorithm: Added algorithm precondition annotations. (__is_heap): Moved away from here. * include/bits/stl_heap.h: Added algorithm precondition annotations. (__is_heap): Moved to the top of this file. (__is_heap): Added iterator range overloads. * testsuite/20_util/auto_ptr_neg.cc: Fix line numbers to match up with changes in std_memory.h. * testsuite/23_containers/list/operators/4.cc: Don't verify performance guarantees when in debug mode. * testsuite/23_containers/bitset/invalidation/1.cc: New. * testsuite/23_containers/deque/invalidation/1.cc: New. * testsuite/23_containers/deque/invalidation/2.cc: New. * testsuite/23_containers/deque/invalidation/3.cc: New. * testsuite/23_containers/deque/invalidation/4.cc: New. * testsuite/23_containers/list/invalidation/1.cc: New. * testsuite/23_containers/list/invalidation/2.cc: New. * testsuite/23_containers/list/invalidation/3.cc: New. * testsuite/23_containers/list/invalidation/4.cc: New. * testsuite/23_containers/map/invalidation/1.cc: New. * testsuite/23_containers/map/invalidation/2.cc: New. * testsuite/23_containers/multimap/invalidation/1.cc: New. * testsuite/23_containers/multimap/invalidation/2.cc: New. * testsuite/23_containers/multiset/invalidation/1.cc: New. * testsuite/23_containers/multiset/invalidation/2.cc: New. * testsuite/23_containers/set/invalidation/1.cc: New. * testsuite/23_containers/set/invalidation/2.cc: New. * testsuite/23_containers/vector/invalidation/1.cc: New. * testsuite/23_containers/vector/invalidation/2.cc: New. * testsuite/23_containers/vector/invalidation/3.cc: New. * testsuite/23_containers/vector/invalidation/4.cc: New. * testsuite/25_algorithms/heap.cc: Don't verify performance guarantees when in debug mode. * include/debug/bitset: New. * include/debug/debug.h: New. * include/debug/deque: New. * include/debug/formatter.h: New. * include/debug/hash_map: New. * include/debug/hash_map.h: New. * include/debug/hash_multimap.h: New. * include/debug/hash_set: New. * include/debug/hash_set.h: New. * include/debug/hash_multiset.h: New. * include/debug/list: New. * include/debug/map: New. * include/debug/map.h: New. * include/debug/multimap.h: New. * include/debug/multiset.h: New. * include/debug/safe_base.h: New. * include/debug/safe_iterator.h: New. * include/debug/safe_iterator.tcc: New. * include/debug/safe_sequence.h: New. * include/debug/set: New. * include/debug/set.h: New. * include/debug/string: New. * include/debug/vector: New. * src/debug.cc: New. * config/linker-map.gnu: Add debug mode symbols. 2003-11-11 Benjamin Kosnik <bkoz@redhat.com> * src/string-inst.cc: Tweak namespaces. * src/misc-inst.cc: Same. * docs/html/debug.html: Edits. * config/link-map.gnu: Remove cruft. * include/bits/c++config: Add in namespace associations. * include/std/std_bitset.h: Adjust namespace to __gnu_norm, comment tweaks. * include/bits/deque.tcc: Same. * include/bits/list.tcc: Same. * include/bits/stl_bvector.h: Same. * include/bits/stl_deque.h: Same. * include/bits/stl_list.h: Same. * include/bits/stl_map.h: Same. * include/bits/stl_multimap.h: Same. * include/bits/stl_multiset.h: Same. * include/bits/stl_set.h: Same. * include/bits/stl_vector.h: Same. * include/bits/vector.tcc: Same. * include/std/std_algorithm.h: Remove markup comments. * include/std/std_functional.h: Same. * include/std/std_iterator.h: Same. * include/std/std_numeric.h: Same. * include/std/std_utility.h: Same. * include/bits/stl_queue.h: Formatting tweaks. * include/bits/stl_stack.h: Same. * include/std/std_deque.h: Include debugging version in debug mode. * include/std/std_list.h: Same. * include/std/std_map.h: Same. * include/std/std_set.h: Same. * include/std/std_vector.h: Same. * include/std/std_queue.h: Use deque, vector. * include/std/std_stack.h: Same. From-SVN: r73459
141 lines
3.5 KiB
C++
141 lines
3.5 KiB
C++
// Copyright (C) 2001 Free Software Foundation, Inc.
|
|
//
|
|
// This file is part of the GNU ISO C++ Library. This library 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 2, or (at your option)
|
|
// any later version.
|
|
|
|
// This library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without Pred 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 this library; see the file COPYING. If not, write to the Free
|
|
// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
|
// USA.
|
|
|
|
// 25.3.6 Heap operations [lib.alg.heap.operations]
|
|
|
|
#include <algorithm>
|
|
//#include <cmath>
|
|
#include <testsuite_hooks.h>
|
|
|
|
bool test __attribute__((unused)) = true;
|
|
|
|
const int A[] = {1, 11, 12, 3, 10, 6, 17, 4, 8, 2, 5, 13, 9, 15, 14, 16, 7};
|
|
const int B[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
|
|
const int C[] = {17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1};
|
|
const int N = sizeof(A) / sizeof(int);
|
|
|
|
// This functor has the equivalent functionality of std::geater<>,
|
|
// but there is no dependency on <functional> and it also tracks the
|
|
// number of invocations since creation.
|
|
class Gt
|
|
{
|
|
public:
|
|
static int count() { return itsCount; }
|
|
static void reset() { itsCount = 0; }
|
|
|
|
bool
|
|
operator()(const int& x, const int& y)
|
|
{
|
|
++itsCount;
|
|
return x > y;
|
|
}
|
|
|
|
private:
|
|
static int itsCount;
|
|
};
|
|
|
|
int Gt::itsCount = 0;
|
|
|
|
// Exercise all of the heap functions for operator<. The
|
|
// intermediate results between push_heap and pop_heap and
|
|
// make_heap and sort_heap are not checked (they could be).
|
|
void
|
|
test01()
|
|
{
|
|
// sort array s1 using push_heap/pop_heap
|
|
int s1[N];
|
|
std::copy(A, A + N, s1);
|
|
VERIFY(std::equal(s1, s1 + N, A));
|
|
|
|
for (int i = 2; i <= N; ++i) {
|
|
std::push_heap(s1, s1 + i);
|
|
}
|
|
for (int i = N; i >= 2; --i) {
|
|
std::pop_heap(s1, s1 + i);
|
|
}
|
|
VERIFY(std::equal(s1, s1 + N, B));
|
|
|
|
// sort array s2 using make_heap/sort_heap
|
|
int s2[N];
|
|
std::copy(A, A + N, s2);
|
|
VERIFY(std::equal(s2, s2 + N, A));
|
|
|
|
std::make_heap(s2, s2 + N);
|
|
std::sort_heap(s2, s2 + N);
|
|
VERIFY(std::equal(s2, s2 + N, B));
|
|
}
|
|
|
|
// Perform same tests as above but with the comparison predicate
|
|
// versions, and add complexity constraint checks.
|
|
void
|
|
test02()
|
|
{
|
|
Gt gt;
|
|
// const int logN = static_cast<int>(std::log(static_cast<double>(N)) + 0.5);
|
|
const int logN = 3;
|
|
|
|
int s1[N];
|
|
std::copy(A, A + N, s1);
|
|
VERIFY(std::equal(s1, s1 + N, A));
|
|
|
|
for (int i = 2; i <= N; ++i) {
|
|
std::push_heap(s1, s1 + i, gt);
|
|
#ifndef _GLIBCXX_DEBUG
|
|
VERIFY(gt.count() <= logN);
|
|
#endif
|
|
gt.reset();
|
|
}
|
|
|
|
for (int i = N; i >= 2; --i) {
|
|
std::pop_heap(s1, s1 + i, gt);
|
|
#ifndef _GLIBCXX_DEBUG
|
|
VERIFY(gt.count() <= 2 * logN);
|
|
#endif
|
|
gt.reset();
|
|
}
|
|
|
|
VERIFY(std::equal(s1, s1 + N, C));
|
|
|
|
// sort array s2 using make_heap/sort_heap
|
|
int s2[N];
|
|
std::copy(A, A + N, s2);
|
|
VERIFY(std::equal(s2, s2 + N, A));
|
|
|
|
std::make_heap(s2, s2 + N, gt);
|
|
#ifndef _GLIBCXX_DEBUG
|
|
VERIFY(gt.count() <= 3 * N);
|
|
#endif
|
|
gt.reset();
|
|
|
|
std::sort_heap(s2, s2 + N, gt);
|
|
#ifndef _GLIBCXX_DEBUG
|
|
VERIFY(gt.count() <= N * logN);
|
|
#endif
|
|
|
|
VERIFY(std::equal(s2, s2 + N, C));
|
|
}
|
|
|
|
int
|
|
main()
|
|
{
|
|
test01();
|
|
test02();
|
|
|
|
return 0;
|
|
}
|