[PATCH v3 3/5] Add gdb::string_view
Simon Marchi
simon.marchi@ericsson.com
Mon Apr 9 18:28:00 GMT 2018
For completeness, here is what I pushed:
>From 10907ddb20428acfe22964f9f9fb7855c6fca932 Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@polymtl.ca>
Date: Mon, 9 Apr 2018 13:31:04 -0400
Subject: [PATCH] Add gdb::string_view
We had a few times the need for a data structure that does essentially
what C++17's std::string_view does, which is to give an std::string-like
interface (only the read-only operations) to an arbitrary character
buffer.
This patch adapts the files copied from libstdc++ by the previous patch
to integrate them with GDB. Here's a summary of the changes:
* Remove things related to wstring_view, u16string_view and
u32string_view (I don't think we need them, but we can always add them
later).
* Remove usages of _GLIBCXX_BEGIN_NAMESPACE_VERSION and
_GLIBCXX_END_NAMESPACE_VERSION.
* Put the code in the gdb namespace. I had to add a few "std::" in
front of std type usages.
* Change __throw_out_of_range_fmt() for error().
* Make gdb::string_view an alias of std::string_view when building
with >= c++17.
* Remove a bunch of constexpr, because they are not valid in c++11
(e.g. they are not a single return line).
* Use std::common_type<_Tp>::type instead of std::common_type_t<_Tp>,
because c++11 doesn't have the later.
* Remove the #pragma GCC system_header, since that silences some
warnings that we might want to have if we're doing something not
correctly.
* Remove operator ""sv. It would need a lot of work to make all
supported compilers happy, and we can easily live without it.
* Remove operator<<. It is implemented using __ostream_insert (a
libstdc++ internal). Bringing it in might be possible, but I don't
think that would be worth the effort, since we don't really use
streams at the moment.
* Replace internal libstdc++ asserts ( __glibcxx_assert and
__glibcxx_requires_string_len) with gdb_assert.
* Remove hash helpers, because they use libstdc++ internal functions.
If we need them we always import them later.
The string_view class in cli/cli-script.c is removed and its usage
replaced with the new gdb::string_view.
gdb/ChangeLog:
* common/gdb_string_view.h: Remove libstdc++ implementation
details, adjust to gdb reality.
* common/gdb_string_view.tcc: Likewise.
* cli/cli-script.c (struct string_view): Remove.
(user_args) <m_args>: Change element type to gdb::string_view.
(user_args::insert_args): Adjust.
---
gdb/ChangeLog | 9 ++
gdb/cli/cli-script.c | 17 +--
gdb/common/gdb_string_view.h | 298 ++++++++++++-----------------------------
gdb/common/gdb_string_view.tcc | 62 ++++-----
4 files changed, 126 insertions(+), 260 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 631f15a..462fc7d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,14 @@
2018-04-09 Simon Marchi <simon.marchi@polymtl.ca>
+ * common/gdb_string_view.h: Remove libstdc++ implementation
+ details, adjust to gdb reality.
+ * common/gdb_string_view.tcc: Likewise.
+ * cli/cli-script.c (struct string_view): Remove.
+ (user_args) <m_args>: Change element type to gdb::string_view.
+ (user_args::insert_args): Adjust.
+
+2018-04-09 Simon Marchi <simon.marchi@polymtl.ca>
+
* common/gdb_string_view.h: New file.
* common/gdb_string_view.tcc: New file.
diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c
index 366c422..cdfda11 100644
--- a/gdb/cli/cli-script.c
+++ b/gdb/cli/cli-script.c
@@ -32,6 +32,7 @@
#include "extension.h"
#include "interps.h"
#include "compile/compile.h"
+#include "common/gdb_string_view.h"
#include <vector>
@@ -54,18 +55,6 @@ static int command_nest_depth = 1;
/* This is to prevent certain commands being printed twice. */
static int suppress_next_print_command_trace = 0;
-/* A non-owning slice of a string. */
-
-struct string_view
-{
- string_view (const char *str_, size_t len_)
- : str (str_), len (len_)
- {}
-
- const char *str;
- size_t len;
-};
-
/* Structure for arguments to user defined functions. */
class user_args
@@ -91,7 +80,7 @@ private:
std::string m_command_line;
/* The arguments. Each element points inside M_COMMAND_LINE. */
- std::vector<string_view> m_args;
+ std::vector<gdb::string_view> m_args;
};
/* The stack of arguments passed to user defined functions. We need a
@@ -827,7 +816,7 @@ user_args::insert_args (const char *line) const
error (_("Missing argument %ld in user function."), i);
else
{
- new_line.append (m_args[i].str, m_args[i].len);
+ new_line.append (m_args[i].data (), m_args[i].length ());
line = tmp;
}
}
diff --git a/gdb/common/gdb_string_view.h b/gdb/common/gdb_string_view.h
index e42d5ac..545109c 100644
--- a/gdb/common/gdb_string_view.h
+++ b/gdb/common/gdb_string_view.h
@@ -1,5 +1,8 @@
// Components for manipulating non-owning sequences of characters -*- C++ -*-
+// Note: This file has been stolen from the gcc repo
+// (libstdc++-v3/include/experimental/string_view) and has local modifications.
+
// Copyright (C) 2013-2018 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -22,34 +25,27 @@
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
// <http://www.gnu.org/licenses/>.
-/** @file experimental/string_view
- * This is a TS C++ Library header.
- */
-
//
// N3762 basic_string_view library
//
-#ifndef _GLIBCXX_EXPERIMENTAL_STRING_VIEW
-#define _GLIBCXX_EXPERIMENTAL_STRING_VIEW 1
+#ifndef GDB_STRING_VIEW_H
+#define GDB_STRING_VIEW_H 1
+
+#if __cplusplus >= 201703L
-#pragma GCC system_header
+#include <string_view>
-#if __cplusplus >= 201402L
+namespace gdb {
+ using string_view = std::string_view;
+} /* namespace gdb */
+
+#else /* __cplusplus < 201703L */
#include <string>
#include <limits>
-#include <experimental/bits/lfts_config.h>
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-namespace experimental
-{
-inline namespace fundamentals_v1
-{
-#define __cpp_lib_experimental_string_view 201411
+namespace gdb {
/**
* @class basic_string_view <experimental/string_view>
@@ -100,12 +96,12 @@ inline namespace fundamentals_v1
constexpr basic_string_view(const basic_string_view&) noexcept = default;
template<typename _Allocator>
- basic_string_view(const basic_string<_CharT, _Traits,
+ basic_string_view(const std::basic_string<_CharT, _Traits,
_Allocator>& __str) noexcept
: _M_len{__str.length()}, _M_str{__str.data()}
{ }
- constexpr basic_string_view(const _CharT* __str)
+ /*constexpr*/ basic_string_view(const _CharT* __str)
: _M_len{__str == nullptr ? 0 : traits_type::length(__str)},
_M_str{__str}
{ }
@@ -188,10 +184,10 @@ inline namespace fundamentals_v1
{
return __pos < this->_M_len
? *(this->_M_str + __pos)
- : (__throw_out_of_range_fmt(__N("basic_string_view::at: __pos "
- "(which is %zu) >= this->size() "
- "(which is %zu)"),
- __pos, this->size()),
+ : (error (_("basic_string_view::at: __pos "
+ "(which is %zu) >= this->size() "
+ "(which is %zu)"),
+ __pos, this->size()),
*this->_M_str);
}
@@ -217,19 +213,19 @@ inline namespace fundamentals_v1
// [string.view.modifiers], modifiers:
- constexpr void
+ /*constexpr*/ void
remove_prefix(size_type __n)
{
- __glibcxx_assert(this->_M_len >= __n);
+ gdb_assert (this->_M_len >= __n);
this->_M_str += __n;
this->_M_len -= __n;
}
- constexpr void
+ /*constexpr*/ void
remove_suffix(size_type __n)
{ this->_M_len -= __n; }
- constexpr void
+ /*constexpr*/ void
swap(basic_string_view& __sv) noexcept
{
auto __tmp = *this;
@@ -241,13 +237,13 @@ inline namespace fundamentals_v1
// [string.view.ops], string operations:
template<typename _Allocator>
- explicit operator basic_string<_CharT, _Traits, _Allocator>() const
+ explicit operator std::basic_string<_CharT, _Traits, _Allocator>() const
{
return { this->_M_str, this->_M_len };
}
template<typename _Allocator = std::allocator<_CharT>>
- basic_string<_CharT, _Traits, _Allocator>
+ std::basic_string<_CharT, _Traits, _Allocator>
to_string(const _Allocator& __alloc = _Allocator()) const
{
return { this->_M_str, this->_M_len, __alloc };
@@ -256,12 +252,12 @@ inline namespace fundamentals_v1
size_type
copy(_CharT* __str, size_type __n, size_type __pos = 0) const
{
- __glibcxx_requires_string_len(__str, __n);
+ gdb_assert (__str != nullptr || __n == 0);
if (__pos > this->_M_len)
- __throw_out_of_range_fmt(__N("basic_string_view::copy: __pos "
- "(which is %zu) > this->size() "
- "(which is %zu)"),
- __pos, this->size());
+ error (_("basic_string_view::copy: __pos "
+ "(which is %zu) > this->size() "
+ "(which is %zu)"),
+ __pos, this->size());
size_type __rlen{std::min(__n, size_type{this->_M_len - __pos})};
for (auto __begin = this->_M_str + __pos,
__end = __begin + __rlen; __begin != __end;)
@@ -272,19 +268,19 @@ inline namespace fundamentals_v1
// [string.view.ops], string operations:
- constexpr basic_string_view
+ /*constexpr*/ basic_string_view
substr(size_type __pos, size_type __n=npos) const
{
return __pos <= this->_M_len
? basic_string_view{this->_M_str + __pos,
std::min(__n, size_type{this->_M_len - __pos})}
- : (__throw_out_of_range_fmt(__N("basic_string_view::substr: __pos "
- "(which is %zu) > this->size() "
- "(which is %zu)"),
- __pos, this->size()), basic_string_view{});
+ : (error (_("basic_string_view::substr: __pos "
+ "(which is %zu) > this->size() "
+ "(which is %zu)"),
+ __pos, this->size()), basic_string_view{});
}
- constexpr int
+ /*constexpr*/ int
compare(basic_string_view __str) const noexcept
{
int __ret = traits_type::compare(this->_M_str, __str._M_str,
@@ -294,24 +290,24 @@ inline namespace fundamentals_v1
return __ret;
}
- constexpr int
+ /*constexpr*/ int
compare(size_type __pos1, size_type __n1, basic_string_view __str) const
{ return this->substr(__pos1, __n1).compare(__str); }
- constexpr int
+ /*constexpr*/ int
compare(size_type __pos1, size_type __n1,
basic_string_view __str, size_type __pos2, size_type __n2) const
{ return this->substr(__pos1, __n1).compare(__str.substr(__pos2, __n2)); }
- constexpr int
+ /*constexpr*/ int
compare(const _CharT* __str) const noexcept
{ return this->compare(basic_string_view{__str}); }
- constexpr int
+ /*constexpr*/ int
compare(size_type __pos1, size_type __n1, const _CharT* __str) const
{ return this->substr(__pos1, __n1).compare(basic_string_view{__str}); }
- constexpr int
+ /*constexpr*/ int
compare(size_type __pos1, size_type __n1,
const _CharT* __str, size_type __n2) const
{
@@ -319,97 +315,97 @@ inline namespace fundamentals_v1
.compare(basic_string_view(__str, __n2));
}
- constexpr size_type
+ /*constexpr*/ size_type
find(basic_string_view __str, size_type __pos = 0) const noexcept
{ return this->find(__str._M_str, __pos, __str._M_len); }
- constexpr size_type
+ /*constexpr*/ size_type
find(_CharT __c, size_type __pos=0) const noexcept;
- constexpr size_type
+ /*constexpr*/ size_type
find(const _CharT* __str, size_type __pos, size_type __n) const noexcept;
- constexpr size_type
+ /*constexpr*/ size_type
find(const _CharT* __str, size_type __pos=0) const noexcept
{ return this->find(__str, __pos, traits_type::length(__str)); }
- constexpr size_type
+ /*constexpr*/ size_type
rfind(basic_string_view __str, size_type __pos = npos) const noexcept
{ return this->rfind(__str._M_str, __pos, __str._M_len); }
- constexpr size_type
+ /*constexpr*/ size_type
rfind(_CharT __c, size_type __pos = npos) const noexcept;
- constexpr size_type
+ /*constexpr*/ size_type
rfind(const _CharT* __str, size_type __pos, size_type __n) const noexcept;
- constexpr size_type
+ /*constexpr*/ size_type
rfind(const _CharT* __str, size_type __pos = npos) const noexcept
{ return this->rfind(__str, __pos, traits_type::length(__str)); }
- constexpr size_type
+ /*constexpr*/ size_type
find_first_of(basic_string_view __str, size_type __pos = 0) const noexcept
{ return this->find_first_of(__str._M_str, __pos, __str._M_len); }
- constexpr size_type
+ /*constexpr*/ size_type
find_first_of(_CharT __c, size_type __pos = 0) const noexcept
{ return this->find(__c, __pos); }
- constexpr size_type
+ /*constexpr*/ size_type
find_first_of(const _CharT* __str, size_type __pos, size_type __n) const;
- constexpr size_type
+ /*constexpr*/ size_type
find_first_of(const _CharT* __str, size_type __pos = 0) const noexcept
{ return this->find_first_of(__str, __pos, traits_type::length(__str)); }
- constexpr size_type
+ /*constexpr*/ size_type
find_last_of(basic_string_view __str,
size_type __pos = npos) const noexcept
{ return this->find_last_of(__str._M_str, __pos, __str._M_len); }
- constexpr size_type
+ size_type
find_last_of(_CharT __c, size_type __pos=npos) const noexcept
{ return this->rfind(__c, __pos); }
- constexpr size_type
+ /*constexpr*/ size_type
find_last_of(const _CharT* __str, size_type __pos, size_type __n) const;
- constexpr size_type
+ /*constexpr*/ size_type
find_last_of(const _CharT* __str, size_type __pos = npos) const noexcept
{ return this->find_last_of(__str, __pos, traits_type::length(__str)); }
- constexpr size_type
+ /*constexpr*/ size_type
find_first_not_of(basic_string_view __str,
size_type __pos = 0) const noexcept
{ return this->find_first_not_of(__str._M_str, __pos, __str._M_len); }
- constexpr size_type
+ /*constexpr*/ size_type
find_first_not_of(_CharT __c, size_type __pos = 0) const noexcept;
- constexpr size_type
+ /*constexpr*/ size_type
find_first_not_of(const _CharT* __str,
size_type __pos, size_type __n) const;
- constexpr size_type
+ /*constexpr*/ size_type
find_first_not_of(const _CharT* __str, size_type __pos = 0) const noexcept
{
return this->find_first_not_of(__str, __pos,
traits_type::length(__str));
}
- constexpr size_type
+ /*constexpr*/ size_type
find_last_not_of(basic_string_view __str,
size_type __pos = npos) const noexcept
{ return this->find_last_not_of(__str._M_str, __pos, __str._M_len); }
- constexpr size_type
+ /*constexpr*/ size_type
find_last_not_of(_CharT __c, size_type __pos = npos) const noexcept;
- constexpr size_type
+ /*constexpr*/ size_type
find_last_not_of(const _CharT* __str,
size_type __pos, size_type __n) const;
- constexpr size_type
+ /*constexpr*/ size_type
find_last_not_of(const _CharT* __str,
size_type __pos = npos) const noexcept
{
@@ -441,240 +437,124 @@ inline namespace fundamentals_v1
// argument participates in template argument deduction and the other
// argument gets implicitly converted to the deduced type. See n3766.html.
template<typename _Tp>
- using __idt = common_type_t<_Tp>;
+ using __idt = typename std::common_type<_Tp>::type;
}
template<typename _CharT, typename _Traits>
- constexpr bool
+ /*constexpr*/ bool
operator==(basic_string_view<_CharT, _Traits> __x,
basic_string_view<_CharT, _Traits> __y) noexcept
{ return __x.size() == __y.size() && __x.compare(__y) == 0; }
template<typename _CharT, typename _Traits>
- constexpr bool
+ /*constexpr*/ bool
operator==(basic_string_view<_CharT, _Traits> __x,
__detail::__idt<basic_string_view<_CharT, _Traits>> __y) noexcept
{ return __x.size() == __y.size() && __x.compare(__y) == 0; }
template<typename _CharT, typename _Traits>
- constexpr bool
+ /*constexpr*/ bool
operator==(__detail::__idt<basic_string_view<_CharT, _Traits>> __x,
basic_string_view<_CharT, _Traits> __y) noexcept
{ return __x.size() == __y.size() && __x.compare(__y) == 0; }
template<typename _CharT, typename _Traits>
- constexpr bool
+ /*constexpr*/ bool
operator!=(basic_string_view<_CharT, _Traits> __x,
basic_string_view<_CharT, _Traits> __y) noexcept
{ return !(__x == __y); }
template<typename _CharT, typename _Traits>
- constexpr bool
+ /*constexpr*/ bool
operator!=(basic_string_view<_CharT, _Traits> __x,
__detail::__idt<basic_string_view<_CharT, _Traits>> __y) noexcept
{ return !(__x == __y); }
template<typename _CharT, typename _Traits>
- constexpr bool
+ /*constexpr*/ bool
operator!=(__detail::__idt<basic_string_view<_CharT, _Traits>> __x,
basic_string_view<_CharT, _Traits> __y) noexcept
{ return !(__x == __y); }
template<typename _CharT, typename _Traits>
- constexpr bool
+ /*constexpr*/ bool
operator< (basic_string_view<_CharT, _Traits> __x,
basic_string_view<_CharT, _Traits> __y) noexcept
{ return __x.compare(__y) < 0; }
template<typename _CharT, typename _Traits>
- constexpr bool
+ /*constexpr*/ bool
operator< (basic_string_view<_CharT, _Traits> __x,
__detail::__idt<basic_string_view<_CharT, _Traits>> __y) noexcept
{ return __x.compare(__y) < 0; }
template<typename _CharT, typename _Traits>
- constexpr bool
+ /*constexpr*/ bool
operator< (__detail::__idt<basic_string_view<_CharT, _Traits>> __x,
basic_string_view<_CharT, _Traits> __y) noexcept
{ return __x.compare(__y) < 0; }
template<typename _CharT, typename _Traits>
- constexpr bool
+ /*constexpr*/ bool
operator> (basic_string_view<_CharT, _Traits> __x,
basic_string_view<_CharT, _Traits> __y) noexcept
{ return __x.compare(__y) > 0; }
template<typename _CharT, typename _Traits>
- constexpr bool
+ /*constexpr*/ bool
operator> (basic_string_view<_CharT, _Traits> __x,
__detail::__idt<basic_string_view<_CharT, _Traits>> __y) noexcept
{ return __x.compare(__y) > 0; }
template<typename _CharT, typename _Traits>
- constexpr bool
+ /*constexpr*/ bool
operator> (__detail::__idt<basic_string_view<_CharT, _Traits>> __x,
basic_string_view<_CharT, _Traits> __y) noexcept
{ return __x.compare(__y) > 0; }
template<typename _CharT, typename _Traits>
- constexpr bool
+ /*constexpr*/ bool
operator<=(basic_string_view<_CharT, _Traits> __x,
basic_string_view<_CharT, _Traits> __y) noexcept
{ return __x.compare(__y) <= 0; }
template<typename _CharT, typename _Traits>
- constexpr bool
+ /*constexpr*/ bool
operator<=(basic_string_view<_CharT, _Traits> __x,
__detail::__idt<basic_string_view<_CharT, _Traits>> __y) noexcept
{ return __x.compare(__y) <= 0; }
template<typename _CharT, typename _Traits>
- constexpr bool
+ /*constexpr*/ bool
operator<=(__detail::__idt<basic_string_view<_CharT, _Traits>> __x,
basic_string_view<_CharT, _Traits> __y) noexcept
{ return __x.compare(__y) <= 0; }
template<typename _CharT, typename _Traits>
- constexpr bool
+ /*constexpr*/ bool
operator>=(basic_string_view<_CharT, _Traits> __x,
basic_string_view<_CharT, _Traits> __y) noexcept
{ return __x.compare(__y) >= 0; }
template<typename _CharT, typename _Traits>
- constexpr bool
+ /*constexpr*/ bool
operator>=(basic_string_view<_CharT, _Traits> __x,
__detail::__idt<basic_string_view<_CharT, _Traits>> __y) noexcept
{ return __x.compare(__y) >= 0; }
template<typename _CharT, typename _Traits>
- constexpr bool
+ /*constexpr*/ bool
operator>=(__detail::__idt<basic_string_view<_CharT, _Traits>> __x,
basic_string_view<_CharT, _Traits> __y) noexcept
{ return __x.compare(__y) >= 0; }
- // [string.view.io], Inserters and extractors
- template<typename _CharT, typename _Traits>
- inline basic_ostream<_CharT, _Traits>&
- operator<<(basic_ostream<_CharT, _Traits>& __os,
- basic_string_view<_CharT,_Traits> __str)
- { return __ostream_insert(__os, __str.data(), __str.size()); }
-
-
// basic_string_view typedef names
using string_view = basic_string_view<char>;
-#ifdef _GLIBCXX_USE_WCHAR_T
- using wstring_view = basic_string_view<wchar_t>;
-#endif
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
- using u16string_view = basic_string_view<char16_t>;
- using u32string_view = basic_string_view<char32_t>;
-#endif
-} // namespace fundamentals_v1
-} // namespace experimental
-
-
- // [string.view.hash], hash support:
- template<typename _Tp>
- struct hash;
-
- template<>
- struct hash<experimental::string_view>
- : public __hash_base<size_t, experimental::string_view>
- {
- size_t
- operator()(const experimental::string_view& __str) const noexcept
- { return std::_Hash_impl::hash(__str.data(), __str.length()); }
- };
-
- template<>
- struct __is_fast_hash<hash<experimental::string_view>> : std::false_type
- { };
+} /* namespace gdb */
-#ifdef _GLIBCXX_USE_WCHAR_T
- template<>
- struct hash<experimental::wstring_view>
- : public __hash_base<size_t, wstring>
- {
- size_t
- operator()(const experimental::wstring_view& __s) const noexcept
- { return std::_Hash_impl::hash(__s.data(),
- __s.length() * sizeof(wchar_t)); }
- };
-
- template<>
- struct __is_fast_hash<hash<experimental::wstring_view>> : std::false_type
- { };
-#endif
-
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
- template<>
- struct hash<experimental::u16string_view>
- : public __hash_base<size_t, experimental::u16string_view>
- {
- size_t
- operator()(const experimental::u16string_view& __s) const noexcept
- { return std::_Hash_impl::hash(__s.data(),
- __s.length() * sizeof(char16_t)); }
- };
+#include "gdb_string_view.tcc"
- template<>
- struct __is_fast_hash<hash<experimental::u16string_view>> : std::false_type
- { };
+#endif // __cplusplus < 201703L
- template<>
- struct hash<experimental::u32string_view>
- : public __hash_base<size_t, experimental::u32string_view>
- {
- size_t
- operator()(const experimental::u32string_view& __s) const noexcept
- { return std::_Hash_impl::hash(__s.data(),
- __s.length() * sizeof(char32_t)); }
- };
-
- template<>
- struct __is_fast_hash<hash<experimental::u32string_view>> : std::false_type
- { };
-#endif
-
-namespace experimental
-{
- // I added these EMSR.
- inline namespace literals
- {
- inline namespace string_view_literals
- {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wliteral-suffix"
- inline constexpr basic_string_view<char>
- operator""sv(const char* __str, size_t __len) noexcept
- { return basic_string_view<char>{__str, __len}; }
-
-#ifdef _GLIBCXX_USE_WCHAR_T
- inline constexpr basic_string_view<wchar_t>
- operator""sv(const wchar_t* __str, size_t __len) noexcept
- { return basic_string_view<wchar_t>{__str, __len}; }
-#endif
-
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
- inline constexpr basic_string_view<char16_t>
- operator""sv(const char16_t* __str, size_t __len) noexcept
- { return basic_string_view<char16_t>{__str, __len}; }
-
- inline constexpr basic_string_view<char32_t>
- operator""sv(const char32_t* __str, size_t __len) noexcept
- { return basic_string_view<char32_t>{__str, __len}; }
-#endif
-#pragma GCC diagnostic pop
- } // namespace string_literals
- } // namespace literals
-} // namespace experimental
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#include <experimental/bits/string_view.tcc>
-
-#endif // __cplusplus <= 201103L
-
-#endif // _GLIBCXX_EXPERIMENTAL_STRING_VIEW
+#endif /* GDB_STRING_VIEW_H */
diff --git a/gdb/common/gdb_string_view.tcc b/gdb/common/gdb_string_view.tcc
index 579ecec..7df567a 100644
--- a/gdb/common/gdb_string_view.tcc
+++ b/gdb/common/gdb_string_view.tcc
@@ -1,5 +1,9 @@
// Components for manipulating non-owning sequences of characters -*- C++ -*-
+// Note: This file has been stolen from the gcc repo
+// (libstdc++-v3/include/experimental/bits/string_view.tcc) and has local
+// modifications.
+
// Copyright (C) 2013-2018 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -31,27 +35,17 @@
// N3762 basic_string_view library
//
-#ifndef _GLIBCXX_EXPERIMENTAL_STRING_VIEW_TCC
-#define _GLIBCXX_EXPERIMENTAL_STRING_VIEW_TCC 1
-
-#pragma GCC system_header
-
-#if __cplusplus >= 201402L
-
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
+#ifndef GDB_STRING_VIEW_TCC
+#define GDB_STRING_VIEW_TCC 1
-namespace experimental
-{
-inline namespace fundamentals_v1
+namespace gdb
{
template<typename _CharT, typename _Traits>
- constexpr typename basic_string_view<_CharT, _Traits>::size_type
+ /*constexpr*/ typename basic_string_view<_CharT, _Traits>::size_type
basic_string_view<_CharT, _Traits>::
find(const _CharT* __str, size_type __pos, size_type __n) const noexcept
{
- __glibcxx_requires_string_len(__str, __n);
+ gdb_assert (__str != nullptr || __n == 0);
if (__n == 0)
return __pos <= this->_M_len ? __pos : npos;
@@ -68,7 +62,7 @@ inline namespace fundamentals_v1
}
template<typename _CharT, typename _Traits>
- constexpr typename basic_string_view<_CharT, _Traits>::size_type
+ /*constexpr*/ typename basic_string_view<_CharT, _Traits>::size_type
basic_string_view<_CharT, _Traits>::
find(_CharT __c, size_type __pos) const noexcept
{
@@ -84,11 +78,11 @@ inline namespace fundamentals_v1
}
template<typename _CharT, typename _Traits>
- constexpr typename basic_string_view<_CharT, _Traits>::size_type
+ /*constexpr*/ typename basic_string_view<_CharT, _Traits>::size_type
basic_string_view<_CharT, _Traits>::
rfind(const _CharT* __str, size_type __pos, size_type __n) const noexcept
{
- __glibcxx_requires_string_len(__str, __n);
+ gdb_assert (__str != nullptr || __n == 0);
if (__n <= this->_M_len)
{
@@ -104,7 +98,7 @@ inline namespace fundamentals_v1
}
template<typename _CharT, typename _Traits>
- constexpr typename basic_string_view<_CharT, _Traits>::size_type
+ /*constexpr*/ typename basic_string_view<_CharT, _Traits>::size_type
basic_string_view<_CharT, _Traits>::
rfind(_CharT __c, size_type __pos) const noexcept
{
@@ -121,11 +115,11 @@ inline namespace fundamentals_v1
}
template<typename _CharT, typename _Traits>
- constexpr typename basic_string_view<_CharT, _Traits>::size_type
+ /*constexpr*/ typename basic_string_view<_CharT, _Traits>::size_type
basic_string_view<_CharT, _Traits>::
find_first_of(const _CharT* __str, size_type __pos, size_type __n) const
{
- __glibcxx_requires_string_len(__str, __n);
+ gdb_assert (__str != nullptr || __n == 0);
for (; __n && __pos < this->_M_len; ++__pos)
{
const _CharT* __p = traits_type::find(__str, __n,
@@ -137,11 +131,11 @@ inline namespace fundamentals_v1
}
template<typename _CharT, typename _Traits>
- constexpr typename basic_string_view<_CharT, _Traits>::size_type
+ /*constexpr*/ typename basic_string_view<_CharT, _Traits>::size_type
basic_string_view<_CharT, _Traits>::
find_last_of(const _CharT* __str, size_type __pos, size_type __n) const
{
- __glibcxx_requires_string_len(__str, __n);
+ gdb_assert (__str != nullptr || __n == 0);
size_type __size = this->size();
if (__size && __n)
{
@@ -158,11 +152,11 @@ inline namespace fundamentals_v1
}
template<typename _CharT, typename _Traits>
- constexpr typename basic_string_view<_CharT, _Traits>::size_type
+ /*constexpr*/ typename basic_string_view<_CharT, _Traits>::size_type
basic_string_view<_CharT, _Traits>::
find_first_not_of(const _CharT* __str, size_type __pos, size_type __n) const
{
- __glibcxx_requires_string_len(__str, __n);
+ gdb_assert (__str != nullptr || __n == 0);
for (; __pos < this->_M_len; ++__pos)
if (!traits_type::find(__str, __n, this->_M_str[__pos]))
return __pos;
@@ -170,7 +164,7 @@ inline namespace fundamentals_v1
}
template<typename _CharT, typename _Traits>
- constexpr typename basic_string_view<_CharT, _Traits>::size_type
+ /*constexpr*/ typename basic_string_view<_CharT, _Traits>::size_type
basic_string_view<_CharT, _Traits>::
find_first_not_of(_CharT __c, size_type __pos) const noexcept
{
@@ -181,11 +175,11 @@ inline namespace fundamentals_v1
}
template<typename _CharT, typename _Traits>
- constexpr typename basic_string_view<_CharT, _Traits>::size_type
+ /*constexpr*/ typename basic_string_view<_CharT, _Traits>::size_type
basic_string_view<_CharT, _Traits>::
find_last_not_of(const _CharT* __str, size_type __pos, size_type __n) const
{
- __glibcxx_requires_string_len(__str, __n);
+ gdb_assert (__str != nullptr || __n == 0);
size_type __size = this->_M_len;
if (__size)
{
@@ -202,7 +196,7 @@ inline namespace fundamentals_v1
}
template<typename _CharT, typename _Traits>
- constexpr typename basic_string_view<_CharT, _Traits>::size_type
+ /*constexpr*/ typename basic_string_view<_CharT, _Traits>::size_type
basic_string_view<_CharT, _Traits>::
find_last_not_of(_CharT __c, size_type __pos) const noexcept
{
@@ -220,12 +214,6 @@ inline namespace fundamentals_v1
}
return npos;
}
-} // namespace fundamentals_v1
-} // namespace experimental
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace std
-
-#endif // __cplusplus <= 201103L
+} // namespace gdb
-#endif // _GLIBCXX_EXPERIMENTAL_STRING_VIEW_TCC
+#endif // GDB_STRING_VIEW_TCC
--
2.7.4
More information about the Gdb-patches
mailing list