From 59f92a09f11acb0641ef889f6b32f73a27bd432f Mon Sep 17 00:00:00 2001 From: Fred Fish Date: Tue, 24 Jan 2006 15:20:10 +0000 Subject: [PATCH] Reviewed and approved by Jim Blandy and Daniel Jacobowitz 2006-01-24 Fred Fish * parse.c (source.h): Include. (parse_exp_in_context): Use static source context if no other context found. --- gdb/ChangeLog | 6 ++++++ gdb/parse.c | 19 +++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 609b95e11ba..af422b9a930 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2006-01-24 Fred Fish + + * parse.c (source.h): Include. + (parse_exp_in_context): Use static source context if no + other context found. + 2006-01-23 Andrew Stubbs * sh-tdep.c: Include reggroups.h. diff --git a/gdb/parse.c b/gdb/parse.c index 6bf07bf2650..e0b5b70b7c7 100644 --- a/gdb/parse.c +++ b/gdb/parse.c @@ -52,6 +52,7 @@ #include "doublest.h" #include "gdb_assert.h" #include "block.h" +#include "source.h" /* Standard set of definitions for printing, dumping, prefixifying, * and evaluating expressions. */ @@ -1075,13 +1076,27 @@ parse_exp_in_context (char **stringptr, struct block *block, int comma, old_chain = make_cleanup (free_funcalls, 0 /*ignore*/); funcall_chain = 0; + /* If no context specified, try using the current frame, if any. */ + + if (!block) + block = get_selected_block (&expression_context_pc); + + /* Fall back to using the current source static context, if any. */ + + if (!block) + { + struct symtab_and_line cursal = get_current_source_symtab_and_line (); + if (cursal.symtab) + block = BLOCKVECTOR_BLOCK (BLOCKVECTOR (cursal.symtab), STATIC_BLOCK); + } + + /* Save the context, if specified by caller, or found above. */ + if (block) { expression_context_block = block; expression_context_pc = BLOCK_START (block); } - else - expression_context_block = get_selected_block (&expression_context_pc); expout_size = 10; expout_ptr = 0; -- 2.30.2