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.
This commit is contained in:
parent
7adcdf08e7
commit
8345c4a267
4 changed files with 126 additions and 260 deletions
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue