/* Parser definitions for GDB.
- Copyright (C) 1986-2013 Free Software Foundation, Inc.
+ Copyright (C) 1986-2018 Free Software Foundation, Inc.
Modified from expread.y by the Department of Computer Science at the
State University of New York at Buffalo.
#if !defined (PARSER_DEFS_H)
#define PARSER_DEFS_H 1
-#include "doublest.h"
#include "vec.h"
#include "expression.h"
struct block;
+struct language_defn;
+struct internalvar;
extern int parser_debug;
-extern struct expression *expout;
-extern int expout_size;
-extern int expout_ptr;
+#define parse_gdbarch(ps) ((ps)->expout->gdbarch)
+#define parse_language(ps) ((ps)->expout->language_defn)
-#define parse_gdbarch (expout->gdbarch)
-#define parse_language (expout->language_defn)
+struct parser_state
+{
+ /* Constructor. INITIAL_SIZE is the initial size of the expout
+ array. LANG is the language used to parse the expression. And
+ GDBARCH is the gdbarch to use during parsing. */
+
+ parser_state (size_t initial_size, const struct language_defn *lang,
+ struct gdbarch *gdbarch);
+
+ DISABLE_COPY_AND_ASSIGN (parser_state);
+
+ /* Resize the allocated expression to the correct size, and return
+ it as an expression_up -- passing ownership to the caller. */
+ expression_up release ();
+
+ /* The size of the expression above. */
+
+ size_t expout_size;
+
+ /* The expression related to this parser state. */
+
+ expression_up expout;
+
+ /* The number of elements already in the expression. This is used
+ to know where to put new elements. */
+
+ size_t expout_ptr;
+};
/* If this is nonzero, this block is used as the lexical context
for symbol names. */
then look up the macro definitions active at that point. */
extern CORE_ADDR expression_context_pc;
-/* The innermost context required by the stack and register variables
- we've encountered so far. */
-extern const struct block *innermost_block;
+/* While parsing expressions we need to track the innermost lexical block
+ that we encounter. In some situations we need to track the innermost
+ block just for symbols, and in other situations we want to track the
+ innermost block for symbols and registers. These flags are used by the
+ innermost block tracker to control which blocks we consider for the
+ innermost block. These flags can be combined together as needed. */
-/* The block in which the most recently discovered symbol was found.
- FIXME: Should be declared along with lookup_symbol in symtab.h; is not
- related specifically to parsing. */
-extern const struct block *block_found;
+enum innermost_block_tracker_type
+{
+ /* Track the innermost block for symbols within an expression. */
+ INNERMOST_BLOCK_FOR_SYMBOLS = (1 << 0),
+
+ /* Track the innermost block for registers within an expression. */
+ INNERMOST_BLOCK_FOR_REGISTERS = (1 << 1)
+};
+DEF_ENUM_FLAGS_TYPE (enum innermost_block_tracker_type,
+ innermost_block_tracker_types);
+
+/* When parsing expressions we track the innermost block that was
+ referenced. */
+
+class innermost_block_tracker
+{
+public:
+ innermost_block_tracker ()
+ : m_types (INNERMOST_BLOCK_FOR_SYMBOLS),
+ 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
+ register. The stored innermost block is only updated if the type T is
+ a type we are interested in, the types we are interested in are held
+ in M_TYPES and set during RESET. */
+ void update (const struct block *b, innermost_block_tracker_types t);
+
+ /* Overload of main UPDATE method which extracts the block from BS. */
+ void update (const struct block_symbol &bs)
+ {
+ update (bs.block, INNERMOST_BLOCK_FOR_SYMBOLS);
+ }
+
+ /* Return the stored innermost block. Can be nullptr if no symbols or
+ registers were found during an expression parse, and so no innermost
+ block was defined. */
+ const struct block *block () const
+ {
+ return m_innermost_block;
+ }
+
+private:
+ /* The type of innermost block being looked for. */
+ innermost_block_tracker_types m_types;
+
+ /* The currently stored innermost block found while parsing an
+ expression. */
+ const struct block *m_innermost_block;
+};
+
+/* The innermost context required by the stack and register variables
+ we've encountered so far. This should be cleared before parsing an
+ expression, and 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;
struct symtoken
{
struct stoken stoken;
- struct symbol *sym;
+ struct block_symbol sym;
int is_a_field_of_this;
};
{
struct stoken stoken;
struct type *type;
- int class;
+ int theclass;
};
typedef struct type *type_ptr;
tp_end = -1,
tp_pointer,
tp_reference,
+ tp_rvalue_reference,
tp_array,
tp_function,
tp_function_with_arguments,
int size;
};
-/* Helper function to initialize the expout, expout_size, expout_ptr
- trio before it is used to store expression elements created during
- the parsing of an expression. INITIAL_SIZE is the initial size of
- the expout array. LANG is the language used to parse the expression.
- And GDBARCH is the gdbarch to use during parsing. */
-
-extern void initialize_expout (int, const struct language_defn *,
- struct gdbarch *);
-
-/* Helper function that frees any unsed space in the expout array.
- It is generally used when the parser has just been parsed and
- created. */
-
-extern void reallocate_expout (void);
-
/* 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
extern int prefixify_expression (struct expression *expr);
-extern void write_exp_elt_opcode (enum exp_opcode);
+extern void write_exp_elt_opcode (struct parser_state *, enum exp_opcode);
-extern void write_exp_elt_sym (struct symbol *);
+extern void write_exp_elt_sym (struct parser_state *, struct symbol *);
-extern void write_exp_elt_longcst (LONGEST);
+extern void write_exp_elt_longcst (struct parser_state *, LONGEST);
-extern void write_exp_elt_dblcst (DOUBLEST);
+extern void write_exp_elt_floatcst (struct parser_state *, const gdb_byte *);
-extern void write_exp_elt_decfloatcst (gdb_byte *);
+extern void write_exp_elt_type (struct parser_state *, struct type *);
-extern void write_exp_elt_type (struct type *);
+extern void write_exp_elt_intern (struct parser_state *, struct internalvar *);
-extern void write_exp_elt_intern (struct internalvar *);
+extern void write_exp_string (struct parser_state *, struct stoken);
-extern void write_exp_string (struct stoken);
+void write_exp_string_vector (struct parser_state *, int type,
+ struct stoken_vector *vec);
-void write_exp_string_vector (int type, struct stoken_vector *vec);
+extern void write_exp_bitstring (struct parser_state *, struct stoken);
-extern void write_exp_bitstring (struct stoken);
+extern void write_exp_elt_block (struct parser_state *, const struct block *);
-extern void write_exp_elt_block (const struct block *);
+extern void write_exp_elt_objfile (struct parser_state *,
+ struct objfile *objfile);
-extern void write_exp_elt_objfile (struct objfile *objfile);
+extern void write_exp_msymbol (struct parser_state *,
+ struct bound_minimal_symbol);
-extern void write_exp_msymbol (struct bound_minimal_symbol);
+extern void write_dollar_variable (struct parser_state *, struct stoken str);
-extern void write_dollar_variable (struct stoken str);
-
-extern void mark_struct_expression (void);
+extern void mark_struct_expression (struct parser_state *);
extern const char *find_template_name_end (const char *);
extern void push_type_int (int);
-extern void insert_type_address_space (char *);
+extern void insert_type_address_space (struct parser_state *, char *);
extern enum type_pieces pop_type (void);
extern void push_typelist (VEC (type_ptr) *typelist);
-extern int length_of_subexp (struct expression *, int);
-
extern int dump_subexp (struct expression *, struct ui_file *, int);
extern int dump_subexp_body_standard (struct expression *,
(struct objfile *objfile, void *data),
void *data);
-extern char *op_name_standard (enum exp_opcode);
+extern const char *op_name_standard (enum exp_opcode);
extern struct type *follow_types (struct type *);
-extern void null_post_parser (struct expression **, int);
+extern type_instance_flags follow_type_instance_flags ();
-extern int parse_float (const char *p, int len, DOUBLEST *d,
- const char **suffix);
+extern void null_post_parser (expression_up *, int);
-extern int parse_c_float (struct gdbarch *gdbarch, const char *p, int len,
- DOUBLEST *d, struct type **t);
+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. */
struct op_print
{
- char *string;
+ const char *string;
enum exp_opcode opcode;
/* Precedence of operator. These values are used only by comparisons. */
enum precedence precedence;
the number of subexpressions it takes. */
void (*operator_length) (const struct expression*, int, int*, int *);
- /* Call TYPE_FUNC and OBJFILE_FUNC for any TYPE and OBJFILE found being
- referenced by the single operator of EXP at position POS. Operator
- parameters are located at positive (POS + number) offsets in EXP.
- The functions should never be called with NULL TYPE or NULL OBJFILE.
- Functions should get passed an arbitrary caller supplied DATA pointer.
- If any of the functions returns non-zero value then (any other) non-zero
- value should be immediately returned to the caller. Otherwise zero
- should be returned. */
+ /* Call OBJFILE_FUNC for any objfile found being referenced by the
+ single operator of EXP at position POS. Operator parameters are
+ located at positive (POS + number) offsets in EXP. OBJFILE_FUNC
+ should never be called with NULL OBJFILE. OBJFILE_FUNC should
+ get passed an arbitrary caller supplied DATA pointer. If it
+ returns non-zero value then (any other) non-zero value should be
+ immediately returned to the caller. Otherwise zero should be
+ returned. */
int (*operator_check) (struct expression *exp, int pos,
int (*objfile_func) (struct objfile *objfile,
void *data),
The returned value should never be NULL, even if EXP_OPCODE is
an unknown opcode (a string containing an image of the numeric
value of the opcode can be returned, for instance). */
- char *(*op_name) (enum exp_opcode);
+ const char *(*op_name) (enum exp_opcode);
/* Dump the rest of this (prefix) expression after the operator
itself has been printed. See dump_subexp_body_standard in
extern void mark_completion_tag (enum type_code, const char *ptr,
int length);
+/* Reallocate the `expout' pointer inside PS so that it can accommodate
+ at least LENELT expression elements. This function does nothing if
+ there is enough room for the elements. */
+
+extern void increase_expout_size (struct parser_state *ps, size_t lenelt);
+
#endif /* PARSER_DEFS_H */
projects / deliverable / binutils-gdb.git / blobdiff