Simplify exception handling

[deliverable/binutils-gdb.git] / gdb / expression.h

diff --git a/gdb/expression.h b/gdb/expression.h
index 36f18be6af6ff43c827c23c2aee0695246e25a92..10e5f3e788e8933a84f2d330c31e40488c0f6739 100644 (file)
--- a/gdb/expression.h
+++ b/gdb/expression.h
@@ -20,9 +20,6 @@
 #if !defined (EXPRESSION_H)
 #define EXPRESSION_H 1
 
-
-#include "symtab.h"            /* Needed for "struct block" type.  */
-
 /* 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
@@ -113,7 +110,9 @@ typedef gdb::unique_xmalloc_ptr<expression> expression_up;
 
 /* From parse.c */
 
-extern expression_up parse_expression (const char *);
+class innermost_block_tracker;
+extern expression_up parse_expression (const char *,
+                                      innermost_block_tracker * = nullptr);
 
 extern expression_up parse_expression_with_language (const char *string,
                                                     enum language lang);
@@ -121,14 +120,10 @@ extern expression_up parse_expression_with_language (const char *string,
 extern struct type *parse_expression_for_completion
     (const char *, gdb::unique_xmalloc_ptr<char> *, enum type_code *);
 
+class innermost_block_tracker;
 extern expression_up parse_exp_1 (const char **, CORE_ADDR pc,
                                  const struct block *, int,
-                                 innermost_block_tracker_types
-                                   = INNERMOST_BLOCK_FOR_SYMBOLS);
-
-/* For use by parsers; set if we want to parse an expression and
-   attempt completion.  */
-extern int parse_completion;
+                                 innermost_block_tracker * = nullptr);
 
 /* From eval.c */