Update comment of linespec_lexer_lex_keyword.

[deliverable/binutils-gdb.git] / gdb / parse.c

diff --git a/gdb/parse.c b/gdb/parse.c
index b0da2efac861bd66b3e9daa18c50f9e7c125f5fb..ec23dbb87ae1ada5a8d05efa19a9b5de17309782 100644 (file)
--- a/gdb/parse.c
+++ b/gdb/parse.c
@@ -1,6 +1,6 @@
 /* Parse expressions for GDB.
 
 /* Parse expressions for GDB.
 

-   Copyright (C) 1986-2014 Free Software Foundation, Inc.
+   Copyright (C) 1986-2015 Free Software Foundation, Inc.

 
    Modified from expread.y by the Department of Computer Science at the
    State University of New York at Buffalo, 1991.
 
    Modified from expread.y by the Department of Computer Science at the
    State University of New York at Buffalo, 1991.


@@ -32,7 +32,6 @@
 #include "defs.h"
 #include <ctype.h>
 #include "arch-utils.h"
 #include "defs.h"
 #include <ctype.h>
 #include "arch-utils.h"

-#include <string.h>

 #include "symtab.h"
 #include "gdbtypes.h"
 #include "frame.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "frame.h"


@@ -46,11 +45,9 @@
 #include "symfile.h"           /* for overlay functions */
 #include "inferior.h"
 #include "doublest.h"
 #include "symfile.h"           /* for overlay functions */
 #include "inferior.h"
 #include "doublest.h"

-#include "gdb_assert.h"

 #include "block.h"
 #include "source.h"
 #include "objfiles.h"
 #include "block.h"
 #include "source.h"
 #include "objfiles.h"

-#include "exceptions.h"

 #include "user-regs.h"
 
 /* Standard set of definitions for printing, dumping, prefixifying,
 #include "user-regs.h"
 
 /* Standard set of definitions for printing, dumping, prefixifying,


@@ -143,13 +140,13 @@ static struct funcall *funcall_chain;
 void
 start_arglist (void)
 {
 void
 start_arglist (void)
 {

-  struct funcall *new;
+  struct funcall *newobj;

 
 

-  new = (struct funcall *) xmalloc (sizeof (struct funcall));
-  new->next = funcall_chain;
-  new->arglist_len = arglist_len;
+  newobj = (struct funcall *) xmalloc (sizeof (struct funcall));
+  newobj->next = funcall_chain;
+  newobj->arglist_len = arglist_len;

   arglist_len = 0;
   arglist_len = 0;

-  funcall_chain = new;
+  funcall_chain = newobj;

 }
 
 /* Return the number of arguments in a function call just terminated,
 }
 
 /* Return the number of arguments in a function call just terminated,


@@ -586,7 +583,6 @@ mark_completion_tag (enum type_code tag, const char *ptr, int length)
              && expout_last_struct == -1);
   gdb_assert (tag == TYPE_CODE_UNION
              || tag == TYPE_CODE_STRUCT
              && expout_last_struct == -1);
   gdb_assert (tag == TYPE_CODE_UNION
              || tag == TYPE_CODE_STRUCT

-             || tag == TYPE_CODE_CLASS

              || tag == TYPE_CODE_ENUM);
   expout_tag_completion_type = tag;
   expout_completion_name = xmalloc (length + 1);
              || tag == TYPE_CODE_ENUM);
   expout_tag_completion_type = tag;
   expout_completion_name = xmalloc (length + 1);


@@ -1137,7 +1133,6 @@ parse_exp_in_context_1 (const char **stringptr, CORE_ADDR pc,
                        const struct block *block,
                        int comma, int void_context_p, int *out_subexp)
 {
                        const struct block *block,
                        int comma, int void_context_p, int *out_subexp)
 {

-  volatile struct gdb_exception except;

   struct cleanup *old_chain, *inner_chain;
   const struct language_defn *lang = NULL;
   struct parser_state ps;
   struct cleanup *old_chain, *inner_chain;
   const struct language_defn *lang = NULL;
   struct parser_state ps;


@@ -1178,7 +1173,8 @@ parse_exp_in_context_1 (const char **stringptr, CORE_ADDR pc,
       struct symtab_and_line cursal = get_current_source_symtab_and_line ();
       if (cursal.symtab)
        expression_context_block
       struct symtab_and_line cursal = get_current_source_symtab_and_line ();
       if (cursal.symtab)
        expression_context_block

-         = BLOCKVECTOR_BLOCK (BLOCKVECTOR (cursal.symtab), STATIC_BLOCK);
+         = BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (cursal.symtab),
+                              STATIC_BLOCK);

       if (expression_context_block)
        expression_context_pc = BLOCK_START (expression_context_block);
     }
       if (expression_context_block)
        expression_context_pc = BLOCK_START (expression_context_block);
     }


@@ -1218,12 +1214,12 @@ parse_exp_in_context_1 (const char **stringptr, CORE_ADDR pc,
   inner_chain = make_cleanup_restore_current_language ();
   set_language (lang->la_language);
 
   inner_chain = make_cleanup_restore_current_language ();
   set_language (lang->la_language);
 

-  TRY_CATCH (except, RETURN_MASK_ALL)
+  TRY

     {
       if (lang->la_parser (&ps))
         lang->la_error (NULL);
     }
     {
       if (lang->la_parser (&ps))
         lang->la_error (NULL);
     }

-  if (except.reason < 0)
+  CATCH (except, RETURN_MASK_ALL)

     {
       if (! parse_completion)
        {
     {
       if (! parse_completion)
        {


@@ -1231,6 +1227,7 @@ parse_exp_in_context_1 (const char **stringptr, CORE_ADDR pc,
          throw_exception (except);
        }
     }
          throw_exception (except);
        }
     }

+  END_CATCH

 
   reallocate_expout (&ps);
 
 
   reallocate_expout (&ps);
 


@@ -1286,15 +1283,20 @@ parse_expression_for_completion (const char *string, char **name,
   struct expression *exp = NULL;
   struct value *val;
   int subexp;
   struct expression *exp = NULL;
   struct value *val;
   int subexp;

-  volatile struct gdb_exception except;

 
 

-  TRY_CATCH (except, RETURN_MASK_ERROR)
+  TRY

     {
       parse_completion = 1;
       exp = parse_exp_in_context (&string, 0, 0, 0, 0, &subexp);
     }
     {
       parse_completion = 1;
       exp = parse_exp_in_context (&string, 0, 0, 0, 0, &subexp);
     }

+  CATCH (except, RETURN_MASK_ERROR)
+    {
+      /* Nothing, EXP remains NULL.  */
+    }
+  END_CATCH
+

   parse_completion = 0;
   parse_completion = 0;

