From f5783e34f97cd9012ae3ee4118a5e3bf642d8aed Mon Sep 17 00:00:00 2001 From: Chris Jefferson Date: Wed, 3 Oct 2007 17:27:18 +0000 Subject: [PATCH] moveable.cc: New. 2007-10-03 Chris Jefferson Benjamin Kosnik * testsuite/20_util/pair/moveable.cc: New. Merge from libstdcxx_so_7-branch. * testsuite/23_containers/deque/capacity/moveable.cc: Same. * testsuite/23_containers/deque/cons/moveable.cc: Same. * testsuite/23_containers/deque/modifiers/moveable.cc: Same. * testsuite/23_containers/deque/moveable.cc: Same. * testsuite/23_containers/list/moveable.cc: Same. * testsuite/23_containers/map/moveable.cc: Same. * testsuite/23_containers/multimap/moveable.cc: Same. * testsuite/23_containers/multiset/moveable.cc: Same. * testsuite/23_containers/set/moveable.cc: Same. * testsuite/23_containers/vector/cons/moveable.cc: Same. * testsuite/23_containers/vector/modifiers/moveable.cc: Same. * testsuite/23_containers/vector/moveable.cc: Same. * testsuite/23_containers/vector/resize/moveable.cc: Same. * testsuite/25_algorithms/heap/moveable.cc: Same. * testsuite/25_algorithms/nth_element/moveable.cc: Same. * testsuite/25_algorithms/partial_sort/moveable.cc: Same. * testsuite/25_algorithms/partition/moveable.cc: Same. * testsuite/25_algorithms/remove_if/moveable.cc: Same. * testsuite/25_algorithms/remove/moveable.cc: Same. * testsuite/25_algorithms/reverse/moveable.cc: Same. * testsuite/25_algorithms/rotate/moveable.cc: Same. * testsuite/25_algorithms/sort/moveable.cc: Same. * testsuite/25_algorithms/swap_ranges/moveable.cc: Same. * testsuite/25_algorithms/unique/moveable.cc: Same. * testsuite/util/testsuite_rvalref.h: New. * testsuite/25_algorithms/equal/equal.cc: Move to... * testsuite/25_algorithms/equal/no_operator_ne.cc: ...this. * testsuite/25_algorithms/heap/heap.cc: Move to... * testsuite/25_algorithms/heap/1.cc: ...this. * testsuite/25_algorithms/lower_bound/lower_bound.cc: Move to... * testsuite/25_algorithms/lower_bound/no_operator_ne.cc: ...this. * testsuite/25_algorithms/partition/partition.cc: Move to... * testsuite/25_algorithms/partition/1.cc: ...this. * testsuite/25_algorithms/stable_partition/1.cc: ... and this. * testsuite/25_algorithms/search/1.cc: Update from merge. * testsuite/25_algorithms/search/check_type.cc: Same. * testsuite/lib/dg-options.exp (dg-require-rvalref): New. * testsuite/lib/libstdc++.exp (check_v3_target_rvalref): New. Co-Authored-By: Benjamin Kosnik From-SVN: r128990 --- libstdc++-v3/ChangeLog | 54 +++++- libstdc++-v3/testsuite/20_util/pair/moveable.cc | 73 ++++++++ .../23_containers/deque/capacity/moveable.cc | 82 +++++++++ .../testsuite/23_containers/deque/cons/moveable.cc | 65 +++++++ .../23_containers/deque/modifiers/moveable.cc | 144 +++++++++++++++ .../testsuite/23_containers/deque/moveable.cc | 52 ++++++ .../testsuite/23_containers/list/moveable.cc | 52 ++++++ .../testsuite/23_containers/map/moveable.cc | 53 ++++++ .../testsuite/23_containers/multimap/moveable.cc | 52 ++++++ .../testsuite/23_containers/multiset/moveable.cc | 53 ++++++ .../testsuite/23_containers/set/moveable.cc | 53 ++++++ .../23_containers/vector/cons/moveable.cc | 65 +++++++ .../23_containers/vector/modifiers/moveable.cc | 147 ++++++++++++++++ .../testsuite/23_containers/vector/moveable.cc | 72 ++++++++ .../23_containers/vector/resize/moveable.cc | 85 +++++++++ .../equal/{equal.cc => no_operator_ne.cc} | 0 .../testsuite/25_algorithms/heap/{heap.cc => 1.cc} | 0 .../testsuite/25_algorithms/heap/moveable.cc | 120 +++++++++++++ .../{lower_bound.cc => no_operator_ne.cc} | 0 .../25_algorithms/nth_element/moveable.cc | 76 ++++++++ .../25_algorithms/partial_sort/moveable.cc | 70 ++++++++ .../25_algorithms/partition/{partition.cc => 1.cc} | 15 -- .../testsuite/25_algorithms/partition/moveable.cc | 90 ++++++++++ .../testsuite/25_algorithms/remove/moveable.cc | 68 ++++++++ .../testsuite/25_algorithms/remove_if/moveable.cc | 68 ++++++++ .../testsuite/25_algorithms/reverse/moveable.cc | 45 +++++ .../testsuite/25_algorithms/rotate/moveable.cc | 79 +++++++++ libstdc++-v3/testsuite/25_algorithms/search/1.cc | 50 ++++++ .../testsuite/25_algorithms/search/check_type.cc | 37 +++- .../testsuite/25_algorithms/sort/moveable.cc | 64 +++++++ .../testsuite/25_algorithms/stable_partition/1.cc | 56 ++++++ .../25_algorithms/swap_ranges/moveable.cc | 45 +++++ .../testsuite/25_algorithms/unique/moveable.cc | 74 ++++++++ libstdc++-v3/testsuite/lib/dg-options.exp | 9 + libstdc++-v3/testsuite/lib/libstdc++.exp | 55 ++++++ libstdc++-v3/testsuite/util/testsuite_rvalref.h | 194 +++++++++++++++++++++ 36 files changed, 2296 insertions(+), 21 deletions(-) create mode 100644 libstdc++-v3/testsuite/20_util/pair/moveable.cc create mode 100644 libstdc++-v3/testsuite/23_containers/deque/capacity/moveable.cc create mode 100644 libstdc++-v3/testsuite/23_containers/deque/cons/moveable.cc create mode 100644 libstdc++-v3/testsuite/23_containers/deque/modifiers/moveable.cc create mode 100644 libstdc++-v3/testsuite/23_containers/deque/moveable.cc create mode 100644 libstdc++-v3/testsuite/23_containers/list/moveable.cc create mode 100644 libstdc++-v3/testsuite/23_containers/map/moveable.cc create mode 100644 libstdc++-v3/testsuite/23_containers/multimap/moveable.cc create mode 100644 libstdc++-v3/testsuite/23_containers/multiset/moveable.cc create mode 100644 libstdc++-v3/testsuite/23_containers/set/moveable.cc create mode 100644 libstdc++-v3/testsuite/23_containers/vector/cons/moveable.cc create mode 100644 libstdc++-v3/testsuite/23_containers/vector/modifiers/moveable.cc create mode 100644 libstdc++-v3/testsuite/23_containers/vector/moveable.cc create mode 100644 libstdc++-v3/testsuite/23_containers/vector/resize/moveable.cc rename libstdc++-v3/testsuite/25_algorithms/equal/{equal.cc => no_operator_ne.cc} (100%) rename libstdc++-v3/testsuite/25_algorithms/heap/{heap.cc => 1.cc} (100%) create mode 100644 libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc rename libstdc++-v3/testsuite/25_algorithms/lower_bound/{lower_bound.cc => no_operator_ne.cc} (100%) create mode 100644 libstdc++-v3/testsuite/25_algorithms/nth_element/moveable.cc create mode 100644 libstdc++-v3/testsuite/25_algorithms/partial_sort/moveable.cc rename libstdc++-v3/testsuite/25_algorithms/partition/{partition.cc => 1.cc} (87%) create mode 100644 libstdc++-v3/testsuite/25_algorithms/partition/moveable.cc create mode 100644 libstdc++-v3/testsuite/25_algorithms/remove/moveable.cc create mode 100644 libstdc++-v3/testsuite/25_algorithms/remove_if/moveable.cc create mode 100644 libstdc++-v3/testsuite/25_algorithms/reverse/moveable.cc create mode 100644 libstdc++-v3/testsuite/25_algorithms/rotate/moveable.cc create mode 100644 libstdc++-v3/testsuite/25_algorithms/sort/moveable.cc create mode 100644 libstdc++-v3/testsuite/25_algorithms/stable_partition/1.cc create mode 100644 libstdc++-v3/testsuite/25_algorithms/swap_ranges/moveable.cc create mode 100644 libstdc++-v3/testsuite/25_algorithms/unique/moveable.cc create mode 100644 libstdc++-v3/testsuite/util/testsuite_rvalref.h diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 66cf83f..09c73d6 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,50 @@ +2007-10-03 Chris Jefferson + Benjamin Kosnik + + * testsuite/20_util/pair/moveable.cc: New. Merge from + libstdcxx_so_7-branch. + * testsuite/23_containers/deque/capacity/moveable.cc: Same. + * testsuite/23_containers/deque/cons/moveable.cc: Same. + * testsuite/23_containers/deque/modifiers/moveable.cc: Same. + * testsuite/23_containers/deque/moveable.cc: Same. + * testsuite/23_containers/list/moveable.cc: Same. + * testsuite/23_containers/map/moveable.cc: Same. + * testsuite/23_containers/multimap/moveable.cc: Same. + * testsuite/23_containers/multiset/moveable.cc: Same. + * testsuite/23_containers/set/moveable.cc: Same. + * testsuite/23_containers/vector/cons/moveable.cc: Same. + * testsuite/23_containers/vector/modifiers/moveable.cc: Same. + * testsuite/23_containers/vector/moveable.cc: Same. + * testsuite/23_containers/vector/resize/moveable.cc: Same. + * testsuite/25_algorithms/heap/moveable.cc: Same. + * testsuite/25_algorithms/nth_element/moveable.cc: Same. + * testsuite/25_algorithms/partial_sort/moveable.cc: Same. + * testsuite/25_algorithms/partition/moveable.cc: Same. + * testsuite/25_algorithms/remove_if/moveable.cc: Same. + * testsuite/25_algorithms/remove/moveable.cc: Same. + * testsuite/25_algorithms/reverse/moveable.cc: Same. + * testsuite/25_algorithms/rotate/moveable.cc: Same. + * testsuite/25_algorithms/sort/moveable.cc: Same. + * testsuite/25_algorithms/swap_ranges/moveable.cc: Same. + * testsuite/25_algorithms/unique/moveable.cc: Same. + * testsuite/util/testsuite_rvalref.h: New. + + * testsuite/25_algorithms/equal/equal.cc: Move to... + * testsuite/25_algorithms/equal/no_operator_ne.cc: ...this. + * testsuite/25_algorithms/heap/heap.cc: Move to... + * testsuite/25_algorithms/heap/1.cc: ...this. + * testsuite/25_algorithms/lower_bound/lower_bound.cc: Move to... + * testsuite/25_algorithms/lower_bound/no_operator_ne.cc: ...this. + * testsuite/25_algorithms/partition/partition.cc: Move to... + * testsuite/25_algorithms/partition/1.cc: ...this. + * testsuite/25_algorithms/stable_partition/1.cc: ... and this. + + * testsuite/25_algorithms/search/1.cc: Update from merge. + * testsuite/25_algorithms/search/check_type.cc: Same. + + * testsuite/lib/dg-options.exp (dg-require-rvalref): New. + * testsuite/lib/libstdc++.exp (check_v3_target_rvalref): New. + 2007-10-03 Richard Sandiford * acinclude.m4 (GLIBCXX_ENABLE_C99): Temporarily add @@ -46,8 +93,13 @@ * testsuite/25_algorithms/upper_bound/2.cc: ... this. * testsuite/25_algorithms/lower_bound/2.cc: ... this. * testsuite/25_algorithms/equal_range/2.cc: ... and this. - * testsuite/25_algorithms/sort/vectorbool.cc: Add from + +2007-10-02 Chris Jefferson + + * testsuite/25_algorithms/search/1.cc: Merge from libstdcxx_so_7-branch. + * testsuite/25_algorithms/search/check_type.cc: Same. + * testsuite/25_algorithms/sort/vectorbool.cc: Same. 2007-09-30 Jonathan Wakely diff --git a/libstdc++-v3/testsuite/20_util/pair/moveable.cc b/libstdc++-v3/testsuite/20_util/pair/moveable.cc new file mode 100644 index 0000000..8a0e593 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/pair/moveable.cc @@ -0,0 +1,73 @@ +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2007 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 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 this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// NOTE: This makes use of the fact that we know how moveable +// is implemented on pair, and also vector. If the implementation +// changes this test may begin to fail. + +#include +#include +#include + +bool test __attribute__((unused)) = true; + +void +test1() +{ + std::pair a(1,1),b(2,2); + a=std::move(b); + VERIFY(a.first == 2 && a.second == 2 && b.first == 2 && b.second == 2); + std::pair c(std::move(a)); + VERIFY(c.first == 2 && c.second == 2 && a.first == 2 && a.second == 2); +} + +void +test2() +{ + std::vector v,w; + v.push_back(1); + w.push_back(2); + w.push_back(2); + std::pair > p = make_pair(1,v); + std::pair > q = make_pair(2,w); + p = std::move(q); + VERIFY(p.first == 2 && q.first == 2 && + p.second.size() == 2 && q.second.size() == 1); + std::pair > r(std::move(p)); + VERIFY(r.first == 2 && p.first == 2 && + r.second.size() == 2 && p.second.size() == 0); +} + +int +main() +{ + test1(); + test2(); +} diff --git a/libstdc++-v3/testsuite/23_containers/deque/capacity/moveable.cc b/libstdc++-v3/testsuite/23_containers/deque/capacity/moveable.cc new file mode 100644 index 0000000..109ab99 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/deque/capacity/moveable.cc @@ -0,0 +1,82 @@ +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2006, 2007 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 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 this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +#include +#include +#include + +using namespace __gnu_test; + +// According to n1771, there should be two resizes, with and without +// parameter. We only have one at present, whose second parameter defaults +// to a default-constructed object. +void +test01() +{ + bool test __attribute__((unused)) = true; + + std::deque a; + copycounter::copycount = 0; + a.resize(10); + a.resize(98); + a.resize(99); + a.resize(100); +#ifndef _GLIBCXX_DEBUG + VERIFY( copycounter::copycount == 100 ); +#else + VERIFY( copycounter::copycount == 100 + 4 ); +#endif + a.resize(99); + a.resize(0); +#ifndef _GLIBCXX_DEBUG + VERIFY( copycounter::copycount == 100 ); +#else + VERIFY( copycounter::copycount == 100 + 6 ); +#endif + a.resize(100); +#ifndef _GLIBCXX_DEBUG + VERIFY( copycounter::copycount == 200 ); +#else + VERIFY( copycounter::copycount == 200 + 7 ); +#endif + a.clear(); +#ifndef _GLIBCXX_DEBUG + VERIFY( copycounter::copycount == 200 ); +#else + VERIFY( copycounter::copycount == 200 + 7 ); +#endif +} + + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/23_containers/deque/cons/moveable.cc b/libstdc++-v3/testsuite/23_containers/deque/cons/moveable.cc new file mode 100644 index 0000000..1d93aeb --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/deque/cons/moveable.cc @@ -0,0 +1,65 @@ +// { dg-do compile } +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2007 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 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 this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +#include +#include +#include +#include + +using namespace __gnu_test; +typedef std::deque test_type; + +// Empty constructor doesn't require a copy constructor +void +test01() +{ test_type d; } + +// Constructing from a range that returns rvalue references doesn't +// require a copy constructor. +void +test02(rvalstruct* begin, rvalstruct* end) +{ + test_type d(std::make_move_iterator(begin), std::make_move_iterator(end)); +} + +// Constructing from a input iterator range that returns rvalue +// references doesn't require a copy constructor either. +void +test03(input_iterator_wrapper begin, + input_iterator_wrapper end) +{ + test_type d(std::make_move_iterator(begin), std::make_move_iterator(end)); +} + +// Neither does destroying one. +void +test04(test_type* d) +{ delete d; } diff --git a/libstdc++-v3/testsuite/23_containers/deque/modifiers/moveable.cc b/libstdc++-v3/testsuite/23_containers/deque/modifiers/moveable.cc new file mode 100644 index 0000000..6050676 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/deque/modifiers/moveable.cc @@ -0,0 +1,144 @@ +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2007 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 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 this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +#include +#include +#include + +using namespace __gnu_test; + +// Test deque::push_back makes no unneeded copies. +void +test01() +{ + bool test __attribute__((unused)) = true; + + std::deque a; + copycounter c(1); + copycounter::copycount = 0; + for(int i = 0; i < 1000; ++i) + a.push_back(c); + VERIFY(copycounter::copycount == 1000); +} + +// Test deque::push_front makes no unneeded copies. +void +test02() +{ + bool test __attribute__((unused)) = true; + + std::deque a; + copycounter c(1); + copycounter::copycount = 0; + for(int i = 0; i < 1000; ++i) + a.push_front(c); + VERIFY(copycounter::copycount == 1000); +} + +// Test deque::insert makes no unneeded copies. +void +test03() +{ + bool test __attribute__((unused)) = true; + + std::deque a(1000); + copycounter c(1); + copycounter::copycount = 0; + a.insert(a.begin(),c); + a.insert(a.end(),c); + for(int i = 0; i < 500; ++i) + a.insert(a.begin() + i, c); + VERIFY(copycounter::copycount == 502); +} + +// Test deque::insert(iterator, count, value) makes no unneeded copies +// when it has to also reallocate the deque's internal buffer. +void +test04() +{ + bool test __attribute__((unused)) = true; + + copycounter c(1); + std::deque a(10, c); + copycounter::copycount = 0; + a.insert(a.begin(), 20, c); + VERIFY(copycounter::copycount == 20); + a.insert(a.end(), 50, c); + VERIFY(copycounter::copycount == 70); + // NOTE : These values are each one higher than might be expected, as + // deque::insert(iterator, count, value) copies the value it is given + // when it has to move elements in the deque in case that value is + // in the deque. + + // Near the start + a.insert(a.begin() + 10, 100, c); + VERIFY(copycounter::copycount == 170 + 1); + // Near the end + a.insert(a.end() - 10, 1000, c); + VERIFY(copycounter::copycount == 1170 + 2); +} + +// Test deque::insert(iterator, count, value) makes no unneeded copies +// when it doesn't have to reallocate the deque's internal buffer. +void +test05() +{ + bool test __attribute__((unused)) = true; + + copycounter c(1); + std::deque a(10, c); + copycounter::copycount = 0; + //a.reserve(1000); + a.insert(a.begin(), 20, c); + VERIFY(copycounter::copycount == 20 ); + a.insert(a.end(), 50, c); + VERIFY(copycounter::copycount == 70 ); + + // NOTE : These values are each one higher than might be expected, as + // deque::insert(iterator, count, value) copies the value it is given + // when it has to move elements in the deque in case that value is + // in the deque. + // Near the start + a.insert(a.begin() + 10, 100, c); + VERIFY(copycounter::copycount == 170 + 1); + // Near the end + a.insert(a.end() - 10, 200, c); + VERIFY(copycounter::copycount == 370 + 2); +} + +int main() +{ + test01(); + test02(); + test03(); + test04(); + test05(); + return 0; +} diff --git a/libstdc++-v3/testsuite/23_containers/deque/moveable.cc b/libstdc++-v3/testsuite/23_containers/deque/moveable.cc new file mode 100644 index 0000000..e1fe8ae --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/deque/moveable.cc @@ -0,0 +1,52 @@ +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2007 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 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 this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// NOTE: This makes use of the fact that we know how moveable +// is implemented on deque (via swap). If the implementation changed +// this test may begin to fail. + +#include +#include +#include + +int main() +{ + bool test __attribute__((unused)) = true; + + std::deque a,b; + a.push_back(1); + b = std::move(a); + VERIFY( b.size() == 1 && b[0] == 1 && a.size() == 0 ); + + std::deque c(std::move(b)); + VERIFY( c.size() == 1 && c[0] == 1 ); + VERIFY( b.size() == 0 ); + return 0; +} diff --git a/libstdc++-v3/testsuite/23_containers/list/moveable.cc b/libstdc++-v3/testsuite/23_containers/list/moveable.cc new file mode 100644 index 0000000..19b5ea1 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/list/moveable.cc @@ -0,0 +1,52 @@ +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2007 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 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 this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// NOTE: This makes use of the fact that we know how moveable +// is implemented on list (via swap). If the implementation changed +// this test may begin to fail. + +#include +#include +#include + +int main() +{ + bool test __attribute__((unused)) = true; + + std::list a,b; + a.push_back(1); + b = std::move(a); + VERIFY( b.size() == 1 && *b.begin() == 1 && a.size() == 0 ); + + std::list c(std::move(b)); + VERIFY( c.size() == 1 && *c.begin() == 1 ); + VERIFY( b.size() == 0 ); + return 0; +} diff --git a/libstdc++-v3/testsuite/23_containers/map/moveable.cc b/libstdc++-v3/testsuite/23_containers/map/moveable.cc new file mode 100644 index 0000000..ca2a2f3 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/map/moveable.cc @@ -0,0 +1,53 @@ +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2007 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 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 this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// NOTE: This makes use of the fact that we know how moveable +// is implemented on map (via swap). If the implementation changed +// this test may begin to fail. + +#include +#include +#include + +int main() +{ + bool test __attribute__((unused)) = true; + + std::map a,b; + a[2]=0; + b[1]=0; + b = std::move(a); + VERIFY(b.find(2) != b.end() && a.find(1) != a.end()); + + std::map c(std::move(b)); + VERIFY( c.find(2) != c.end()); + VERIFY( b.find(2) == b.end()); + return 0; +} diff --git a/libstdc++-v3/testsuite/23_containers/multimap/moveable.cc b/libstdc++-v3/testsuite/23_containers/multimap/moveable.cc new file mode 100644 index 0000000..75bfd43 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/multimap/moveable.cc @@ -0,0 +1,52 @@ +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2007 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 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 this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// NOTE: This makes use of the fact that we know how moveable +// is implemented on multimap (via swap). If the implementation changed +// this test may begin to fail. + +#include +#include + +int main() +{ + bool test __attribute__((unused)) = true; + + std::multimap a,b; + a.insert(std::make_pair(2,0)); + b.insert(std::make_pair(1,0)); + b = std::move(a); + VERIFY(b.find(2) != b.end() && a.find(1) != a.end()); + + std::multimap c(std::move(b)); + VERIFY( c.find(2) != c.end()); + VERIFY( b.find(2) == b.end()); + return 0; +} diff --git a/libstdc++-v3/testsuite/23_containers/multiset/moveable.cc b/libstdc++-v3/testsuite/23_containers/multiset/moveable.cc new file mode 100644 index 0000000..5cd4f32 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/multiset/moveable.cc @@ -0,0 +1,53 @@ +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2007 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 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 this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// NOTE: This makes use of the fact that we know how moveable +// is implemented on multiset (via swap). If the implementation changed +// this test may begin to fail. + +#include +#include +#include + +int main() +{ + bool test __attribute__((unused)) = true; + + std::multiset a,b; + a.insert(2); + b.insert(1); + b = std::move(a); + VERIFY(b.find(2) != b.end() && a.find(1) != a.end()); + + std::multiset c(std::move(b)); + VERIFY( c.find(2) != c.end()); + VERIFY( b.find(2) == b.end()); + return 0; +} diff --git a/libstdc++-v3/testsuite/23_containers/set/moveable.cc b/libstdc++-v3/testsuite/23_containers/set/moveable.cc new file mode 100644 index 0000000..81ca041 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/set/moveable.cc @@ -0,0 +1,53 @@ +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2007 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 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 this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// NOTE: This makes use of the fact that we know how moveable +// is implemented on set (via swap). If the implementation changed +// this test may begin to fail. + +#include +#include +#include + +int main() +{ + bool test __attribute__((unused)) = true; + + std::set a,b; + a.insert(2); + b.insert(1); + b = std::move(a); + VERIFY(b.find(2) != b.end() && a.find(1) != a.end()); + + std::set c(std::move(b)); + VERIFY( c.find(2) != c.end()); + VERIFY( b.find(2) == b.end()); + return 0; +} diff --git a/libstdc++-v3/testsuite/23_containers/vector/cons/moveable.cc b/libstdc++-v3/testsuite/23_containers/vector/cons/moveable.cc new file mode 100644 index 0000000..7184a25 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/vector/cons/moveable.cc @@ -0,0 +1,65 @@ +// { dg-do compile } +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2007 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 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 this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +#include +#include +#include +#include + +using namespace __gnu_test; +typedef std::vector test_type; + +// Empty constructor doesn't require a copy constructor +void +test01() +{ test_type d; } + +// Constructing from a range that returns rvalue references doesn't +// require a copy constructor. +void +test02(rvalstruct* begin, rvalstruct* end) +{ + test_type d(std::make_move_iterator(begin), std::make_move_iterator(end)); +} + +// Constructing from a input iterator range that returns rvalue +// references doesn't require a copy constructor either. +void +test03(input_iterator_wrapper begin, + input_iterator_wrapper end) +{ + test_type d(std::make_move_iterator(begin), std::make_move_iterator(end)); +} + +// Neither does destroying one. +void +test04(test_type* d) +{ delete d; } diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/moveable.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/moveable.cc new file mode 100644 index 0000000..ef4410a --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/moveable.cc @@ -0,0 +1,147 @@ +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2007 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 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 this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +#include +#include +#include + +using namespace __gnu_test; + +// Test vector::push_back makes no unneeded copies. +void +test01() +{ + bool test __attribute__((unused)) = true; + + std::vector a; + copycounter c(1); + copycounter::copycount = 0; + for(int i = 0; i < 10; ++i) + a.push_back(c); + VERIFY(copycounter::copycount == 10); + + for(int i = 0; i < 100; ++i) + a.insert(a.begin() + i, c); + VERIFY(copycounter::copycount == 110); + + for(int i = 0; i < 1000; ++i) + a.insert(a.end(), c); + VERIFY(copycounter::copycount == 1110); +} + +// Test vector::insert(iterator, iterator, iterator) makes no unneeded copies +// when it has to also reallocate the vector's internal buffer. +void +test02() +{ + bool test __attribute__((unused)) = true; + + copycounter c(1); + std::vector a(10, c), b(100, c); + copycounter::copycount = 0; + a.insert(a.begin(), b.begin(), b.begin() + 20); + VERIFY(copycounter::copycount == 20); + a.insert(a.end(), b.begin(), b.begin() + 50); + VERIFY(copycounter::copycount == 70); + a.insert(a.begin() + 50, b.begin(), b.end()); + VERIFY(copycounter::copycount == 170); +} + +// Test vector::insert(iterator, iterator, iterator) makes no unneeded copies +// when it doesn't have to reallocate the vector's internal buffer. +void +test03() +{ + bool test __attribute__((unused)) = true; + + copycounter c(1); + std::vector a(10, c), b(100, c); + copycounter::copycount = 0; + a.reserve(1000); + VERIFY(copycounter::copycount == 0); + a.insert(a.begin(), b.begin(), b.begin() + 20); + VERIFY(copycounter::copycount == 20); + a.insert(a.end(), b.begin(), b.begin() + 50); + VERIFY(copycounter::copycount == 70); + a.insert(a.begin() + 50, b.begin(), b.end()); + VERIFY(copycounter::copycount == 170); +} + +// Test vector::insert(iterator, count, value) makes no unneeded copies +// when it has to also reallocate the vector's internal buffer. +void +test04() +{ + bool test __attribute__((unused)) = true; + + copycounter c(1); + std::vector a(10, c); + copycounter::copycount = 0; + a.insert(a.begin(), 20, c); + VERIFY(copycounter::copycount == 20 + 1); + a.insert(a.end(), 50, c); + VERIFY(copycounter::copycount == 70 + 2); + a.insert(a.begin() + 50, 100, c); + VERIFY(copycounter::copycount == 170 + 3); +} + +// Test vector::insert(iterator, count, value) makes no unneeded copies +// when it doesn't have to reallocate the vector's internal buffer. +void +test05() +{ + bool test __attribute__((unused)) = true; + + copycounter c(1); + std::vector a(10, c); + copycounter::copycount = 0; + a.reserve(1000); + a.insert(a.begin(), 20, c); + // NOTE : These values are each one higher than might be expected, as + // vector::insert(iterator, count, value) copies the value it is given + // when it doesn't reallocate the buffer. + VERIFY(copycounter::copycount == 20 + 1); + a.insert(a.end(), 50, c); + VERIFY(copycounter::copycount == 70 + 2); + a.insert(a.begin() + 50, 100, c); + VERIFY(copycounter::copycount == 170 + 3); +} + + + +int main() +{ + test01(); + test02(); + test03(); + test04(); + test05(); + return 0; +} diff --git a/libstdc++-v3/testsuite/23_containers/vector/moveable.cc b/libstdc++-v3/testsuite/23_containers/vector/moveable.cc new file mode 100644 index 0000000..289a433 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/vector/moveable.cc @@ -0,0 +1,72 @@ +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2007 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 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 this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// NOTE: This makes use of the fact that we know how moveable +// is implemented on vector (via swap). If the implementation changed +// this test may begin to fail. + +#include +#include +#include + +void test01() +{ + bool test __attribute__((unused)) = true; + + std::vector a,b; + a.push_back(1); + b = std::move(a); + VERIFY( b.size() == 1 && b[0] == 1 && a.size() == 0 ); + + std::vector c(std::move(b)); + VERIFY( c.size() == 1 && c[0] == 1 ); + VERIFY( b.size() == 0 ); +} + +void test02() +{ + bool test __attribute__((unused)) = true; + + std::vector a,b; + a.push_back(1); + b = std::move(a); + VERIFY( b.size() == 1 && b[0] == 1 && a.size() == 0 ); + + std::vector c(std::move(b)); + VERIFY( c.size() == 1 && c[0] == 1 ); + VERIFY( b.size() == 0 ); +} + +int main(void) +{ + test01(); + test02(); + return 0; +} diff --git a/libstdc++-v3/testsuite/23_containers/vector/resize/moveable.cc b/libstdc++-v3/testsuite/23_containers/vector/resize/moveable.cc new file mode 100644 index 0000000..84136f4 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/vector/resize/moveable.cc @@ -0,0 +1,85 @@ +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2006, 2007 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 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 this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +#include +#include +#include + +using namespace __gnu_test; + +// According to n1771, there should be two resizes, with and without +// parameter. We only have one at present, whose second parameter defaults +// to a default-constructed object. +// Also, the values are one higher than might be expected because internally +// resize calls fill, which copies its input value in case it is already in +// the vector when the vector isn't moved. +void +test01() +{ + bool test __attribute__((unused)) = true; + + std::vector a; + copycounter::copycount = 0; + a.resize(10); + a.resize(98); + a.resize(99); + a.resize(100); +#ifndef _GLIBCXX_DEBUG + VERIFY( copycounter::copycount == 100 + 4 ); +#else + VERIFY( copycounter::copycount == 100 + 4 + 4 ); +#endif + a.resize(99); + a.resize(0); +#ifndef _GLIBCXX_DEBUG + VERIFY( copycounter::copycount == 100 + 4 ); +#else + VERIFY( copycounter::copycount == 100 + 4 + 6 ); +#endif + a.resize(100); +#ifndef _GLIBCXX_DEBUG + VERIFY( copycounter::copycount == 200 + 5 ); +#else + VERIFY( copycounter::copycount == 200 + 5 + 7 ); +#endif + a.clear(); +#ifndef _GLIBCXX_DEBUG + VERIFY( copycounter::copycount == 200 + 5 ); +#else + VERIFY( copycounter::copycount == 200 + 5 + 7 ); +#endif +} + + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/25_algorithms/equal/equal.cc b/libstdc++-v3/testsuite/25_algorithms/equal/no_operator_ne.cc similarity index 100% rename from libstdc++-v3/testsuite/25_algorithms/equal/equal.cc rename to libstdc++-v3/testsuite/25_algorithms/equal/no_operator_ne.cc diff --git a/libstdc++-v3/testsuite/25_algorithms/heap/heap.cc b/libstdc++-v3/testsuite/25_algorithms/heap/1.cc similarity index 100% rename from libstdc++-v3/testsuite/25_algorithms/heap/heap.cc rename to libstdc++-v3/testsuite/25_algorithms/heap/1.cc diff --git a/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc new file mode 100644 index 0000000..2477902 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc @@ -0,0 +1,120 @@ +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2007 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] + +#undef _GLIBCXX_CONCEPT_CHECKS +#define _GLIBCXX_TESTSUITE_ALLOW_RVALREF_ALIASING + +#include +#include +#include +#include + +using __gnu_test::test_container; +using __gnu_test::random_access_iterator_wrapper; +using __gnu_test::rvalstruct; + +typedef test_container container; + +bool test __attribute__((unused)) = true; + + +void +check_make(int* array, int length) +{ + rvalstruct makeheap[9]; + std::copy(array, array + length, makeheap); + container makecon(makeheap, makeheap + length); + std::make_heap(makecon.begin(), makecon.end()); + VERIFY(std::__is_heap(makecon.begin(), makecon.end())); + for(int z = 0; z < length; ++z) + VERIFY(makeheap[z].valid); +} + +void +check_pop(int* array, int length) +{ + rvalstruct popheap[9]; + std::copy(array, array + length, popheap); + container popcon(popheap, popheap + length); + std::pop_heap(popcon.begin(), popcon.end()); + VERIFY(std::__is_heap(popheap, popheap + length - 1)); + for(int z = 0; z < length; ++z) + VERIFY(popheap[z].val <= popheap[length-1].val && popheap[z].valid); +} + +void +check_sort(int* array, int length) +{ + rvalstruct sortheap[9]; + std::copy(array, array + length, sortheap); + container sortcon(sortheap, sortheap + length); + std::sort_heap(sortcon.begin(), sortcon.end()); + for(int z = 0; z < length - 1; ++z) + VERIFY(sortheap[z].val <= sortheap[z + 1].val && sortheap[z].valid); + VERIFY(sortheap[length - 1].valid); +} + +void +check_push(int* array, int pushval, int length) +{ + rvalstruct pushheap[10]; + std::copy(array, array + length, pushheap); + pushheap[length] = pushval; + container pushcon(pushheap, pushheap + length); + std::push_heap(pushcon.begin(), pushcon.end()); + VERIFY(std::__is_heap(pushheap, pushheap + length)); + for(int z = 0; z < length ; ++z) + VERIFY(pushheap[z].valid); +} + + +void +test01() +{ + int array[9]; + for(int i = 1; i < 9; ++i) + { + for(int z = 0; z < i; ++z) + array[i] = i; + while(std::next_permutation(array, array + i)) + { + check_make(array, i); + if(std::__is_heap(array, array + i)) + { + check_pop(array, i); + check_sort(array, i); + for(int pushval = -1; pushval <= i; ++pushval) + { + check_push(array, pushval, i); + } + } + } + } +} + +int +main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/25_algorithms/lower_bound/lower_bound.cc b/libstdc++-v3/testsuite/25_algorithms/lower_bound/no_operator_ne.cc similarity index 100% rename from libstdc++-v3/testsuite/25_algorithms/lower_bound/lower_bound.cc rename to libstdc++-v3/testsuite/25_algorithms/lower_bound/no_operator_ne.cc diff --git a/libstdc++-v3/testsuite/25_algorithms/nth_element/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/nth_element/moveable.cc new file mode 100644 index 0000000..c521d38 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/nth_element/moveable.cc @@ -0,0 +1,76 @@ +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2007 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 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 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.2 [lib.alg.nth.element] + +#undef _GLIBCXX_CONCEPT_CHECKS + +#include +#include +#include +#include + +using __gnu_test::test_container; +using __gnu_test::random_access_iterator_wrapper; +using std::nth_element; +using __gnu_test::rvalstruct; + +typedef test_container Container; + +void +test1() +{ + int intarray[] = {6, 5, 4, 3, 2, 1, 0}; + rvalstruct array[7]; + std::copy(intarray, intarray + 7, array); + Container con(array, array + 7); + nth_element(con.begin(), con.it(3), con.end()); + for(int i = 0; i < 3; ++i) + VERIFY(array[i].val < 3); + for(int i = 4; i < 7; ++i) + VERIFY(array[i].val > 3); + for(int i = 0; i < 7; ++i) + VERIFY(array[i].valid); +} + +void +test2() +{ + int intarray[] = {0, 6, 1, 5, 2, 4, 3}; + rvalstruct array[7]; + std::copy(intarray, intarray + 7, array); + Container con(array,array + 7); + nth_element(con.begin(), con.it(3), con.end()); + for(int i = 0; i < 3; ++i) + VERIFY(array[i].val < 3); + for(int i = 4; i < 7; ++i) + VERIFY(array[i].val > 3); + for(int i = 0; i < 7; ++i) + VERIFY(array[i].valid); +} + +int +main() +{ + test1(); + test2(); + return 0; +} diff --git a/libstdc++-v3/testsuite/25_algorithms/partial_sort/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/partial_sort/moveable.cc new file mode 100644 index 0000000..990da41 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/partial_sort/moveable.cc @@ -0,0 +1,70 @@ +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2007 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 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 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.1.3 [lib.partial.sort] + +#undef _GLIBCXX_CONCEPT_CHECKS +#define _GLIBCXX_TESTSUITE_ALLOW_RVALREF_ALIASING + +#include +#include +#include +#include + +using __gnu_test::test_container; +using __gnu_test::random_access_iterator_wrapper; +using __gnu_test::rvalstruct; +using std::partial_sort; + +typedef test_container Container; + +void +test1() +{ + int intarray[] = {6, 5, 4, 3, 2, 1, 0}; + rvalstruct array[7]; + std::copy(intarray, intarray + 7, array); + Container con(array, array + 7); + partial_sort(con.begin(), con.it(3), con.end()); + VERIFY(array[0].val == 0 && array[1].val == 1 && array[2].val == 2); + for(int i = 0; i < 7; ++i) + VERIFY(array[i].valid); +} + +void +test2() +{ + int intarray[] = {0, 6, 1, 5, 2, 4, 3}; + rvalstruct array[7]; + std::copy(intarray, intarray + 7, array); + Container con(array,array + 7); + partial_sort(con.begin(), con.it(3), con.end()); + VERIFY(array[0].val == 0 && array[1].val == 1 && array[2].val == 2); + for(int i = 0; i < 7; ++i) + VERIFY(array[i].valid); +} + +int +main() +{ + test1(); + test2(); +} diff --git a/libstdc++-v3/testsuite/25_algorithms/partition/partition.cc b/libstdc++-v3/testsuite/25_algorithms/partition/1.cc similarity index 87% rename from libstdc++-v3/testsuite/25_algorithms/partition/partition.cc rename to libstdc++-v3/testsuite/25_algorithms/partition/1.cc index 66edb6f..b71ec23 100644 --- a/libstdc++-v3/testsuite/25_algorithms/partition/partition.cc +++ b/libstdc++-v3/testsuite/25_algorithms/partition/1.cc @@ -50,24 +50,9 @@ test01() for (const int* i = m; i < s1 + N; ++i) VERIFY(!pred(*i)); } -// 25.2.12 stable_partition() -void -test02() -{ - using std::stable_partition; - - int s1[N]; - std::copy(A, A + N, s1); - - stable_partition(s1, s1 + N, Pred()); - VERIFY(std::equal(s1, s1 + N, B)); -} - int main() { test01(); - test02(); - return 0; } diff --git a/libstdc++-v3/testsuite/25_algorithms/partition/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/partition/moveable.cc new file mode 100644 index 0000000..49a20d7 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/partition/moveable.cc @@ -0,0 +1,90 @@ +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2007 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.2.12 [lib.alg.partitions] Partitions. + +#undef _GLIBCXX_CONCEPT_CHECKS + +#include +#include +#include +#include +#include + +using __gnu_test::test_container; +using __gnu_test::forward_iterator_wrapper; +using __gnu_test::bidirectional_iterator_wrapper; +using __gnu_test::rvalstruct; + +typedef test_container Fcontainer; +typedef test_container Bcontainer; + +bool test __attribute__((unused)) = true; + +const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17}; +const int B[] = {2, 4, 6, 8, 10, 12, 14, 16, 1, 3, 5, 7, 9, 11, 13, 15, 17}; +const int N = sizeof(A) / sizeof(int); + +struct Pred +{ + bool + operator()(const rvalstruct& x) const + { return (x.val % 2) == 0; } +}; + +// 25.2.12 partition() +void +test01() +{ + using std::partition; + + rvalstruct farray[N]; + rvalstruct barray[N]; + + std::copy(A, A + N, farray); + std::copy(A, A + N, barray); + + Fcontainer fcon(farray, farray + N); + Bcontainer bcon(barray, barray + N); + + Pred pred; + + VERIFY(partition(fcon.begin(), fcon.end(), pred).ptr - farray == N/2); + for (const rvalstruct* i = farray; i < farray+N/2; ++i) + VERIFY(pred(*i)); + + for (const rvalstruct* i = farray+N/2; i < farray + N; ++i) + VERIFY(!pred(*i)); + + VERIFY(partition(bcon.begin(), bcon.end(), pred).ptr - barray == N/2); + + for (const rvalstruct* i = barray; i < barray+N/2; ++i) + VERIFY(pred(*i)); + for (const rvalstruct* i = barray+N/2; i < barray + N; ++i) + VERIFY(!pred(*i)); +} + +int +main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/25_algorithms/remove/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/remove/moveable.cc new file mode 100644 index 0000000..122d503 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/remove/moveable.cc @@ -0,0 +1,68 @@ +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2007 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 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 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.2.4 remove + +#undef _GLIBCXX_CONCEPT_CHECKS + +#include +#include +#include +#include + +using __gnu_test::test_container; +using __gnu_test::forward_iterator_wrapper; +using __gnu_test::rvalstruct; + +typedef test_container Container; + +void +test1() +{ + int intarray[] = {1}; + rvalstruct array[1]; + std::copy(intarray, intarray + 1, array); + Container con(array, array + 1); + rvalstruct remove_val0(0); + rvalstruct remove_val1(1); + VERIFY(std::remove(con.begin(), con.end(), remove_val0).ptr == array + 1); + VERIFY(std::remove(con.begin(), con.end(), remove_val1).ptr == array); +} + +void +test2() +{ + int intarray[] = {0, 1, 0, 1, 0, 0, 1, 1}; + rvalstruct array[8]; + std::copy(intarray, intarray + 8, array); + Container con(array, array + 8); + rvalstruct remove_val(1); + VERIFY(std::remove(con.begin(), con.end(), remove_val).ptr == array + 4); + VERIFY(array[0].val == 0 && array[1].val == 0 && array[2].val == 0 && + array[3].val == 0); +} + +int +main() +{ + test1(); + test2(); +} diff --git a/libstdc++-v3/testsuite/25_algorithms/remove_if/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/remove_if/moveable.cc new file mode 100644 index 0000000..15b9ab6 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/remove_if/moveable.cc @@ -0,0 +1,68 @@ +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2007 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 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 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.2.4 remove + +#undef _GLIBCXX_CONCEPT_CHECKS + +#include +#include +#include +#include + +using __gnu_test::test_container; +using __gnu_test::forward_iterator_wrapper; +using __gnu_test::rvalstruct; + +typedef test_container Container; + +bool equal1(rvalstruct& in) { return in.val == 1; } +bool equal0(rvalstruct& in) { return in.val == 0; } + +void +test1() +{ + int intarray[] = {1}; + rvalstruct array[1]; + std::copy(intarray, intarray + 1, array); + Container con(array, array + 1); + VERIFY(std::remove_if(con.begin(), con.end(), equal0).ptr == array + 1); + VERIFY(std::remove_if(con.begin(), con.end(), equal1).ptr == array); +} + +void +test2() +{ + int intarray[] = {0, 1, 0, 1, 0, 0, 1, 1}; + rvalstruct array[8]; + std::copy(intarray, intarray + 8, array); + Container con(array, array + 8); + VERIFY(std::remove_if(con.begin(), con.end(), equal1).ptr == array + 4); + VERIFY(array[0] == 0 && array[1] == 0 && array[2] == 0 && + array[3] == 0); +} + +int +main() +{ + test1(); + test2(); +} diff --git a/libstdc++-v3/testsuite/25_algorithms/reverse/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/reverse/moveable.cc new file mode 100644 index 0000000..10577fc --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/reverse/moveable.cc @@ -0,0 +1,45 @@ +// { dg-do compile } +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2007 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 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 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.2.9 Reverse + +#undef _GLIBCXX_CONCEPT_CHECKS + +#include +#include + +using __gnu_test::bidirectional_iterator_wrapper; + +class X +{ + X(); + X(const X&); + void operator=(const X&); +}; + +void +swap(X&, X&) { } + +void +test1(bidirectional_iterator_wrapper& begin, + bidirectional_iterator_wrapper& end) +{ std::reverse(begin, end); } diff --git a/libstdc++-v3/testsuite/25_algorithms/rotate/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/rotate/moveable.cc new file mode 100644 index 0000000..febf758 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/rotate/moveable.cc @@ -0,0 +1,79 @@ +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2007 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 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 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.2.10 rotate + +// Tests rotate when an moveable class is used + +#undef _GLIBCXX_CONCEPT_CHECKS + +#include +#include +#include +#include + +using __gnu_test::test_container; +using __gnu_test::forward_iterator_wrapper; +using __gnu_test::bidirectional_iterator_wrapper; +using __gnu_test::random_access_iterator_wrapper; +using __gnu_test::rvalstruct; + +typedef test_container Fcontainer; +typedef test_container Bcontainer; +typedef test_container Rcontainer; + + + +void +test1() +{ + bool test __attribute__((unused)) = true; + int data[] = {1, 2, 3, 4, 5}; + rvalstruct array[5]; + std::copy(data, data + 5, array); + Fcontainer fcon(array, array + 5); + Bcontainer bcon(array, array + 5); + Rcontainer rcon(array, array + 5); + + std::rotate(fcon.begin(), fcon.it(2), fcon.end()); + VERIFY(array[0].val == 3 && array[1].val == 4 && array[2].val == 5 && + array[3].val == 1 && array[4].val == 2); + for(int i=0;i<5;i++) + VERIFY(array[i].valid == true); + + std::rotate(bcon.begin(), bcon.it(2), bcon.end()); + VERIFY(array[0].val == 5 && array[1].val == 1 && array[2].val == 2 && + array[3].val == 3 && array[4].val == 4); + for(int i=0;i<5;i++) + VERIFY(array[i].valid); + + std::rotate(rcon.begin(), rcon.it(2), rcon.end()); + VERIFY(array[0].val == 2 && array[1].val == 3 && array[2].val == 4 && + array[3].val == 5 && array[4].val == 1); + for(int i=0;i<5;i++) + VERIFY(array[i].valid); +} + +int +main() +{ + test1(); +} diff --git a/libstdc++-v3/testsuite/25_algorithms/search/1.cc b/libstdc++-v3/testsuite/25_algorithms/search/1.cc index ec0763d..ef00b58 100644 --- a/libstdc++-v3/testsuite/25_algorithms/search/1.cc +++ b/libstdc++-v3/testsuite/25_algorithms/search/1.cc @@ -24,9 +24,11 @@ using __gnu_test::test_container; using __gnu_test::forward_iterator_wrapper; +using __gnu_test::random_access_iterator_wrapper; using std::search; typedef test_container Container; +typedef test_container RAcontainer; int array1[] = {0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1}; int array2[] = {0, 0, 0}; @@ -101,6 +103,53 @@ test6() == array3 + 6); } +bool +lexstep(int* start, int length) +{ + int i = 0; + int carry = 1; + while(i < length && carry) + { + if(start[i] == 1) + start[i] = 0; + else + { + start[i] = 1; + carry = 0; + } + i++; + } + return !carry; +} + +void test7() +{ + int array1[6]; + int array2[6]; + for(int length1 = 0; length1 < 6; length1++) + { + for(int length2 = 0; length2 < 6; length2++) + { + std::fill_n(array1, length1, 0); + while(lexstep(array1, length1)) + { + std::fill_n(array2, length2, 0); + while(lexstep(array2, length2)) + { + Container con1(array1, array1 + length1); + Container con2(array2, array2 + length2); + RAcontainer rcon1(array1, array1 + length1); + RAcontainer rcon2(array2, array2 + length2); + VERIFY(search(con1.begin(), con1.end(), con2.begin(), + con2.end()).ptr == + search(rcon1.begin(), rcon1.end(), rcon2.begin(), + rcon2.end()).ptr); + } + } + } + } +} + int main() { @@ -110,4 +159,5 @@ main() test4(); test5(); test6(); + test7(); } diff --git a/libstdc++-v3/testsuite/25_algorithms/search/check_type.cc b/libstdc++-v3/testsuite/25_algorithms/search/check_type.cc index 4aaa87b..4762abd 100644 --- a/libstdc++-v3/testsuite/25_algorithms/search/check_type.cc +++ b/libstdc++-v3/testsuite/25_algorithms/search/check_type.cc @@ -25,14 +25,33 @@ using __gnu_test::forward_iterator_wrapper; -struct S1 { }; -struct S2 { }; +struct T1 { }; +struct T2 { }; + +struct S1 +{ + S1(T1) { } +}; + +struct S2 { + S2(T2) { } +}; bool operator==(const S1&, const S2&) {return true;} -struct X1 { }; -struct X2 { }; +struct V1 { }; +struct V2 { }; + +struct X1 +{ + X1(V1) { }; +}; + +struct X2 +{ + X2(V2) { }; +}; bool predicate(const X1&, const X2&) {return true;} @@ -41,6 +60,14 @@ forward_iterator_wrapper test1(forward_iterator_wrapper& s1, forward_iterator_wrapper& s2) { return std::search(s1, s1, s2, s2); } +forward_iterator_wrapper +test2(forward_iterator_wrapper& s1, forward_iterator_wrapper& s2) +{ return std::search(s1, s1, s2, s2); } + forward_iterator_wrapper -test2(forward_iterator_wrapper& x1, forward_iterator_wrapper& x2) +test3(forward_iterator_wrapper& x1, forward_iterator_wrapper& x2) +{ return std::search(x1, x1, x2, x2, predicate); } + +forward_iterator_wrapper +test4(forward_iterator_wrapper& x1, forward_iterator_wrapper& x2) { return std::search(x1, x1, x2, x2, predicate); } diff --git a/libstdc++-v3/testsuite/25_algorithms/sort/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/sort/moveable.cc new file mode 100644 index 0000000..168374f --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/sort/moveable.cc @@ -0,0 +1,64 @@ +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2007 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 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 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.1 algorithms, sort() + +#undef _GLIBCXX_CONCEPT_CHECKS +#define _GLIBCXX_TESTSUITE_ALLOW_RVALREF_ALIASING + +#include +#include +#include +#include + +bool test __attribute__((unused)) = true; + +using __gnu_test::test_container; +using __gnu_test::random_access_iterator_wrapper; +using __gnu_test::rvalstruct; +using std::partial_sort; + +typedef test_container Container; + + +const int A[] = {10, 20, 1, 11, 2, 12, 3, 13, 4, 14, 5, 15, 6, 16, 7, + 17, 8, 18, 9, 19}; +const int N = sizeof(A) / sizeof(int); + +// 25.3.1.1 sort() +void +test01() +{ + rvalstruct s1[N]; + std::copy(A, A + N, s1); + Container con(s1, s1 + N); + std::sort(con.begin(), con.end()); + VERIFY(s1[0].valid); + for(int i = 1; i < N; ++i) + VERIFY(s1[i].val>s1[i-1].val && s1[i].valid); +} + +int +main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/25_algorithms/stable_partition/1.cc b/libstdc++-v3/testsuite/25_algorithms/stable_partition/1.cc new file mode 100644 index 0000000..29188f8 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/stable_partition/1.cc @@ -0,0 +1,56 @@ +// 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +// 25.2.12 [lib.alg.partitions] Partitions. + +#include +#include +#include + +bool test __attribute__((unused)) = true; + +const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17}; +const int B[] = {2, 4, 6, 8, 10, 12, 14, 16, 1, 3, 5, 7, 9, 11, 13, 15, 17}; +const int N = sizeof(A) / sizeof(int); + +struct Pred +{ + bool + operator()(const int& x) const + { return (x % 2) == 0; } +}; + +// 25.2.12 stable_partition() +void +test02() +{ + using std::stable_partition; + + int s1[N]; + std::copy(A, A + N, s1); + + stable_partition(s1, s1 + N, Pred()); + VERIFY(std::equal(s1, s1 + N, B)); +} + +int +main() +{ + test02(); + return 0; +} diff --git a/libstdc++-v3/testsuite/25_algorithms/swap_ranges/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/swap_ranges/moveable.cc new file mode 100644 index 0000000..57876d8 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/swap_ranges/moveable.cc @@ -0,0 +1,45 @@ +// { dg-do compile } +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2007 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 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 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.2.4 Swap Ranges + +#undef _GLIBCXX_CONCEPT_CHECKS + +#include +#include + +using __gnu_test::forward_iterator_wrapper; + +class X +{ + X(); + X(const X&); + void operator=(const X&); +}; + +void +swap(X&, X&) { } + +void +test1(forward_iterator_wrapper& begin, forward_iterator_wrapper& end, + forward_iterator_wrapper& begin2) +{ std::swap_ranges(begin, end, begin2); } diff --git a/libstdc++-v3/testsuite/25_algorithms/unique/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/unique/moveable.cc new file mode 100644 index 0000000..839d6e4 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/unique/moveable.cc @@ -0,0 +1,74 @@ +// { dg-require-rvalref "" } +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2005, 2007 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 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 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.2.8 [lib.alg.unique] Unique + +#undef _GLIBCXX_CONCEPT_CHECKS + +#include +#include +#include +#include +#include +#include + +using __gnu_test::test_container; +using __gnu_test::forward_iterator_wrapper; +using __gnu_test::rvalstruct; + +typedef test_container Container; + +void test01() +{ + bool test __attribute__((unused)) = true; + + int intarray1[] = {1, 4, 4, 6, 1, 2, 2, 3, 1, 6, 6, 6, 5, 7, 5, 4, 4}; + int intarray2[] = {1, 1, 1, 2, 2, 1, 1, 7, 6, 6, 7, 8, 8, 8, 8, 9, 9}; + + const int N = sizeof(intarray1) / sizeof(int); + + rvalstruct T1[N]; + rvalstruct T2[N]; + + std::copy(intarray1,intarray1 + N, T1); + std::copy(intarray2,intarray2 + N, T2); + + const int A1[] = {1, 4, 6, 1, 2, 3, 1, 6, 5, 7, 5, 4}; + const int B1[] = {1, 2, 1, 7, 6, 7, 8, 9}; + + Container con(T1, T1 + N); + + VERIFY(std::unique(con.begin(), con.end()).ptr - T1 == 12); + for(int i = 0; i < 12; ++i) + VERIFY(T1[i].val == A1[i]); + + Container con2(T2, T2 + N); + VERIFY(std::unique(con2.begin(), con2.end()).ptr - T2 == 8); + for(int i = 0; i < 8; ++i) + VERIFY(T2[i].val == B1[i]); +} + + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/lib/dg-options.exp b/libstdc++-v3/testsuite/lib/dg-options.exp index a13fa74..327b691 100644 --- a/libstdc++-v3/testsuite/lib/dg-options.exp +++ b/libstdc++-v3/testsuite/lib/dg-options.exp @@ -79,3 +79,12 @@ proc dg-require-time { args } { } return } + +proc dg-require-rvalref { args } { + if { ![ check_v3_target_rvalref ] } { + upvar dg-do-what dg-do-what + set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"] + return + } + return +} diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 6603d71..b48fda1 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -762,6 +762,61 @@ proc check_v3_target_time { } { return $et_time_saved } +proc check_v3_target_rvalref { } { + global et_rvalref_saved + global et_rvalref_target_name + global tool + + if { ![info exists et_rvalref_target_name] } { + set et_rvalref_target_name "" + } + + # If the target has changed since we set the cached value, clear it. + set current_target [current_target_name] + if { $current_target != $et_rvalref_target_name } { + verbose "check_v3_target_rvalref: `$et_rvalref_target_name'" 2 + set et_rvalref_target_name $current_target + if [info exists et_rvalref_saved] { + verbose "check_v3_target_rvalref: removing cached result" 2 + unset et_rvalref_saved + } + } + + if [info exists et_rvalref_saved] { + verbose "check_v3_target_rvalref: using cached result" 2 + } else { + set et_rvalref_saved 0 + + # Set up and compile a C++ test program that tries to use + # the library components of rval references + set src rvalref[pid].cc + set exe rvalref[pid].x + + set f [open $src "w"] + puts $f "#include " + puts $f "#include " + puts $f "using std::move;" + puts $f "using std::identity;" + puts $f "using std::forward;" + puts $f "using std::move_iterator;" + puts $f "using std::make_move_iterator;" + close $f + + set lines [v3_target_compile $src $exe executable ""] + file delete $src + + if [string match "" $lines] { + # No error message, compilation succeeded. + verbose "check_v3_target_rvalref: compilation succeeded" 2 + remote_file build delete $exe + set et_rvalref_saved 1 + } else { + verbose "check_v3_target_rvalref: compilation failed" 2 + } + } + return $et_rvalref_saved +} + proc check_v3_target_namedlocale { } { global et_namedlocale_saved global et_namedlocale_target_name diff --git a/libstdc++-v3/testsuite/util/testsuite_rvalref.h b/libstdc++-v3/testsuite/util/testsuite_rvalref.h new file mode 100644 index 0000000..ca94716 --- /dev/null +++ b/libstdc++-v3/testsuite/util/testsuite_rvalref.h @@ -0,0 +1,194 @@ +// -*- C++ -*- +// Testing utilities for the rvalue reference. +// +// Copyright (C) 2005, 2007 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 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 this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. +// +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +#ifndef _GLIBCXX_TESTSUITE_RVALREF_H +#define _GLIBCXX_TESTSUITE_RVALREF_H 1 + +#include + +namespace __gnu_test +{ + + // This class is designed to test libstdc++'s template-based rvalue + // reference support. It should fail at compile-time if there is an attempt + // to copy it (although see note just below). + class rvalstruct + { + bool + operator=(const rvalstruct&); + +// Normally we don't define a copy constructor, as any use of it would +// show an inefficency. In some cases we know it will be aliased away +// by the compiler, but it still insists it is defined, so we provide +// a way of making it public but not giving a body, so any usage would +// instead fail at link-time. +#ifdef _GLIBCXX_TESTSUITE_ALLOW_RVALREF_ALIASING + public: + rvalstruct(const rvalstruct&); +#else + rvalstruct(const rvalstruct&); + + public: +#endif + int val; + bool valid; + + rvalstruct() : valid(false) + { } + + rvalstruct(int inval) : val(inval), valid(true) + { } + + rvalstruct& + operator=(int newval) + { + VERIFY(valid == false); + val = newval; + valid = true; + } + + rvalstruct(rvalstruct&& in) + { + VERIFY(in.valid == true); + val = in.val; + in.valid = false; + valid = true; + } + + rvalstruct& + operator=(rvalstruct&& in) + { + VERIFY(in.valid == true); + val = in.val; + in.valid = false; + valid = true; + return *this; + } + }; + + bool + operator==(const rvalstruct& lhs, const rvalstruct& rhs) + { return lhs.val == rhs.val; } + + bool + operator<(const rvalstruct& lhs, const rvalstruct& rhs) + { return lhs.val < rhs.val; } + + void + swap(rvalstruct& lhs, rvalstruct& rhs) + { + VERIFY(lhs.valid && rhs.valid); + int temp = lhs.val; + lhs.val = rhs.val; + rhs.val = temp; + } + + // This is a moveable class which copies how many times it is copied. + // This is mainly of use in the containers, where the an element inserted + // into a container has to be copied once to get there, but we want to check + // nothing else is copied. + struct copycounter + { + static int copycount; + int val; + bool valid; + + copycounter() : val(0), valid(true) + { } + + copycounter(int inval) : val(inval), valid(true) + { } + + copycounter(const copycounter& in) : val(in.val), valid(true) + { + VERIFY(in.valid == true); + ++copycount; + } + + copycounter(copycounter&& in) + { + VERIFY(in.valid == true); + val = in.val; + in.valid = false; + valid = true; + } + + copycounter& + operator=(int newval) + { + val = newval; + valid = true; + } + + bool + operator=(const copycounter& in) + { + VERIFY(in.valid == true); + ++copycount; + val = in.val; + valid = true; + } + + copycounter& + operator=(copycounter&& in) + { + VERIFY(in.valid == true); + val = in.val; + in.valid = false; + valid = true; + return *this; + } + + ~copycounter() + { valid = false; } + }; + + int copycounter::copycount = 0; + + bool + operator==(const copycounter& lhs, const copycounter& rhs) + { return lhs.val == rhs.val; } + + bool + operator<(const copycounter& lhs, const copycounter& rhs) + { return lhs.val < rhs.val; } + + void + swap(copycounter& lhs, copycounter& rhs) + { + VERIFY(lhs.valid && rhs.valid); + int temp = lhs.val; + lhs.val = rhs.val; + rhs.val = temp; + } + +}; // namespace __gnu_test + +#endif // _GLIBCXX_TESTSUITE_TR1_H -- 2.7.4