mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-21 04:42:53 +08:00
b17992c1c0
I noticed that the printf command did not recognize the \e escape sequence, used amongst other things to use colors: (gdb) printf "This is \e[32mgreen\e[m!\n" Unrecognized escape character \e in format string. This patch makes format_pieces recognize it, which makes that command print the expected result in glorious color. I wrote a really simple unit test for format_pieces. format_pieces::operator[] is unused so I removed it. I added format_piece::operator==, which is needed to compare vectors of format_piece. gdb/ChangeLog: PR cli/14975 * Makefile.in (SUBDIR_UNITTESTS_SRCS): Add unittests/format_pieces-selftests.c. * common/format.h (format_piece) <operator==>: New. (format_pieces) <operator[]>: Remove. * common/format.c (format_pieces::format_pieces): Handle \e. * unittests/format_pieces-selftests.c: New.
97 lines
2.4 KiB
C++
97 lines
2.4 KiB
C++
/* Parse a printf-style format string.
|
|
|
|
Copyright (C) 1986-2018 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program 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 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program 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 program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef COMMON_FORMAT_H
|
|
#define COMMON_FORMAT_H
|
|
|
|
#include "common/gdb_string_view.h"
|
|
|
|
#if defined(__MINGW32__) && !defined(PRINTF_HAS_LONG_LONG)
|
|
# define USE_PRINTF_I64 1
|
|
# define PRINTF_HAS_LONG_LONG
|
|
#else
|
|
# define USE_PRINTF_I64 0
|
|
#endif
|
|
|
|
/* The argclass represents the general type of data that goes with a
|
|
format directive; int_arg for %d, long_arg for %l, and so forth.
|
|
Note that these primarily distinguish types by size and need for
|
|
special handling, so for instance %u and %x are (at present) also
|
|
classed as int_arg. */
|
|
|
|
enum argclass
|
|
{
|
|
literal_piece,
|
|
int_arg, long_arg, long_long_arg, ptr_arg,
|
|
string_arg, wide_string_arg, wide_char_arg,
|
|
double_arg, long_double_arg,
|
|
dec32float_arg, dec64float_arg, dec128float_arg
|
|
};
|
|
|
|
/* A format piece is a section of the format string that may include a
|
|
single print directive somewhere in it, and the associated class
|
|
for the argument. */
|
|
|
|
struct format_piece
|
|
{
|
|
format_piece (const char *str, enum argclass argc)
|
|
: string (str),
|
|
argclass (argc)
|
|
{
|
|
}
|
|
|
|
bool operator== (const format_piece &other) const
|
|
{
|
|
return (this->argclass == other.argclass
|
|
&& gdb::string_view (this->string) == other.string);
|
|
}
|
|
|
|
const char *string;
|
|
enum argclass argclass;
|
|
};
|
|
|
|
class format_pieces
|
|
{
|
|
public:
|
|
|
|
format_pieces (const char **arg);
|
|
~format_pieces () = default;
|
|
|
|
DISABLE_COPY_AND_ASSIGN (format_pieces);
|
|
|
|
typedef std::vector<format_piece>::iterator iterator;
|
|
|
|
iterator begin ()
|
|
{
|
|
return m_pieces.begin ();
|
|
}
|
|
|
|
iterator end ()
|
|
{
|
|
return m_pieces.end ();
|
|
}
|
|
|
|
private:
|
|
|
|
std::vector<format_piece> m_pieces;
|
|
gdb::unique_xmalloc_ptr<char> m_storage;
|
|
};
|
|
|
|
#endif /* COMMON_FORMAT_H */
|