-  if (except.reason < 0 || ! exp)
+  if (exp == NULL)

     return NULL;
 
   if (expout_tag_completion_type != TYPE_CODE_UNDEF)
     return NULL;
 
   if (expout_tag_completion_type != TYPE_CODE_UNDEF)


@@ -1692,7 +1694,8 @@ follow_types (struct type *follow_type)
          lookup_array_range_type (follow_type,
                                   0, array_size >= 0 ? array_size - 1 : 0);
        if (array_size < 0)
          lookup_array_range_type (follow_type,
                                   0, array_size >= 0 ? array_size - 1 : 0);
        if (array_size < 0)

-         TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (follow_type) = 1;
+         TYPE_HIGH_BOUND_KIND (TYPE_INDEX_TYPE (follow_type))
+           = PROP_UNDEFINED;

        break;
       case tp_function:
        /* FIXME-type-allocation: need a way to free this type when we are
        break;
       case tp_function:
        /* FIXME-type-allocation: need a way to free this type when we are


@@ -1812,7 +1815,7 @@ operator_check_standard (struct expression *exp, int pos,
 
        /* Check objfile where the variable itself is placed.
           SYMBOL_OBJ_SECTION (symbol) may be NULL.  */
 
        /* Check objfile where the variable itself is placed.
           SYMBOL_OBJ_SECTION (symbol) may be NULL.  */

-       if ((*objfile_func) (SYMBOL_SYMTAB (symbol)->objfile, data))
+       if ((*objfile_func) (symbol_objfile (symbol), data))

          return 1;
 
        /* Check objfile where is placed the code touching the variable.  */
          return 1;
 
        /* Check objfile where is placed the code touching the variable.  */


@@ -1834,12 +1837,12 @@ operator_check_standard (struct expression *exp, int pos,
   return 0;
 }
 
   return 0;
 }
 

-/* Call OBJFILE_FUNC for any TYPE and OBJFILE found being referenced by EXP.
-   The functions are never called with NULL OBJFILE.  Functions get passed an
-   arbitrary caller supplied DATA pointer.  If any of the functions returns
-   non-zero value then (any other) non-zero value is immediately returned to
-   the caller.  Otherwise zero is returned after iterating through whole EXP.
-   */
+/* Call OBJFILE_FUNC for any objfile found being referenced by EXP.
+   OBJFILE_FUNC is never called with NULL OBJFILE.  OBJFILE_FUNC get
+   passed an arbitrary caller supplied DATA pointer.  If OBJFILE_FUNC
+   returns non-zero value then (any other) non-zero value is immediately
+   returned to the caller.  Otherwise zero is returned after iterating
+   through whole EXP.  */

 
 static int
 exp_iterate (struct expression *exp,
 
 static int
 exp_iterate (struct expression *exp,