/* YACC parser for C expressions, for GDB.
- Copyright (C) 1986-2018 Free Software Foundation, Inc.
+ Copyright (C) 1986-2019 Free Software Foundation, Inc.
This file is part of GDB.
#include "typeprint.h"
#include "cp-abi.h"
-#define parse_type(ps) builtin_type (parse_gdbarch (ps))
+#define parse_type(ps) builtin_type (ps->gdbarch ())
/* Remap normal yacc parser interface names (yyparse, yylex, yyerror,
etc). */
static struct parser_state *pstate = NULL;
+/* Data that must be held for the duration of a parse. */
+
+struct c_parse_state
+{
+ /* These are used to hold type lists and type stacks that are
+ allocated during the parse. */
+ std::vector<std::unique_ptr<std::vector<struct type *>>> type_lists;
+ std::vector<std::unique_ptr<struct type_stack>> type_stacks;
+
+ /* Storage for some strings allocated during the parse. */
+ std::vector<gdb::unique_xmalloc_ptr<char>> strings;
+
+ /* When we find that lexptr (the global var defined in parse.c) is
+ pointing at a macro invocation, we expand the invocation, and call
+ scan_macro_expansion to save the old lexptr here and point lexptr
+ into the expanded text. When we reach the end of that, we call
+ end_macro_expansion to pop back to the value we saved here. The
+ macro expansion code promises to return only fully-expanded text,
+ so we don't need to "push" more than one level.
+
+ This is disgusting, of course. It would be cleaner to do all macro
+ expansion beforehand, and then hand that to lexptr. But we don't
+ really know where the expression ends. Remember, in a command like
+
+ (gdb) break *ADDRESS if CONDITION
+
+ we evaluate ADDRESS in the scope of the current frame, but we
+ evaluate CONDITION in the scope of the breakpoint's location. So
+ it's simply wrong to try to macro-expand the whole thing at once. */
+ const char *macro_original_text = nullptr;
+
+ /* We save all intermediate macro expansions on this obstack for the
+ duration of a single parse. The expansion text may sometimes have
+ to live past the end of the expansion, due to yacc lookahead.
+ Rather than try to be clever about saving the data for a single
+ token, we simply keep it all and delete it after parsing has
+ completed. */
+ auto_obstack expansion_obstack;
+};
+
+/* This is set and cleared in c_parse. */
+
+static struct c_parse_state *cpstate;
+
int yyparse (void);
static int yylex (void);
enum exp_opcode opcode;
struct stoken_vector svec;
- VEC (type_ptr) *tvec;
+ std::vector<struct type *> *tvec;
struct type_stack *type_stack;
static int parse_number (struct parser_state *par_state,
const char *, int, int, YYSTYPE *);
static struct stoken operator_stoken (const char *);
-static void check_parameter_typelist (VEC (type_ptr) *);
+static struct stoken typename_stoken (const char *);
+static void check_parameter_typelist (std::vector<struct type *> *);
static void write_destructor_name (struct parser_state *par_state,
struct stoken);
%token <voidval> COMPLETE
%token <tsym> TYPENAME
%token <theclass> CLASSNAME /* ObjC Class name */
-%type <sval> name
+%type <sval> name field_name
%type <svec> string_exp
%type <ssym> name_not_typename
%type <tsym> type_name
legal basetypes. */
%token SIGNED_KEYWORD LONG SHORT INT_KEYWORD CONST_KEYWORD VOLATILE_KEYWORD DOUBLE_KEYWORD
-%token <sval> VARIABLE
+%token <sval> DOLLAR_VARIABLE
%token <opcode> ASSIGN_MODIFY
{ write_exp_elt_opcode (pstate, UNOP_ALIGNOF); }
;
-exp : exp ARROW name
+exp : exp ARROW field_name
{ write_exp_elt_opcode (pstate, STRUCTOP_PTR);
write_exp_string (pstate, $3);
write_exp_elt_opcode (pstate, STRUCTOP_PTR); }
;
-exp : exp ARROW name COMPLETE
+exp : exp ARROW field_name COMPLETE
{ mark_struct_expression (pstate);
write_exp_elt_opcode (pstate, STRUCTOP_PTR);
write_exp_string (pstate, $3);
{ write_exp_elt_opcode (pstate, STRUCTOP_MPTR); }
;
-exp : exp '.' name
+exp : exp '.' field_name
{ write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
write_exp_string (pstate, $3);
write_exp_elt_opcode (pstate, STRUCTOP_STRUCT); }
;
-exp : exp '.' name COMPLETE
+exp : exp '.' field_name COMPLETE
{ mark_struct_expression (pstate);
write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
write_exp_string (pstate, $3);
{
CORE_ADDR theclass;
- theclass = lookup_objc_class (parse_gdbarch (pstate),
+ theclass = lookup_objc_class (pstate->gdbarch (),
copy_name ($2.stoken));
if (theclass == 0)
error (_("%s is not an ObjC Class"),
exp : exp '('
/* This is to save the value of arglist_len
being accumulated by an outer function call. */
- { start_arglist (); }
+ { pstate->start_arglist (); }
arglist ')' %prec ARROW
{ write_exp_elt_opcode (pstate, OP_FUNCALL);
write_exp_elt_longcst (pstate,
- (LONGEST) end_arglist ());
+ pstate->end_arglist ());
write_exp_elt_opcode (pstate, OP_FUNCALL); }
;
"func()::static_var" further below, which uses
function_method_void. */
exp : exp '(' ')' %prec ARROW
- { start_arglist ();
+ { pstate->start_arglist ();
write_exp_elt_opcode (pstate, OP_FUNCALL);
write_exp_elt_longcst (pstate,
- (LONGEST) end_arglist ());
+ pstate->end_arglist ());
write_exp_elt_opcode (pstate, OP_FUNCALL); }
;
/* This could potentially be a an argument defined
lookup function (Koenig). */
write_exp_elt_opcode (pstate, OP_ADL_FUNC);
- write_exp_elt_block (pstate,
- expression_context_block);
+ write_exp_elt_block
+ (pstate, pstate->expression_context_block);
write_exp_elt_sym (pstate,
NULL); /* Placeholder. */
write_exp_string (pstate, $1.stoken);
/* This is to save the value of arglist_len
being accumulated by an outer function call. */
- start_arglist ();
+ pstate->start_arglist ();
}
arglist ')' %prec ARROW
{
write_exp_elt_opcode (pstate, OP_FUNCALL);
write_exp_elt_longcst (pstate,
- (LONGEST) end_arglist ());
+ pstate->end_arglist ());
write_exp_elt_opcode (pstate, OP_FUNCALL);
}
;
lcurly : '{'
- { start_arglist (); }
+ { pstate->start_arglist (); }
;
arglist :
;
arglist : exp
- { arglist_len = 1; }
+ { pstate->arglist_len = 1; }
;
arglist : arglist ',' exp %prec ABOVE_COMMA
- { arglist_len++; }
+ { pstate->arglist_len++; }
;
function_method: exp '(' parameter_typelist ')' const_or_volatile
- { int i;
- VEC (type_ptr) *type_list = $3;
- struct type *type_elt;
- LONGEST len = VEC_length (type_ptr, type_list);
+ {
+ std::vector<struct type *> *type_list = $3;
+ LONGEST len = type_list->size ();
write_exp_elt_opcode (pstate, TYPE_INSTANCE);
/* Save the const/volatile qualifiers as
write_exp_elt_longcst (pstate,
follow_type_instance_flags ());
write_exp_elt_longcst (pstate, len);
- for (i = 0;
- VEC_iterate (type_ptr, type_list, i, type_elt);
- ++i)
+ for (type *type_elt : *type_list)
write_exp_elt_type (pstate, type_elt);
write_exp_elt_longcst(pstate, len);
write_exp_elt_opcode (pstate, TYPE_INSTANCE);
- VEC_free (type_ptr, type_list);
}
;
;
rcurly : '}'
- { $$ = end_arglist () - 1; }
+ { $$ = pstate->end_arglist () - 1; }
;
exp : lcurly arglist rcurly %prec ARROW
{ write_exp_elt_opcode (pstate, OP_ARRAY);
exp : variable
;
-exp : VARIABLE
+exp : DOLLAR_VARIABLE
{
write_dollar_variable (pstate, $1);
}
{ struct type *type = $3;
write_exp_elt_opcode (pstate, OP_LONG);
write_exp_elt_type (pstate, lookup_signed_typename
- (parse_language (pstate),
- parse_gdbarch (pstate),
+ (pstate->language (),
+ pstate->gdbarch (),
"int"));
type = check_typedef (type);
ptr_operator_ts: ptr_operator
{
$$ = get_type_stack ();
- /* This cleanup is eventually run by
- c_parse. */
- make_cleanup (type_stack_cleanup, $$);
+ cpstate->type_stacks.emplace_back ($$);
}
;
push_type_int ($2);
push_type (tp_array);
$$ = get_type_stack ();
+ cpstate->type_stacks.emplace_back ($$);
}
| array_mod
{
push_type_int ($1);
push_type (tp_array);
$$ = get_type_stack ();
+ cpstate->type_stacks.emplace_back ($$);
}
| direct_abs_decl func_mod
push_type_stack ($1);
push_typelist ($2);
$$ = get_type_stack ();
+ cpstate->type_stacks.emplace_back ($$);
}
| func_mod
{
push_typelist ($1);
$$ = get_type_stack ();
+ cpstate->type_stacks.emplace_back ($$);
}
;
;
func_mod: '(' ')'
- { $$ = NULL; }
+ {
+ $$ = new std::vector<struct type *>;
+ cpstate->type_lists.emplace_back ($$);
+ }
| '(' parameter_typelist ')'
{ $$ = $2; }
;
type : ptype
;
-typebase /* Implements (approximately): (type-qualifier)* type-specifier */
+/* Implements (approximately): (type-qualifier)* type-specifier.
+
+ When type-specifier is only ever a single word, like 'float' then these
+ arrive as pre-built TYPENAME tokens thanks to the classify_name
+ function. However, when a type-specifier can contain multiple words,
+ for example 'double' can appear as just 'double' or 'long double', and
+ similarly 'long' can appear as just 'long' or in 'long double', then
+ these type-specifiers are parsed into their own tokens in the function
+ lex_one_token and the ident_tokens array. These separate tokens are all
+ recognised here. */
+typebase
: TYPENAME
{ $$ = $1.type; }
| INT_KEYWORD
- { $$ = lookup_signed_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_signed_typename (pstate->language (),
+ pstate->gdbarch (),
"int"); }
| LONG
- { $$ = lookup_signed_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_signed_typename (pstate->language (),
+ pstate->gdbarch (),
"long"); }
| SHORT
- { $$ = lookup_signed_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_signed_typename (pstate->language (),
+ pstate->gdbarch (),
"short"); }
| LONG INT_KEYWORD
- { $$ = lookup_signed_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_signed_typename (pstate->language (),
+ pstate->gdbarch (),
"long"); }
| LONG SIGNED_KEYWORD INT_KEYWORD
- { $$ = lookup_signed_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_signed_typename (pstate->language (),
+ pstate->gdbarch (),
"long"); }
| LONG SIGNED_KEYWORD
- { $$ = lookup_signed_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_signed_typename (pstate->language (),
+ pstate->gdbarch (),
"long"); }
| SIGNED_KEYWORD LONG INT_KEYWORD
- { $$ = lookup_signed_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_signed_typename (pstate->language (),
+ pstate->gdbarch (),
"long"); }
| UNSIGNED LONG INT_KEYWORD
- { $$ = lookup_unsigned_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_unsigned_typename (pstate->language (),
+ pstate->gdbarch (),
"long"); }
| LONG UNSIGNED INT_KEYWORD
- { $$ = lookup_unsigned_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_unsigned_typename (pstate->language (),
+ pstate->gdbarch (),
"long"); }
| LONG UNSIGNED
- { $$ = lookup_unsigned_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_unsigned_typename (pstate->language (),
+ pstate->gdbarch (),
"long"); }
| LONG LONG
- { $$ = lookup_signed_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_signed_typename (pstate->language (),
+ pstate->gdbarch (),
"long long"); }
| LONG LONG INT_KEYWORD
- { $$ = lookup_signed_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_signed_typename (pstate->language (),
+ pstate->gdbarch (),
"long long"); }
| LONG LONG SIGNED_KEYWORD INT_KEYWORD
- { $$ = lookup_signed_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_signed_typename (pstate->language (),
+ pstate->gdbarch (),
"long long"); }
| LONG LONG SIGNED_KEYWORD
- { $$ = lookup_signed_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_signed_typename (pstate->language (),
+ pstate->gdbarch (),
"long long"); }
| SIGNED_KEYWORD LONG LONG
- { $$ = lookup_signed_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_signed_typename (pstate->language (),
+ pstate->gdbarch (),
"long long"); }
| SIGNED_KEYWORD LONG LONG INT_KEYWORD
- { $$ = lookup_signed_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_signed_typename (pstate->language (),
+ pstate->gdbarch (),
"long long"); }
| UNSIGNED LONG LONG
- { $$ = lookup_unsigned_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_unsigned_typename (pstate->language (),
+ pstate->gdbarch (),
"long long"); }
| UNSIGNED LONG LONG INT_KEYWORD
- { $$ = lookup_unsigned_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_unsigned_typename (pstate->language (),
+ pstate->gdbarch (),
"long long"); }
| LONG LONG UNSIGNED
- { $$ = lookup_unsigned_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_unsigned_typename (pstate->language (),
+ pstate->gdbarch (),
"long long"); }
| LONG LONG UNSIGNED INT_KEYWORD
- { $$ = lookup_unsigned_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_unsigned_typename (pstate->language (),
+ pstate->gdbarch (),
"long long"); }
| SHORT INT_KEYWORD
- { $$ = lookup_signed_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_signed_typename (pstate->language (),
+ pstate->gdbarch (),
"short"); }
| SHORT SIGNED_KEYWORD INT_KEYWORD
- { $$ = lookup_signed_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_signed_typename (pstate->language (),
+ pstate->gdbarch (),
"short"); }
| SHORT SIGNED_KEYWORD
- { $$ = lookup_signed_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_signed_typename (pstate->language (),
+ pstate->gdbarch (),
"short"); }
| UNSIGNED SHORT INT_KEYWORD
- { $$ = lookup_unsigned_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_unsigned_typename (pstate->language (),
+ pstate->gdbarch (),
"short"); }
| SHORT UNSIGNED
- { $$ = lookup_unsigned_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_unsigned_typename (pstate->language (),
+ pstate->gdbarch (),
"short"); }
| SHORT UNSIGNED INT_KEYWORD
- { $$ = lookup_unsigned_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_unsigned_typename (pstate->language (),
+ pstate->gdbarch (),
"short"); }
| DOUBLE_KEYWORD
- { $$ = lookup_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_typename (pstate->language (),
+ pstate->gdbarch (),
"double",
- (struct block *) NULL,
+ NULL,
0); }
| LONG DOUBLE_KEYWORD
- { $$ = lookup_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_typename (pstate->language (),
+ pstate->gdbarch (),
"long double",
- (struct block *) NULL,
+ NULL,
0); }
| STRUCT name
- { $$ = lookup_struct (copy_name ($2),
- expression_context_block); }
+ { $$
+ = lookup_struct (copy_name ($2),
+ pstate->expression_context_block);
+ }
| STRUCT COMPLETE
{
mark_completion_tag (TYPE_CODE_STRUCT, "", 0);
$$ = NULL;
}
| CLASS name
- { $$ = lookup_struct (copy_name ($2),
- expression_context_block); }
+ { $$ = lookup_struct
+ (copy_name ($2), pstate->expression_context_block);
+ }
| CLASS COMPLETE
{
mark_completion_tag (TYPE_CODE_STRUCT, "", 0);
$$ = NULL;
}
| UNION name
- { $$ = lookup_union (copy_name ($2),
- expression_context_block); }
+ { $$
+ = lookup_union (copy_name ($2),
+ pstate->expression_context_block);
+ }
| UNION COMPLETE
{
mark_completion_tag (TYPE_CODE_UNION, "", 0);
}
| ENUM name
{ $$ = lookup_enum (copy_name ($2),
- expression_context_block); }
+ pstate->expression_context_block);
+ }
| ENUM COMPLETE
{
mark_completion_tag (TYPE_CODE_ENUM, "", 0);
$$ = NULL;
}
| UNSIGNED type_name
- { $$ = lookup_unsigned_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_unsigned_typename (pstate->language (),
+ pstate->gdbarch (),
TYPE_NAME($2.type)); }
| UNSIGNED
- { $$ = lookup_unsigned_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_unsigned_typename (pstate->language (),
+ pstate->gdbarch (),
"int"); }
| SIGNED_KEYWORD type_name
- { $$ = lookup_signed_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_signed_typename (pstate->language (),
+ pstate->gdbarch (),
TYPE_NAME($2.type)); }
| SIGNED_KEYWORD
- { $$ = lookup_signed_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ { $$ = lookup_signed_typename (pstate->language (),
+ pstate->gdbarch (),
"int"); }
/* It appears that this rule for templates is never
reduced; template recognition happens by lookahead
in the token processing code in yylex. */
| TEMPLATE name '<' type '>'
- { $$ = lookup_template_type(copy_name($2), $4,
- expression_context_block);
+ { $$ = lookup_template_type
+ (copy_name($2), $4,
+ pstate->expression_context_block);
}
| const_or_volatile_or_space_identifier_noopt typebase
{ $$ = follow_types ($2); }
{
$$.stoken.ptr = "int";
$$.stoken.length = 3;
- $$.type = lookup_signed_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ $$.type = lookup_signed_typename (pstate->language (),
+ pstate->gdbarch (),
"int");
}
| LONG
{
$$.stoken.ptr = "long";
$$.stoken.length = 4;
- $$.type = lookup_signed_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ $$.type = lookup_signed_typename (pstate->language (),
+ pstate->gdbarch (),
"long");
}
| SHORT
{
$$.stoken.ptr = "short";
$$.stoken.length = 5;
- $$.type = lookup_signed_typename (parse_language (pstate),
- parse_gdbarch (pstate),
+ $$.type = lookup_signed_typename (pstate->language (),
+ pstate->gdbarch (),
"short");
}
;
{ check_parameter_typelist ($1); }
| nonempty_typelist ',' DOTDOTDOT
{
- VEC_safe_push (type_ptr, $1, NULL);
+ $1->push_back (NULL);
check_parameter_typelist ($1);
$$ = $1;
}
nonempty_typelist
: type
{
- VEC (type_ptr) *typelist = NULL;
- VEC_safe_push (type_ptr, typelist, $1);
+ std::vector<struct type *> *typelist
+ = new std::vector<struct type *>;
+ cpstate->type_lists.emplace_back (typelist);
+
+ typelist->push_back ($1);
$$ = typelist;
}
| nonempty_typelist ',' type
{
- VEC_safe_push (type_ptr, $1, $3);
+ $1->push_back ($3);
$$ = $1;
}
;
}
;
-
+/* This rule exists in order to allow some tokens that would not normally
+ match the 'name' rule to appear as fields within a struct. The example
+ that initially motivated this was the RISC-V target which models the
+ floating point registers as a union with fields called 'float' and
+ 'double'. The 'float' string becomes a TYPENAME token and can appear
+ anywhere a 'name' can, however 'double' is its own token,
+ DOUBLE_KEYWORD, and doesn't match the 'name' rule.*/
+field_name
+ : name
+ | DOUBLE_KEYWORD { $$ = typename_stoken ("double"); }
+ | INT_KEYWORD { $$ = typename_stoken ("int"); }
+ | LONG { $$ = typename_stoken ("long"); }
+ | SHORT { $$ = typename_stoken ("short"); }
+ | SIGNED_KEYWORD { $$ = typename_stoken ("signed"); }
+ | UNSIGNED { $$ = typename_stoken ("unsigned"); }
+ ;
name : NAME { $$ = $1.stoken; }
| BLOCKNAME { $$ = $1.stoken; }
struct field_of_this_result is_a_field_of_this;
$$.stoken = $1;
- $$.sym = lookup_symbol ($1.ptr,
- expression_context_block,
- VAR_DOMAIN,
- &is_a_field_of_this);
+ $$.sym
+ = lookup_symbol ($1.ptr,
+ pstate->expression_context_block,
+ VAR_DOMAIN,
+ &is_a_field_of_this);
$$.is_a_field_of_this
= is_a_field_of_this.type != NULL;
}
st.ptr = buf;
/* The toplevel (c_parse) will free the memory allocated here. */
- make_cleanup (free, buf);
+ cpstate->strings.emplace_back (buf);
+ return st;
+};
+
+/* Returns a stoken of the type named TYPE. */
+
+static struct stoken
+typename_stoken (const char *type)
+{
+ struct stoken st = { type, 0 };
+ st.length = strlen (type);
return st;
};
/* Validate a parameter typelist. */
static void
-check_parameter_typelist (VEC (type_ptr) *params)
+check_parameter_typelist (std::vector<struct type *> *params)
{
struct type *type;
int ix;
- for (ix = 0; VEC_iterate (type_ptr, params, ix, type); ++ix)
+ for (ix = 0; ix < params->size (); ++ix)
{
+ type = (*params)[ix];
if (type != NULL && TYPE_CODE (check_typedef (type)) == TYPE_CODE_VOID)
{
if (ix == 0)
{
- if (VEC_length (type_ptr, params) == 1)
+ if (params->size () == 1)
{
/* Ok. */
break;
}
- VEC_free (type_ptr, params);
error (_("parameter types following 'void'"));
}
else
- {
- VEC_free (type_ptr, params);
- error (_("'void' invalid as parameter type"));
- }
+ error (_("'void' invalid as parameter type"));
}
}
}
un = n >> 2;
if (long_p == 0
- && (un >> (gdbarch_int_bit (parse_gdbarch (par_state)) - 2)) == 0)
+ && (un >> (gdbarch_int_bit (par_state->gdbarch ()) - 2)) == 0)
{
high_bit
- = ((ULONGEST)1) << (gdbarch_int_bit (parse_gdbarch (par_state)) - 1);
+ = ((ULONGEST)1) << (gdbarch_int_bit (par_state->gdbarch ()) - 1);
/* A large decimal (not hex or octal) constant (between INT_MAX
and UINT_MAX) is a long or unsigned long, according to ANSI,
signed_type = parse_type (par_state)->builtin_int;
}
else if (long_p <= 1
- && (un >> (gdbarch_long_bit (parse_gdbarch (par_state)) - 2)) == 0)
+ && (un >> (gdbarch_long_bit (par_state->gdbarch ()) - 2)) == 0)
{
high_bit
- = ((ULONGEST)1) << (gdbarch_long_bit (parse_gdbarch (par_state)) - 1);
+ = ((ULONGEST)1) << (gdbarch_long_bit (par_state->gdbarch ()) - 1);
unsigned_type = parse_type (par_state)->builtin_unsigned_long;
signed_type = parse_type (par_state)->builtin_long;
}
{
int shift;
if (sizeof (ULONGEST) * HOST_CHAR_BIT
- < gdbarch_long_long_bit (parse_gdbarch (par_state)))
+ < gdbarch_long_long_bit (par_state->gdbarch ()))
/* A long long does not fit in a LONGEST. */
shift = (sizeof (ULONGEST) * HOST_CHAR_BIT - 1);
else
- shift = (gdbarch_long_long_bit (parse_gdbarch (par_state)) - 1);
+ shift = (gdbarch_long_long_bit (par_state->gdbarch ()) - 1);
high_bit = (ULONGEST) 1 << shift;
unsigned_type = parse_type (par_state)->builtin_unsigned_long_long;
signed_type = parse_type (par_state)->builtin_long_long;
{".*", DOT_STAR, BINOP_END, FLAG_CXX}
};
-/* Identifier-like tokens. */
+/* Identifier-like tokens. Only type-specifiers than can appear in
+ multi-word type names (for example 'double' can appear in 'long
+ double') need to be listed here. type-specifiers that are only ever
+ single word (like 'float') are handled by the classify_name function. */
static const struct token ident_tokens[] =
{
{"unsigned", UNSIGNED, OP_NULL, 0},
{"typeid", TYPEID, OP_TYPEID, FLAG_CXX}
};
-/* When we find that lexptr (the global var defined in parse.c) is
- pointing at a macro invocation, we expand the invocation, and call
- scan_macro_expansion to save the old lexptr here and point lexptr
- into the expanded text. When we reach the end of that, we call
- end_macro_expansion to pop back to the value we saved here. The
- macro expansion code promises to return only fully-expanded text,
- so we don't need to "push" more than one level.
-
- This is disgusting, of course. It would be cleaner to do all macro
- expansion beforehand, and then hand that to lexptr. But we don't
- really know where the expression ends. Remember, in a command like
-
- (gdb) break *ADDRESS if CONDITION
-
- we evaluate ADDRESS in the scope of the current frame, but we
- evaluate CONDITION in the scope of the breakpoint's location. So
- it's simply wrong to try to macro-expand the whole thing at once. */
-static const char *macro_original_text;
-
-/* We save all intermediate macro expansions on this obstack for the
- duration of a single parse. The expansion text may sometimes have
- to live past the end of the expansion, due to yacc lookahead.
- Rather than try to be clever about saving the data for a single
- token, we simply keep it all and delete it after parsing has
- completed. */
-static struct obstack expansion_obstack;
static void
scan_macro_expansion (char *expansion)
char *copy;
/* We'd better not be trying to push the stack twice. */
- gdb_assert (! macro_original_text);
+ gdb_assert (! cpstate->macro_original_text);
/* Copy to the obstack, and then free the intermediate
expansion. */
- copy = (char *) obstack_copy0 (&expansion_obstack, expansion,
+ copy = (char *) obstack_copy0 (&cpstate->expansion_obstack, expansion,
strlen (expansion));
xfree (expansion);
/* Save the old lexptr value, so we can return to it when we're done
parsing the expanded text. */
- macro_original_text = lexptr;
- lexptr = copy;
+ cpstate->macro_original_text = pstate->lexptr;
+ pstate->lexptr = copy;
}
static int
scanning_macro_expansion (void)
{
- return macro_original_text != 0;
+ return cpstate->macro_original_text != 0;
}
static void
finished_macro_expansion (void)
{
/* There'd better be something to pop back to. */
- gdb_assert (macro_original_text);
+ gdb_assert (cpstate->macro_original_text);
/* Pop back to the original text. */
- lexptr = macro_original_text;
- macro_original_text = 0;
-}
-
-static void
-scan_macro_cleanup (void *dummy)
-{
- if (macro_original_text)
- finished_macro_expansion ();
-
- obstack_free (&expansion_obstack, NULL);
+ pstate->lexptr = cpstate->macro_original_text;
+ cpstate->macro_original_text = 0;
}
/* Return true iff the token represents a C++ cast operator. */
operator -- either '.' or ARROW. */
static bool last_was_structop;
+/* Depth of parentheses. */
+static int paren_depth;
+
/* Read one token, getting characters through lexptr. */
static int
/* Check if this is a macro invocation that we need to expand. */
if (! scanning_macro_expansion ())
{
- char *expanded = macro_expand_next (&lexptr,
+ char *expanded = macro_expand_next (&pstate->lexptr,
standard_macro_lookup,
expression_macro_scope);
scan_macro_expansion (expanded);
}
- prev_lexptr = lexptr;
+ pstate->prev_lexptr = pstate->lexptr;
- tokstart = lexptr;
+ tokstart = pstate->lexptr;
/* See if it is a special token of length 3. */
for (i = 0; i < sizeof tokentab3 / sizeof tokentab3[0]; i++)
if (strncmp (tokstart, tokentab3[i].oper, 3) == 0)
{
if ((tokentab3[i].flags & FLAG_CXX) != 0
- && parse_language (par_state)->la_language != language_cplus)
+ && par_state->language ()->la_language != language_cplus)
break;
- lexptr += 3;
+ pstate->lexptr += 3;
yylval.opcode = tokentab3[i].opcode;
return tokentab3[i].token;
}
if (strncmp (tokstart, tokentab2[i].oper, 2) == 0)
{
if ((tokentab2[i].flags & FLAG_CXX) != 0
- && parse_language (par_state)->la_language != language_cplus)
+ && par_state->language ()->la_language != language_cplus)
break;
- lexptr += 2;
+ pstate->lexptr += 2;
yylval.opcode = tokentab2[i].opcode;
if (tokentab2[i].token == ARROW)
last_was_structop = 1;
case ' ':
case '\t':
case '\n':
- lexptr++;
+ pstate->lexptr++;
goto retry;
case '[':
case '(':
paren_depth++;
- lexptr++;
- if (parse_language (par_state)->la_language == language_objc
+ pstate->lexptr++;
+ if (par_state->language ()->la_language == language_objc
&& c == '[')
return OBJC_LBRAC;
return c;
if (paren_depth == 0)
return 0;
paren_depth--;
- lexptr++;
+ pstate->lexptr++;
return c;
case ',':
- if (comma_terminates
+ if (pstate->comma_terminates
&& paren_depth == 0
&& ! scanning_macro_expansion ())
return 0;
- lexptr++;
+ pstate->lexptr++;
return c;
case '.':
/* Might be a floating point number. */
- if (lexptr[1] < '0' || lexptr[1] > '9')
+ if (pstate->lexptr[1] < '0' || pstate->lexptr[1] > '9')
{
last_was_structop = true;
goto symbol; /* Nope, must be a symbol. */
err_copy[p - tokstart] = 0;
error (_("Invalid number \"%s\"."), err_copy);
}
- lexptr = p;
+ pstate->lexptr = p;
return toktype;
}
{
const char *p = &tokstart[1];
- if (parse_language (par_state)->la_language == language_objc)
+ if (par_state->language ()->la_language == language_objc)
{
size_t len = strlen ("selector");
if (strncmp (p, "selector", len) == 0
&& (p[len] == '\0' || ISSPACE (p[len])))
{
- lexptr = p + len;
+ pstate->lexptr = p + len;
return SELECTOR;
}
else if (*p == '"')
if (strncmp (p, "entry", len) == 0 && !c_ident_is_alnum (p[len])
&& p[len] != '_')
{
- lexptr = &p[len];
+ pstate->lexptr = &p[len];
return ENTRY;
}
}
case '{':
case '}':
symbol:
- lexptr++;
+ pstate->lexptr++;
return c;
case 'L':
parse_string:
{
int host_len;
- int result = parse_string_or_char (tokstart, &lexptr, &yylval.tsval,
- &host_len);
+ int result = parse_string_or_char (tokstart, &pstate->lexptr,
+ &yylval.tsval, &host_len);
if (result == CHAR)
{
if (host_len == 0)
else if (host_len > 2 && c == '\'')
{
++tokstart;
- namelen = lexptr - tokstart - 1;
+ namelen = pstate->lexptr - tokstart - 1;
*is_quoted_name = true;
goto tryname;
return 0;
}
- lexptr += namelen;
+ pstate->lexptr += namelen;
tryname:
if (strcmp (copy, ident_tokens[i].oper) == 0)
{
if ((ident_tokens[i].flags & FLAG_CXX) != 0
- && parse_language (par_state)->la_language != language_cplus)
+ && par_state->language ()->la_language != language_cplus)
break;
if ((ident_tokens[i].flags & FLAG_SHADOW) != 0)
{
struct field_of_this_result is_a_field_of_this;
- if (lookup_symbol (copy, expression_context_block,
+ if (lookup_symbol (copy,
+ pstate->expression_context_block,
VAR_DOMAIN,
- (parse_language (par_state)->la_language
+ (par_state->language ()->la_language
== language_cplus ? &is_a_field_of_this
: NULL)).symbol
!= NULL)
}
if (*tokstart == '$')
- return VARIABLE;
+ return DOLLAR_VARIABLE;
- if (parse_completion && *lexptr == '\0')
+ if (parse_completion && *pstate->lexptr == '\0')
saw_name_at_eof = 1;
yylval.ssym.stoken = yylval.sval;
memset (&is_a_field_of_this, 0, sizeof (is_a_field_of_this));
bsym = lookup_symbol (copy, block, VAR_DOMAIN,
- parse_language (par_state)->la_name_of_this
+ par_state->language ()->la_name_of_this
? &is_a_field_of_this : NULL);
if (bsym.symbol && SYMBOL_CLASS (bsym.symbol) == LOC_BLOCK)
}
/* See if it's an ObjC classname. */
- if (parse_language (par_state)->la_language == language_objc && !bsym.symbol)
+ if (par_state->language ()->la_language == language_objc && !bsym.symbol)
{
- CORE_ADDR Class = lookup_objc_class (parse_gdbarch (par_state), copy);
+ CORE_ADDR Class = lookup_objc_class (par_state->gdbarch (), copy);
if (Class)
{
struct symbol *sym;
yylval.theclass.theclass = Class;
- sym = lookup_struct_typedef (copy, expression_context_block, 1);
+ sym = lookup_struct_typedef (copy,
+ par_state->expression_context_block, 1);
if (sym)
yylval.theclass.type = SYMBOL_TYPE (sym);
return CLASSNAME;
yylval.ssym.is_a_field_of_this = is_a_field_of_this.type != NULL;
if (bsym.symbol == NULL
- && parse_language (par_state)->la_language == language_cplus
+ && par_state->language ()->la_language == language_cplus
&& is_a_field_of_this.type == NULL
&& lookup_minimal_symbol (copy, NULL, NULL).minsym == NULL)
return UNKNOWN_CPP_NAME;
name-like token. */
current.token = lex_one_token (pstate, &is_quoted_name);
if (current.token == NAME)
- current.token = classify_name (pstate, expression_context_block,
+ current.token = classify_name (pstate, pstate->expression_context_block,
is_quoted_name, last_lex_was_structop);
- if (parse_language (pstate)->la_language != language_cplus
+ if (pstate->language ()->la_language != language_cplus
|| (current.token != TYPENAME && current.token != COLONCOLON
&& current.token != FILENAME))
return current.token;
else
{
gdb_assert (current.token == TYPENAME);
- search_block = expression_context_block;
+ search_block = pstate->expression_context_block;
obstack_grow (&name_obstack, current.value.sval.ptr,
current.value.sval.length);
context_type = current.value.tsym.type;
if (checkpoint > 0)
{
current.value.sval.ptr
- = (const char *) obstack_copy0 (&expansion_obstack,
+ = (const char *) obstack_copy0 (&cpstate->expansion_obstack,
current.value.sval.ptr,
current.value.sval.length);
int
c_parse (struct parser_state *par_state)
{
- int result;
- struct cleanup *back_to;
-
/* Setting up the parser state. */
scoped_restore pstate_restore = make_scoped_restore (&pstate);
gdb_assert (par_state != NULL);
pstate = par_state;
+ c_parse_state cstate;
+ scoped_restore cstate_restore = make_scoped_restore (&cpstate, &cstate);
+
gdb::unique_xmalloc_ptr<struct macro_scope> macro_scope;
- if (expression_context_block)
- macro_scope = sal_macro_scope (find_pc_line (expression_context_pc, 0));
+ if (par_state->expression_context_block)
+ macro_scope
+ = sal_macro_scope (find_pc_line (par_state->expression_context_pc, 0));
else
macro_scope = default_macro_scope ();
if (! macro_scope)
scoped_restore restore_macro_scope
= make_scoped_restore (&expression_macro_scope, macro_scope.get ());
- /* Initialize macro expansion code. */
- obstack_init (&expansion_obstack);
- gdb_assert (! macro_original_text);
- /* Note that parsing (within yyparse) freely installs cleanups
- assuming they'll be run here (below). */
- back_to = make_cleanup (scan_macro_cleanup, 0);
-
scoped_restore restore_yydebug = make_scoped_restore (&yydebug,
parser_debug);
/* Initialize some state used by the lexer. */
last_was_structop = false;
saw_name_at_eof = 0;
+ paren_depth = 0;
token_fifo.clear ();
popping = 0;
name_obstack.clear ();
- result = yyparse ();
- do_cleanups (back_to);
-
- return result;
+ return yyparse ();
}
#ifdef YYBISON
break;
case NSSTRING:
- case VARIABLE:
+ case DOLLAR_VARIABLE:
parser_fprintf (file, "sval<%s>", copy_name (value.sval));
break;
static void
yyerror (const char *msg)
{
- if (prev_lexptr)
- lexptr = prev_lexptr;
+ if (pstate->prev_lexptr)
+ pstate->lexptr = pstate->prev_lexptr;
- error (_("A %s in expression, near `%s'."), msg, lexptr);
+ error (_("A %s in expression, near `%s'."), msg, pstate->lexptr);
}