X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fparser-defs.h;h=242409c82f5f8d1d87091475fb4018c129d86c71;hb=1d1d0bf76f3bc3056a1456e53c066f40ca4d0837;hp=1458b494df896ad0b0208ea3a522e4312892e7be;hpb=abd8680d6efd97e7ba848a6392ee3ad72be18cd0;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/parser-defs.h b/gdb/parser-defs.h
index 1458b494df..242409c82f 100644
--- a/gdb/parser-defs.h
+++ b/gdb/parser-defs.h
@@ -1,5 +1,7 @@
 /* Parser definitions for GDB.
-   Copyright (C) 1986, 1989, 1990, 1991 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.
 
@@ -7,7 +9,7 @@
 
    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 2 of the License, or
+   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,
@@ -16,54 +18,168 @@
    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, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #if !defined (PARSER_DEFS_H)
 #define PARSER_DEFS_H 1
 
-struct std_regs
-  {
-    char *name;
-    int regnum;
-  };
+#include "vec.h"
+#include "expression.h"
+
+struct block;
+struct language_defn;
+struct internalvar;
+
+extern int parser_debug;
+
+#define parse_gdbarch(ps) ((ps)->expout->gdbarch)
+#define parse_language(ps) ((ps)->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);
 
-extern struct std_regs *std_regs;
-extern unsigned num_std_regs;
+  DISABLE_COPY_AND_ASSIGN (parser_state);
 
-extern struct expression *expout;
-extern int expout_size;
-extern int expout_ptr;
+  /* 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.  */
 
-extern struct block *expression_context_block;
+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;
+
+/* 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.  */
+
+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);
+  }
 
-/* The innermost context required by the stack and register variables
-   we've encountered so far. */
-extern struct block *innermost_block;
+  /* 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 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 struct block *block_found;
+  /* 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;
 
 /* A string token, either a char-string or bit-string.  Char-strings are
-   used, for example, for the names of symbols. */
+   used, for example, for the names of symbols.  */
 
 struct stoken
   {
-    /* Pointer to first byte of char-string or first bit of bit-string */
+    /* Pointer to first byte of char-string or first bit of bit-string.  */
+    const char *ptr;
+    /* Length of string in bytes for char-string or bits for bit-string.  */
+    int length;
+  };
+
+struct typed_stoken
+  {
+    /* A language-specific type field.  */
+    int type;
+    /* Pointer to first byte of char-string or first bit of bit-string.  */
     char *ptr;
-    /* Length of string in bytes for char-string or bits for bit-string */
+    /* Length of string in bytes for char-string or bits for bit-string.  */
     int length;
   };
 
