X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fparser-defs.h;h=d6c3b068978efed010263ad85cdea2460344fd50;hb=d16c467a501547e37b111f775396e28f8bf27c1e;hp=5bc9d253d48cf68e7476da64f84f94907642ea3b;hpb=37eedb39824dc26c82a92b5515a352d7de0c9b5b;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/parser-defs.h b/gdb/parser-defs.h index 5bc9d253d4..d6c3b06897 100644 --- a/gdb/parser-defs.h +++ b/gdb/parser-defs.h @@ -1,6 +1,6 @@ /* Parser definitions for GDB. - Copyright (C) 1986-2019 Free Software Foundation, Inc. + Copyright (C) 1986-2020 Free Software Foundation, Inc. Modified from expread.y by the Department of Computer Science at the State University of New York at Buffalo. @@ -23,14 +23,15 @@ #if !defined (PARSER_DEFS_H) #define PARSER_DEFS_H 1 -#include "common/vec.h" #include "expression.h" +#include "symtab.h" struct block; struct language_defn; struct internalvar; +class innermost_block_tracker; -extern int parser_debug; +extern bool parser_debug; /* A class that can be used to build a "struct expression". */ @@ -76,6 +77,22 @@ struct expr_builder size_t expout_ptr; }; +/* This is used for expression completion. */ + +struct expr_completion_state +{ + /* The index of the last struct expression directly before a '.' or + '->'. This is set when parsing and is only used when completing a + field name. It is -1 if no dereference operation was found. */ + int expout_last_struct = -1; + + /* If we are completing a tagged type name, this will be nonzero. */ + enum type_code expout_tag_completion_type = TYPE_CODE_UNDEF; + + /* The token for tagged type name completion. */ + gdb::unique_xmalloc_ptr expout_completion_name; +}; + /* An instance of this type is instantiated during expression parsing, and passed to the appropriate parser. It holds both inputs to the parser, and result. */ @@ -86,24 +103,102 @@ struct parser_state : public expr_builder And GDBARCH is the gdbarch to use during parsing. */ parser_state (const struct language_defn *lang, - struct gdbarch *gdbarch) - : expr_builder (lang, gdbarch) + struct gdbarch *gdbarch, + const struct block *context_block, + CORE_ADDR context_pc, + int comma, + const char *input, + int completion, + innermost_block_tracker *tracker) + : expr_builder (lang, gdbarch), + expression_context_block (context_block), + expression_context_pc (context_pc), + comma_terminates (comma), + lexptr (input), + parse_completion (completion), + block_tracker (tracker) { } DISABLE_COPY_AND_ASSIGN (parser_state); -}; -/* If this is nonzero, this block is used as the lexical context - for symbol names. */ + /* Begin counting arguments for a function call, + saving the data about any containing call. */ + + void start_arglist () + { + m_funcall_chain.push_back (arglist_len); + arglist_len = 0; + } + + /* Return the number of arguments in a function call just terminated, + and restore the data for the containing function call. */ + + int end_arglist () + { + int val = arglist_len; + arglist_len = m_funcall_chain.back (); + m_funcall_chain.pop_back (); + return val; + } + + /* Mark the current index as the starting location of a structure + expression. This is used when completing on field names. */ + + void mark_struct_expression (); + + /* Indicate that the current parser invocation is completing a tag. + TAG is the type code of the tag, and PTR and LENGTH represent the + start of the tag name. */ + + void mark_completion_tag (enum type_code tag, const char *ptr, int length); -extern const struct block *expression_context_block; -/* If expression_context_block is non-zero, then this is the PC within - the block that we want to evaluate expressions at. When debugging - C or C++ code, we use this to find the exact line we're at, and - then look up the macro definitions active at that point. */ -extern CORE_ADDR expression_context_pc; + /* If this is nonzero, this block is used as the lexical context for + symbol names. */ + + const struct block * const expression_context_block; + + /* If expression_context_block is non-zero, then this is the PC + within the block that we want to evaluate expressions at. When + debugging C or C++ code, we use this to find the exact line we're + at, and then look up the macro definitions active at that + point. */ + const CORE_ADDR expression_context_pc; + + /* Nonzero means stop parsing on first comma (if not within parentheses). */ + + int comma_terminates; + + /* During parsing of a C expression, the pointer to the next character + is in this variable. */ + + const char *lexptr; + + /* After a token has been recognized, this variable points to it. + Currently used only for error reporting. */ + const char *prev_lexptr = nullptr; + + /* Number of arguments seen so far in innermost function call. */ + + int arglist_len = 0; + + /* True if parsing an expression to attempt completion. */ + int parse_completion; + + /* Completion state is updated here. */ + expr_completion_state m_completion_state; + + /* The innermost block tracker. */ + innermost_block_tracker *block_tracker; + +private: + + /* Data structure for saving values of arglist_len for function calls whose + arguments contain other function calls. */ + + std::vector m_funcall_chain; +}; /* When parsing expressions we track the innermost block that was referenced. */ @@ -111,21 +206,12 @@ extern CORE_ADDR expression_context_pc; class innermost_block_tracker { public: - innermost_block_tracker () - : m_types (INNERMOST_BLOCK_FOR_SYMBOLS), + innermost_block_tracker (innermost_block_tracker_types types + = INNERMOST_BLOCK_FOR_SYMBOLS) + : m_types (types), m_innermost_block (NULL) { /* Nothing. */ } - /* Reset the currently stored innermost block. Usually called before - parsing a new expression. As the most common case is that we only - want to gather the innermost block for symbols in an expression, this - becomes the default block tracker type. */ - void reset (innermost_block_tracker_types t = INNERMOST_BLOCK_FOR_SYMBOLS) - { - m_types = t; - m_innermost_block = NULL; - } - /* Update the stored innermost block if the new block B is more inner than the currently stored block, or if no block is stored yet. The type T tells us whether the block B was for a symbol or for a @@ -157,15 +243,6 @@ private: const struct block *m_innermost_block; }; -/* The innermost context required by the stack and register variables - we've encountered so far. This is cleared by the expression - parsing functions before parsing an expression, and can queried - once the parse is complete. */ -extern innermost_block_tracker innermost_block; - -/* Number of arguments seen so far in innermost function call. */ -extern int arglist_len; - /* A string token, either a char-string or bit-string. Char-strings are used, for example, for the names of symbols. */ @@ -213,48 +290,15 @@ struct objc_class_str int theclass; }; -/* For parsing of complicated types. - An array should be preceded in the list by the size of the array. */ -enum type_pieces - { - tp_end = -1, - tp_pointer, - tp_reference, - tp_rvalue_reference, - tp_array, - tp_function, - tp_function_with_arguments, - tp_const, - tp_volatile, - tp_space_identifier, - tp_type_stack, - tp_kind - }; -/* The stack can contain either an enum type_pieces or an int. */ -union type_stack_elt - { - enum type_pieces piece; - int int_val; - struct type_stack *stack_val; - std::vector *typelist_val; - }; - -/* The type stack is an instance of this structure. */ - -struct type_stack -{ - /* Elements on the stack. */ - std::vector elements; -}; - /* Reverse an expression from suffix form (in which it is constructed) to prefix form (in which we can conveniently print or execute it). - Ordinarily this always returns -1. However, if EXPOUT_LAST_STRUCT + Ordinarily this always returns -1. However, if LAST_STRUCT is not -1 (i.e., we are trying to complete a field name), it will return the index of the subexpression which is the left-hand-side - of the struct operation at EXPOUT_LAST_STRUCT. */ + of the struct operation at LAST_STRUCT. */ -extern int prefixify_expression (struct expression *expr); +extern int prefixify_expression (struct expression *expr, + int last_struct = -1); extern void write_exp_elt_opcode (struct expr_builder *, enum exp_opcode); @@ -283,38 +327,11 @@ extern void write_exp_elt_objfile (struct expr_builder *, extern void write_exp_msymbol (struct expr_builder *, struct bound_minimal_symbol); -extern void write_dollar_variable (struct expr_builder *, struct stoken str); - -extern void mark_struct_expression (struct expr_builder *); +extern void write_dollar_variable (struct parser_state *, struct stoken str); extern const char *find_template_name_end (const char *); -extern void start_arglist (void); - -extern int end_arglist (void); - -extern char *copy_name (struct stoken); - -extern void insert_type (enum type_pieces); - -extern void push_type (enum type_pieces); - -extern void push_type_int (int); - -extern void insert_type_address_space (struct expr_builder *, char *); - -extern enum type_pieces pop_type (void); - -extern int pop_type_int (void); - -extern struct type_stack *get_type_stack (void); - -extern struct type_stack *append_type_stack (struct type_stack *to, - struct type_stack *from); - -extern void push_type_stack (struct type_stack *stack); - -extern void push_typelist (std::vector *typelist); +extern std::string copy_name (struct stoken); extern int dump_subexp (struct expression *, struct ui_file *, int); @@ -333,31 +350,11 @@ extern int operator_check_standard (struct expression *exp, int pos, extern const char *op_name_standard (enum exp_opcode); -extern struct type *follow_types (struct type *); - -extern type_instance_flags follow_type_instance_flags (); - -extern void null_post_parser (expression_up *, int); +extern void null_post_parser (expression_up *, int, int, + innermost_block_tracker *); extern bool parse_float (const char *p, int len, const struct type *type, gdb_byte *data); - -/* During parsing of a C expression, the pointer to the next character - is in this variable. */ - -extern const char *lexptr; - -/* After a token has been recognized, this variable points to it. - Currently used only for error reporting. */ -extern const char *prev_lexptr; - -/* Current depth in parentheses within the expression. */ - -extern int paren_depth; - -/* Nonzero means stop parsing on first comma (if not within parentheses). */ - -extern int comma_terminates; /* These codes indicate operator precedences for expression printing, least tightly binding first. */ @@ -453,8 +450,5 @@ extern void parser_fprintf (FILE *, const char *, ...) ATTRIBUTE_PRINTF (2, 3); extern int exp_uses_objfile (struct expression *exp, struct objfile *objfile); -extern void mark_completion_tag (enum type_code, const char *ptr, - int length); - #endif /* PARSER_DEFS_H */