Use bool for "parse_completion"

Some spots in GDB already use bool for "parse_completion", but a few
were still using int.  This patch updates these to bool.

I'm checking this in.

gdb/ChangeLog
2021-03-10  Tom Tromey  <tromey@adacore.com>

	* parser-defs.h (parser_state): Change completion to bool.
	<parse_completion>: Likewise.
	* ada-lang.h (ada_find_operator_symbol, ada_resolve_funcall)
	(ada_resolve_variable, ada_resolve_function): Update.
	* ada-lang.c (ada_find_operator_symbol): Change
	parse_completion to bool.
	(ada_resolve_funcall, ada_resolve_variable)
	(ada_resolve_function): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 97fcd5e579e0df85ffe7f026f9bd518ffca12298..f6732b853be0f2c4d433c3520e70ce0f3177f4a5 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+2021-03-10  Tom Tromey  <tromey@adacore.com>
+
+       * parser-defs.h (parser_state): Change completion to bool.
+       <parse_completion>: Likewise.
+       * ada-lang.h (ada_find_operator_symbol, ada_resolve_funcall)
+       (ada_resolve_variable, ada_resolve_function): Update.
+       * ada-lang.c (ada_find_operator_symbol): Change
+       parse_completion to bool.
+       (ada_resolve_funcall, ada_resolve_variable)
+       (ada_resolve_function): Likewise.
+
 2021-03-09  Tom Tromey  <tromey@adacore.com>
 
        * eval.c (operation::evaluate_funcall): Use function formal

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 8330cbcc0b9b1a71c967bdc8ed2c1165f542adf3..b2eff9d3411426ff04425090471bd950741229d9 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -193,7 +193,7 @@ static int find_struct_field (const char *, struct type *, int,
 
 static int ada_resolve_function (std::vector<struct block_symbol> &,
                                 struct value **, int, const char *,
-                                struct type *, int);
+                                struct type *, bool);
 
 static int ada_is_direct_array_type (struct type *);
 
@@ -3375,7 +3375,7 @@ See set/show multiple-symbol."));
 /* See ada-lang.h.  */
 
 block_symbol
-ada_find_operator_symbol (enum exp_opcode op, int parse_completion,
+ada_find_operator_symbol (enum exp_opcode op, bool parse_completion,
                          int nargs, value *argvec[])
 {
   if (possible_user_operator_p (op, argvec))
@@ -3398,7 +3398,7 @@ ada_find_operator_symbol (enum exp_opcode op, int parse_completion,
 block_symbol
 ada_resolve_funcall (struct symbol *sym, const struct block *block,
                     struct type *context_type,
-                    int parse_completion,
+                    bool parse_completion,
                     int nargs, value *argvec[],
                     innermost_block_tracker *tracker)
 {
@@ -3428,7 +3428,7 @@ ada_resolve_funcall (struct symbol *sym, const struct block *block,
 block_symbol
 ada_resolve_variable (struct symbol *sym, const struct block *block,
                      struct type *context_type,
-                     int parse_completion,
+                     bool parse_completion,
                      int deprocedure_p,
                      innermost_block_tracker *tracker)
 {
@@ -3634,7 +3634,7 @@ static int
 ada_resolve_function (std::vector<struct block_symbol> &syms,
                      struct value **args, int nargs,
                      const char *name, struct type *context_type,
-                     int parse_completion)
+                     bool parse_completion)
 {
   int fallback;
   int k;

diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h
index 8aaf9757a625f62ff3998aed63149626ce5b5763..156c9b0cec781518c59aa67fc853e63a16f25526 100644 (file)
--- a/gdb/ada-lang.h
+++ b/gdb/ada-lang.h
@@ -380,17 +380,17 @@ extern void print_ada_task_info (struct ui_out *uiout,
                                 struct inferior *inf);
 
 /* Look for a symbol for an overloaded operator for the operation OP.
-   PARSE_COMPLETION is nonzero if currently parsing for completion.
+   PARSE_COMPLETION is true if currently parsing for completion.
    NARGS and ARGVEC describe the arguments to the call.  Returns a
    "null" block_symbol if no such operator is found.  */
 
 extern block_symbol ada_find_operator_symbol (enum exp_opcode op,
-                                             int parse_completion,
+                                             bool parse_completion,
                                              int nargs, value *argvec[]);
 
 /* Resolve a function call, selecting among possible function symbols.
    SYM and BLOCK are passed to ada_lookup_symbol_list.  CONTEXT_TYPE
-   describes the calling context.  PARSE_COMPLETION is nonzero if
+   describes the calling context.  PARSE_COMPLETION is true if
    currently parsing for completion.  NARGS and ARGVEC describe the
    arguments to the call.  This returns the chosen symbol and will
    update TRACKER accordingly.  */
@@ -398,13 +398,13 @@ extern block_symbol ada_find_operator_symbol (enum exp_opcode op,
 extern block_symbol ada_resolve_funcall (struct symbol *sym,
                                         const struct block *block,
                                         struct type *context_type,
-                                        int parse_completion,
+                                        bool parse_completion,
                                         int nargs, value *argvec[],
                                         innermost_block_tracker *tracker);
 
 /* Resolve a symbol reference, selecting among possible values.  SYM
    and BLOCK are passed to ada_lookup_symbol_list.  CONTEXT_TYPE
-   describes the calling context.  PARSE_COMPLETION is nonzero if
+   describes the calling context.  PARSE_COMPLETION is true if
    currently parsing for completion.  If DEPROCEDURE_P is nonzero,
    then a symbol that names a zero-argument function will be passed
    through ada_resolve_function.  This returns the chosen symbol and
@@ -413,7 +413,7 @@ extern block_symbol ada_resolve_funcall (struct symbol *sym,
 extern block_symbol ada_resolve_variable (struct symbol *sym,
                                          const struct block *block,
                                          struct type *context_type,
-                                         int parse_completion,
+                                         bool parse_completion,
                                          int deprocedure_p,
                                          innermost_block_tracker *tracker);
 

diff --git a/gdb/parser-defs.h b/gdb/parser-defs.h
index 8ff9da63d41b6a91526ac4481e7326fdce1cec9f..e58dc12303f57539155c41920ded20802b23e4bb 100644 (file)
--- a/gdb/parser-defs.h
+++ b/gdb/parser-defs.h
@@ -113,7 +113,7 @@ struct parser_state : public expr_builder
                CORE_ADDR context_pc,
                int comma,
                const char *input,
-               int completion,
+               bool completion,
                innermost_block_tracker *tracker,
                bool void_p)
     : expr_builder (lang, gdbarch),
@@ -251,7 +251,7 @@ struct parser_state : public expr_builder
   int arglist_len = 0;
 
   /* True if parsing an expression to attempt completion.  */
-  int parse_completion;
+  bool parse_completion;
 
   /* Completion state is updated here.  */
   expr_completion_state m_completion_state;