From 07d8d70f3f1a1abf14a66de6b9675bf77152a536 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Wed, 17 Oct 2007 00:46:27 +0000 Subject: [PATCH] vstring.h (__versa_string<>::front, [...]): Add. 2007-10-16 Paolo Carlini * include/ext/vstring.h (__versa_string<>::front, __versa_string<>::back): Add. * testsuite/ext/vstring/element_access/char/front_back.cc: New. * testsuite/ext/vstring/element_access/wchar_t/front_back.cc: Likewise. From-SVN: r129399 --- libstdc++-v3/ChangeLog | 7 +++ libstdc++-v3/include/ext/vstring.h | 34 ++++++++++++++ .../vstring/element_access/char/front_back.cc | 44 +++++++++++++++++++ .../element_access/wchar_t/front_back.cc | 44 +++++++++++++++++++ 4 files changed, 129 insertions(+) create mode 100644 libstdc++-v3/testsuite/ext/vstring/element_access/char/front_back.cc create mode 100644 libstdc++-v3/testsuite/ext/vstring/element_access/wchar_t/front_back.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2e27f4aad497..6f04a7f23a14 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2007-10-16 Paolo Carlini + + * include/ext/vstring.h (__versa_string<>::front, + __versa_string<>::back): Add. + * testsuite/ext/vstring/element_access/char/front_back.cc: New. + * testsuite/ext/vstring/element_access/wchar_t/front_back.cc: Likewise. + 2007-10-16 Paolo Carlini * include/bits/stl_queue.h (queue<>::queue(_Sequence&&), diff --git a/libstdc++-v3/include/ext/vstring.h b/libstdc++-v3/include/ext/vstring.h index ae441bfd00d7..a369cae2f0d0 100644 --- a/libstdc++-v3/include/ext/vstring.h +++ b/libstdc++-v3/include/ext/vstring.h @@ -558,6 +558,40 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) return this->_M_data()[__n]; } +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + /** + * Returns a read/write reference to the data at the first + * element of the %string. + */ + reference + front() + { return *begin(); } + + /** + * Returns a read-only (constant) reference to the data at the first + * element of the %string. + */ + const_reference + front() const + { return *begin(); } + + /** + * Returns a read/write reference to the data at the last + * element of the %string. + */ + reference + back() + { return *(end() - 1); } + + /** + * Returns a read-only (constant) reference to the data at the + * last element of the %string. + */ + const_reference + back() const + { return *(end() - 1); } +#endif + // Modifiers: /** * @brief Append a string to this string. diff --git a/libstdc++-v3/testsuite/ext/vstring/element_access/char/front_back.cc b/libstdc++-v3/testsuite/ext/vstring/element_access/char/front_back.cc new file mode 100644 index 000000000000..22959a912400 --- /dev/null +++ b/libstdc++-v3/testsuite/ext/vstring/element_access/char/front_back.cc @@ -0,0 +1,44 @@ +// { dg-options "-std=gnu++0x" } + +// 2007-10-16 Paolo Carlini + +// Copyright (C) 2007 Free Software Foundation +// +// 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +#include +#include + +void test01() +{ + using namespace std; + bool test __attribute__((unused)) = true; + + __gnu_cxx::__vstring str("ramifications"); + const __gnu_cxx::__vstring cstr("melodien"); + + VERIFY( str.front() == 'r' ); + VERIFY( str.back() == 's' ); + VERIFY( cstr.front() == 'm' ); + VERIFY( cstr.back() == 'n' ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/ext/vstring/element_access/wchar_t/front_back.cc b/libstdc++-v3/testsuite/ext/vstring/element_access/wchar_t/front_back.cc new file mode 100644 index 000000000000..dc18c5a3e115 --- /dev/null +++ b/libstdc++-v3/testsuite/ext/vstring/element_access/wchar_t/front_back.cc @@ -0,0 +1,44 @@ +// { dg-options "-std=gnu++0x" } + +// 2007-10-16 Paolo Carlini + +// Copyright (C) 2007 Free Software Foundation +// +// 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +#include +#include + +void test01() +{ + using namespace std; + bool test __attribute__((unused)) = true; + + __gnu_cxx::__wvstring str(L"ramifications"); + const __gnu_cxx::__wvstring cstr(L"melodien"); + + VERIFY( str.front() == L'r' ); + VERIFY( str.back() == L's' ); + VERIFY( cstr.front() == L'm' ); + VERIFY( cstr.back() == L'n' ); +} + +int main() +{ + test01(); + return 0; +}