forked from Imagelibrary/binutils-gdb
14d960c82a
For some reason, macro_expand_next does not return a
gdb::unique_xmalloc_ptr<char>, like its counterparts macro_expand and
macro_expand_once. This patch fixes that.
macro_buffer::release now returns a gdb::unique_xmalloc_ptr<char> too,
which required updating the other callers. The `.release (). release
()` in macro_stringify looks a bit funny, but it's because one release
is for the macro_buffer, and the other is for the unique ptr.
I removed the ATTRIBUTE_UNUSED_RESULT on macro_buffer::release, I don't
really understand why it's there. I don't see how this method could be
called without using the result, that would be an obvious memory leak.
The commit that introduced it (4e4a8b932b "Add ATTRIBUTE_UNUSED_RESULT
to macro_buffer") doesn't give any details.
gdb/ChangeLog:
* c-exp.y (scan_macro_expansion): Don't free `expansion`.
(lex_one_token): Update.
* macroexp.c (struct macro_buffer) <release>: Return
gdb::unique_xmalloc_ptr<char>.
(macro_stringify): Update.
(macro_expand): Update.
(macro_expand_next): Return gdb::unique_xmalloc_ptr<char>.
* macroexp.h (macro_expand_next): Likewise.
Change-Id: I67a74d0d479d2c20cdc82161ead7c54cea034f56
87 lines
3.2 KiB
C
87 lines
3.2 KiB
C
/* Interface to C preprocessor macro expansion for GDB.
|
|
Copyright (C) 2002-2020 Free Software Foundation, Inc.
|
|
Contributed by Red Hat, 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 MACROEXP_H
|
|
#define MACROEXP_H
|
|
|
|
struct macro_scope;
|
|
|
|
/* Expand any preprocessor macros in SOURCE (a null-terminated string), and
|
|
return the expanded text.
|
|
|
|
Use SCOPE to find identifiers' preprocessor definitions.
|
|
|
|
The result is a null-terminated string. */
|
|
gdb::unique_xmalloc_ptr<char> macro_expand (const char *source,
|
|
const macro_scope &scope);
|
|
|
|
/* Expand all preprocessor macro references that appear explicitly in SOURCE
|
|
(a null-terminated string), but do not expand any new macro references
|
|
introduced by that first level of expansion.
|
|
|
|
Use SCOPE to find identifiers' preprocessor definitions.
|
|
|
|
The result is a null-terminated string. */
|
|
gdb::unique_xmalloc_ptr<char> macro_expand_once (const char *source,
|
|
const macro_scope &scope);
|
|
|
|
/* If the null-terminated string pointed to by *LEXPTR begins with a
|
|
macro invocation, return the result of expanding that invocation as
|
|
a null-terminated string, and set *LEXPTR to the next character
|
|
after the invocation. The result is completely expanded; it
|
|
contains no further macro invocations.
|
|
|
|
Otherwise, if *LEXPTR does not start with a macro invocation,
|
|
return nullptr, and leave *LEXPTR unchanged.
|
|
|
|
Use SCOPE to find macro definitions.
|
|
|
|
If this function returns a string, the caller is responsible for
|
|
freeing it, using xfree.
|
|
|
|
We need this expand-one-token-at-a-time interface in order to
|
|
accomodate GDB's C expression parser, which may not consume the
|
|
entire string. When the user enters a command like
|
|
|
|
(gdb) break *func+20 if x == 5
|
|
|
|
the parser is expected to consume `func+20', and then stop when it
|
|
sees the "if". But of course, "if" appearing in a character string
|
|
or as part of a larger identifier doesn't count. So you pretty
|
|
much have to do tokenization to find the end of the string that
|
|
needs to be macro-expanded. Our C/C++ tokenizer isn't really
|
|
designed to be called by anything but the yacc parser engine. */
|
|
gdb::unique_xmalloc_ptr<char> macro_expand_next (const char **lexptr,
|
|
const macro_scope &scope);
|
|
|
|
/* Functions to classify characters according to cpp rules. */
|
|
|
|
int macro_is_whitespace (int c);
|
|
int macro_is_identifier_nondigit (int c);
|
|
int macro_is_digit (int c);
|
|
|
|
|
|
/* Stringify STR according to C rules and return an xmalloc'd pointer
|
|
to the result. */
|
|
|
|
char *macro_stringify (const char *str);
|
|
|
|
#endif /* MACROEXP_H */
|