Index: gdb/expression.h |
diff --git a/gdb/expression.h b/gdb/expression.h |
index 004a60e85c2e93243ba900bd26e75eee9e840481..9252dd25ef9b738a2fe7ed6130b2f8a3cc8b80b8 100644 |
--- a/gdb/expression.h |
+++ b/gdb/expression.h |
@@ -1,7 +1,6 @@ |
/* Definitions for expressions stored in reversed prefix form, for GDB. |
- Copyright (C) 1986, 1989, 1992, 1994, 2000, 2003, 2005, 2007-2012 |
- Free Software Foundation, Inc. |
+ Copyright (C) 1986-2013 Free Software Foundation, Inc. |
This file is part of GDB. |
@@ -73,7 +72,7 @@ union exp_element |
char string; |
struct type *type; |
struct internalvar *internalvar; |
- struct block *block; |
+ const struct block *block; |
struct objfile *objfile; |
}; |
@@ -96,21 +95,22 @@ struct expression |
/* From parse.c */ |
-extern struct expression *parse_expression (char *); |
+extern struct expression *parse_expression (const char *); |
-extern struct type *parse_field_expression (char *, char **); |
+extern struct type *parse_expression_for_completion (const char *, char **, |
+ enum type_code *); |
-extern struct expression *parse_exp_1 (char **, CORE_ADDR pc, struct block *, |
- int); |
+extern struct expression *parse_exp_1 (const char **, CORE_ADDR pc, |
+ const struct block *, int); |
/* For use by parsers; set if we want to parse an expression and |
- attempt to complete a field name. */ |
-extern int in_parse_field; |
+ attempt completion. */ |
+extern int parse_completion; |
/* The innermost context required by the stack and register variables |
we've encountered so far. To use this, set it to NULL, then call |
parse_<whatever>, then look at it. */ |
-extern struct block *innermost_block; |
+extern const struct block *innermost_block; |
/* From eval.c */ |
@@ -128,7 +128,10 @@ enum noside |
type (inaccuracy: anything that is |
listed as being in a register in |
the function in which it was |
- declared will be lval_register). */ |
+ declared will be lval_register). |
+ Ideally this would not even read |
+ target memory, but currently it |
+ does in many situations. */ |
}; |
extern struct value *evaluate_subexp_standard |