+struct stoken_vector
+  {
+    int len;
+    struct typed_stoken *tokens;
+  };
+
 struct ttype
   {
     struct stoken stoken;
@@ -73,95 +189,158 @@ struct ttype
 struct symtoken
   {
     struct stoken stoken;
-    struct symbol *sym;
+    struct block_symbol sym;
     int is_a_field_of_this;
   };
 
+struct objc_class_str
+  {
+    struct stoken stoken;
+    struct type *type;
+    int theclass;
+  };
+
+typedef struct type *type_ptr;
+DEF_VEC_P (type_ptr);
+
 /* 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_array, tp_function
+    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
   };
 /* 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;
+    VEC (type_ptr) *typelist_val;
   };
-extern union type_stack_elt *type_stack;
-extern int type_stack_depth, type_stack_size;
 
-extern void write_exp_elt PARAMS ((union exp_element));
+/* The type stack is an instance of this structure.  */
 
-extern void write_exp_elt_opcode PARAMS ((enum exp_opcode));
+struct type_stack
+{
+  /* Elements on the stack.  */
+  std::vector<union type_stack_elt> elements;
+};
 
-extern void write_exp_elt_sym PARAMS ((struct symbol *));
+/* 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
+   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.  */
 
-extern void write_exp_elt_longcst PARAMS ((LONGEST));
+extern int prefixify_expression (struct expression *expr);
 
-extern void write_exp_elt_dblcst PARAMS ((DOUBLEST));
+extern void write_exp_elt_opcode (struct parser_state *, enum exp_opcode);
 
-extern void write_exp_elt_type PARAMS ((struct type *));
+extern void write_exp_elt_sym (struct parser_state *, struct symbol *);
 
-extern void write_exp_elt_intern PARAMS ((struct internalvar *));
+extern void write_exp_elt_longcst (struct parser_state *, LONGEST);
 
-extern void write_exp_string PARAMS ((struct stoken));
+extern void write_exp_elt_floatcst (struct parser_state *, const gdb_byte *);
 
-extern void write_exp_bitstring PARAMS ((struct stoken));
+extern void write_exp_elt_type (struct parser_state *, struct type *);
 
-extern void write_exp_elt_block PARAMS ((struct block *));
+extern void write_exp_elt_intern (struct parser_state *, struct internalvar *);
 
-extern void write_exp_msymbol PARAMS ((struct minimal_symbol *,
-				       struct type *, struct type *));
+extern void write_exp_string (struct parser_state *, struct stoken);
 
-extern void write_dollar_variable PARAMS ((struct stoken str));
+void write_exp_string_vector (struct parser_state *, int type,
+			      struct stoken_vector *vec);
 
-extern struct symbol *parse_nested_classes_for_hpacc PARAMS ((char *, int, char **, int *, char **));
+extern void write_exp_bitstring (struct parser_state *, struct stoken);
 
-extern char *find_template_name_end PARAMS ((char *));
+extern void write_exp_elt_block (struct parser_state *, const struct block *);
 
-extern void
-start_arglist PARAMS ((void));
+extern void write_exp_elt_objfile (struct parser_state *,
+				   struct objfile *objfile);
 
-extern int
-end_arglist PARAMS ((void));
+extern void write_exp_msymbol (struct parser_state *,
+			       struct bound_minimal_symbol);
 
-extern char *
-  copy_name PARAMS ((struct stoken));
+extern void write_dollar_variable (struct parser_state *, struct stoken str);
 
-extern void
-push_type PARAMS ((enum type_pieces));
+extern void mark_struct_expression (struct parser_state *);
 
-extern void
-push_type_int PARAMS ((int));
+extern const char *find_template_name_end (const char *);
 
-extern enum type_pieces
-pop_type PARAMS ((void));
+extern void start_arglist (void);
 
-extern int
-pop_type_int PARAMS ((void));
+extern int end_arglist (void);
 
-extern int
-length_of_subexp PARAMS ((struct expression *, int));
+extern char *copy_name (struct stoken);
 
-extern struct type *follow_types PARAMS ((struct type *));
+extern void insert_type (enum type_pieces);
 
-/* During parsing of a C expression, the pointer to the next character
-   is in this variable.  */
+extern void push_type (enum type_pieces);
+
+extern void push_type_int (int);
+
+extern void insert_type_address_space (struct parser_state *, 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 char *lexptr;
+extern void type_stack_cleanup (void *arg);
 
-/* Tokens that refer to names do so with explicit pointer and length,
-   so they can share the storage that lexptr is parsing.
+extern void push_typelist (VEC (type_ptr) *typelist);
 
-   When it is necessary to pass a name to a function that expects
-   a null-terminated string, the substring is copied out
-   into a block of storage that namecopy points to.
+extern int dump_subexp (struct expression *, struct ui_file *, int);
 
-   namecopy is allocated once, guaranteed big enough, for each parsing.  */
+extern int dump_subexp_body_standard (struct expression *, 
+				      struct ui_file *, int);
 
-extern char *namecopy;
+extern void operator_length (const struct expression *, int, int *, int *);
+
+extern void operator_length_standard (const struct expression *, int, int *,
+				      int *);
+
+extern int operator_check_standard (struct expression *exp, int pos,
+				    int (*objfile_func)
+				      (struct objfile *objfile, void *data),
+				    void *data);
+
+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 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.  */
 
@@ -192,20 +371,87 @@ enum precedence
 
 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;
 
     /* For a binary operator:  1 iff right associate.
-       For a unary operator:  1 iff postfix. */
+       For a unary operator:  1 iff postfix.  */
     int right_assoc;
   };
 
-/* The generic method for targets to specify how their registers are
-   named.  The mapping can be derived from three sources:
-   REGISTER_NAME; std_regs; or a target specific alias hook. */
+/* Information needed to print, prefixify, and evaluate expressions for 
+   a given language.  */
+
+struct exp_descriptor
+  {
+    /* Print subexpression.  */
+    void (*print_subexp) (struct expression *, int *, struct ui_file *,
+			  enum precedence);
+
+    /* Returns number of exp_elements needed to represent an operator and
+       the number of subexpressions it takes.  */
+    void (*operator_length) (const struct expression*, int, int*, int *);
+
+    /* 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),
+			   void *data);
+
+    /* Name of this operator for dumping purposes.
+       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).  */
+    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
+       (expprint.c).  */
+    int (*dump_subexp_body) (struct expression *, struct ui_file *, int);
+
+    /* Evaluate an expression.  */
+    struct value *(*evaluate_exp) (struct type *, struct expression *,
+				   int *, enum noside);
+  };
+
+
+/* Default descriptor containing standard definitions of all
+   elements.  */
+extern const struct exp_descriptor exp_descriptor_standard;
+
+/* Functions used by language-specific extended operators to (recursively)
+   print/dump subexpressions.  */
 
-extern int target_map_name_to_register PARAMS ((char *, int));
+extern void print_subexp (struct expression *, int *, struct ui_file *,
+			  enum precedence);
+
+extern void print_subexp_standard (struct expression *, int *, 
+				   struct ui_file *, enum precedence);
+
+/* Function used to avoid direct calls to fprintf
+   in the code generated by the bison parser.  */
+
+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);
+
+/* 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 */
+