+2020-07-02 Simon Marchi <simon.marchi@efficios.com>
+
+ * macroexp.h (macro_lookup_ftype): Remove.
+ (macro_expand, macro_expand_once, macro_expand_next): Remove
+ lookup function parameters, add scope parameter.
+ * macroexp.c (scan, substitute_args, expand, maybe_expand,
+ macro_expand, macro_expand_once, macro_expand_next): Likewise.
+ * macroscope.h (standard_macro_lookup): Change parameter type
+ to macro_scope.
+ * macroscope.c (standard_macro_lookup): Likewise.
+ * c-exp.y (lex_one_token): Update.
+ * macrocmd.c (macro_expand_command): Likewise.
+ (macro_expand_once_command): Likewise.
+
2020-07-02 Simon Marchi <simon.marchi@polymtl.ca>
* inf-loop.c (inferior_event_handler): Remove client_data param.
if (! scanning_macro_expansion ())
{
char *expanded = macro_expand_next (&pstate->lexptr,
- standard_macro_lookup,
- expression_macro_scope);
+ *expression_macro_scope);
if (expanded)
scan_macro_expansion (expanded);
static void
macro_expand_command (const char *exp, int from_tty)
{
- gdb::unique_xmalloc_ptr<struct macro_scope> ms;
- gdb::unique_xmalloc_ptr<char> expanded;
-
/* You know, when the user doesn't specify any expression, it would be
really cool if this defaulted to the last expression evaluated.
Then it would be easy to ask, "Hey, what did I just evaluate?" But
" expression you\n"
"want to expand."));
- ms = default_macro_scope ();
- if (ms)
+ gdb::unique_xmalloc_ptr<macro_scope> ms = default_macro_scope ();
+
+ if (ms != nullptr)
{
- expanded = macro_expand (exp, standard_macro_lookup, ms.get ());
+ gdb::unique_xmalloc_ptr<char> expanded = macro_expand (exp, *ms);
+
fputs_filtered ("expands to: ", gdb_stdout);
fputs_filtered (expanded.get (), gdb_stdout);
fputs_filtered ("\n", gdb_stdout);
static void
macro_expand_once_command (const char *exp, int from_tty)
{
- gdb::unique_xmalloc_ptr<struct macro_scope> ms;
- gdb::unique_xmalloc_ptr<char> expanded;
-
/* You know, when the user doesn't specify any expression, it would be
really cool if this defaulted to the last expression evaluated.
And it should set the once-expanded text as the new `last
" the expression\n"
"you want to expand."));
- ms = default_macro_scope ();
- if (ms)
+ gdb::unique_xmalloc_ptr<macro_scope> ms = default_macro_scope ();
+
+ if (ms != nullptr)
{
- expanded = macro_expand_once (exp, standard_macro_lookup, ms.get ());
+ gdb::unique_xmalloc_ptr<char> expanded = macro_expand_once (exp, *ms);
+
fputs_filtered ("expands to: ", gdb_stdout);
fputs_filtered (expanded.get (), gdb_stdout);
fputs_filtered ("\n", gdb_stdout);
#include "gdb_obstack.h"
#include "macrotab.h"
#include "macroexp.h"
+#include "macroscope.h"
#include "c-lang.h"
static void scan (struct macro_buffer *dest,
struct macro_buffer *src,
struct macro_name_list *no_loop,
- macro_lookup_ftype *lookup_func,
- void *lookup_baton);
-
+ const macro_scope &scope);
/* A helper function for substitute_args.
int is_varargs, const struct macro_buffer *va_arg_name,
const std::vector<struct macro_buffer> &argv,
struct macro_name_list *no_loop,
- macro_lookup_ftype *lookup_func,
- void *lookup_baton)
+ const macro_scope &scope)
{
/* The token we are currently considering. */
struct macro_buffer tok;
referring to the argument's text, not the argument
itself. */
struct macro_buffer arg_src (argv[arg].text, argv[arg].len);
- scan (dest, &arg_src, no_loop, lookup_func, lookup_baton);
+ scan (dest, &arg_src, no_loop, scope);
substituted = 1;
}
struct macro_buffer *dest,
struct macro_buffer *src,
struct macro_name_list *no_loop,
- macro_lookup_ftype *lookup_func,
- void *lookup_baton)
+ const macro_scope &scope)
{
struct macro_name_list new_no_loop;
struct macro_buffer replacement_list (def->replacement,
strlen (def->replacement));
- scan (dest, &replacement_list, &new_no_loop, lookup_func, lookup_baton);
+ scan (dest, &replacement_list, &new_no_loop, scope);
return 1;
}
else if (def->kind == macro_function_like)
expand an argument until we see how it's being used. */
struct macro_buffer substituted (0);
substitute_args (&substituted, def, is_varargs, &va_arg_name,
- argv, no_loop, lookup_func, lookup_baton);
+ argv, no_loop, scope);
/* Now `substituted' is the macro's replacement list, with all
argument values substituted into it properly. Re-scan it for
`substituted's original text buffer after scanning it so we
can free it. */
struct macro_buffer substituted_src (substituted.text, substituted.len);
- scan (dest, &substituted_src, &new_no_loop, lookup_func, lookup_baton);
+ scan (dest, &substituted_src, &new_no_loop, scope);
return 1;
}
struct macro_buffer *src_first,
struct macro_buffer *src_rest,
struct macro_name_list *no_loop,
- macro_lookup_ftype *lookup_func,
- void *lookup_baton)
+ const macro_scope &scope)
{
gdb_assert (src_first->shared);
gdb_assert (src_rest->shared);
if (! currently_rescanning (no_loop, id.c_str ()))
{
/* Does this identifier have a macro definition in scope? */
- struct macro_definition *def = lookup_func (id.c_str (),
- lookup_baton);
+ macro_definition *def = standard_macro_lookup (id.c_str (), scope);
- if (def && expand (id.c_str (), def, dest, src_rest, no_loop,
- lookup_func, lookup_baton))
+ if (def && expand (id.c_str (), def, dest, src_rest, no_loop, scope))
return 1;
}
}
scan (struct macro_buffer *dest,
struct macro_buffer *src,
struct macro_name_list *no_loop,
- macro_lookup_ftype *lookup_func,
- void *lookup_baton)
+ const macro_scope &scope)
{
gdb_assert (src->shared);
gdb_assert (! dest->shared);
dest->last_token = dest->len;
}
- if (! maybe_expand (dest, &tok, src, no_loop, lookup_func, lookup_baton))
+ if (! maybe_expand (dest, &tok, src, no_loop, scope))
/* We didn't end up expanding tok as a macro reference, so
simply append it to dest. */
append_tokens_without_splicing (dest, &tok);
gdb::unique_xmalloc_ptr<char>
-macro_expand (const char *source,
- macro_lookup_ftype *lookup_func,
- void *lookup_func_baton)
+macro_expand (const char *source, const macro_scope &scope)
{
struct macro_buffer src (source, strlen (source));
struct macro_buffer dest (0);
dest.last_token = 0;
- scan (&dest, &src, 0, lookup_func, lookup_func_baton);
+ scan (&dest, &src, 0, scope);
dest.appendc ('\0');
gdb::unique_xmalloc_ptr<char>
-macro_expand_once (const char *source,
- macro_lookup_ftype *lookup_func,
- void *lookup_func_baton)
+macro_expand_once (const char *source, const macro_scope &scope)
{
error (_("Expand-once not implemented yet."));
}
char *
-macro_expand_next (const char **lexptr,
- macro_lookup_ftype *lookup_func,
- void *lookup_baton)
+macro_expand_next (const char **lexptr, const macro_scope &scope)
{
struct macro_buffer tok;
return 0;
/* If it's a macro invocation, expand it. */
- if (maybe_expand (&dest, &tok, &src, 0, lookup_func, lookup_baton))
+ if (maybe_expand (&dest, &tok, &src, 0, scope))
{
/* It was a macro invocation! Package up the expansion as a
null-terminated string and return it. Set *lexptr to the
#ifndef MACROEXP_H
#define MACROEXP_H
-/* A function for looking up preprocessor macro definitions. Return
- the preprocessor definition of NAME in scope according to BATON, or
- zero if NAME is not defined as a preprocessor macro.
-
- The caller must not free or modify the definition returned. It is
- probably unwise for the caller to hold pointers to it for very
- long; it probably lives in some objfile's obstacks. */
-typedef struct macro_definition *(macro_lookup_ftype) (const char *name,
- void *baton);
-
-
-/* Expand any preprocessor macros in SOURCE, and return the expanded
- text. Use LOOKUP_FUNC and LOOKUP_FUNC_BATON to find identifiers'
- preprocessor definitions. SOURCE is a null-terminated string. The
- result is a null-terminated string, allocated using xmalloc; it is
- the caller's responsibility to free it. */
+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,
- macro_lookup_ftype *lookup_func,
- void *lookup_func_baton);
+ 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.
-/* Expand all preprocessor macro references that appear explicitly in
- SOURCE, but do not expand any new macro references introduced by
- that first level of expansion. Use LOOKUP_FUNC and
- LOOKUP_FUNC_BATON to find identifiers' preprocessor definitions.
- SOURCE is a null-terminated string. The result is a
- null-terminated string, allocated using xmalloc; it is the caller's
- responsibility to free it. */
-gdb::unique_xmalloc_ptr<char> macro_expand_once (const char *source,
- macro_lookup_ftype *lookup_func,
- void *lookup_func_baton);
+ 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
contains no further macro invocations.
Otherwise, if *LEXPTR does not start with a macro invocation,
- return zero, and leave *LEXPTR unchanged.
+ return nullptr, and leave *LEXPTR unchanged.
- Use LOOKUP_FUNC and LOOKUP_BATON to find macro definitions.
+ Use SCOPE to find macro definitions.
If this function returns a string, the caller is responsible for
freeing it, using xfree.
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. */
-char *macro_expand_next (const char **lexptr,
- macro_lookup_ftype *lookup_func,
- void *lookup_baton);
+char *macro_expand_next (const char **lexptr, const macro_scope &scope);
/* Functions to classify characters according to cpp rules. */
location given by BATON, which must be a pointer to a `struct
macro_scope' structure. */
struct macro_definition *
-standard_macro_lookup (const char *name, void *baton)
+standard_macro_lookup (const char *name, const macro_scope &ms)
{
- struct macro_scope *ms = (struct macro_scope *) baton;
- struct macro_definition *result;
-
/* Give user-defined macros priority over all others. */
- result = macro_lookup_definition (macro_main (macro_user_macros), -1, name);
- if (! result)
- result = macro_lookup_definition (ms->file, ms->line, name);
+ macro_definition *result
+ = macro_lookup_definition (macro_main (macro_user_macros), -1, name);
+
+ if (result == nullptr)
+ result = macro_lookup_definition (ms.file, ms.line, name);
+
return result;
}
the user macro scope. */
gdb::unique_xmalloc_ptr<struct macro_scope> default_macro_scope (void);
-
/* Look up the definition of the macro named NAME in scope at the source
- location given by BATON, which must be a pointer to a `struct
- macro_scope' structure. This function is suitable for use as
- a macro_lookup_ftype function. */
-struct macro_definition *standard_macro_lookup (const char *name, void *baton);
-
+ location given by MS. */
+macro_definition *standard_macro_lookup (const char *name,
+ const macro_scope &ms);
#endif /* MACROSCOPE_H */
projects / binutils-gdb.git / commitdiff