diff options
Diffstat (limited to 'gdb/guile')
| -rw-r--r-- | gdb/guile/scm-frame.c | 2 | ||||
| -rw-r--r-- | gdb/guile/scm-symbol.c | 17 |
2 files changed, 11 insertions, 8 deletions
diff --git a/gdb/guile/scm-frame.c b/gdb/guile/scm-frame.c index 60bacdd..b133e8d 100644 --- a/gdb/guile/scm-frame.c +++ b/gdb/guile/scm-frame.c @@ -937,7 +937,7 @@ gdbscm_frame_read_var (SCM self, SCM symbol_scm, SCM rest) if (block == NULL) block = get_frame_block (frame_info_ptr (frame), NULL); - lookup_sym = lookup_symbol (var_name.get (), block, VAR_DOMAIN, + lookup_sym = lookup_symbol (var_name.get (), block, SEARCH_VFT, NULL); var = lookup_sym.symbol; block = lookup_sym.block; diff --git a/gdb/guile/scm-symbol.c b/gdb/guile/scm-symbol.c index bf5fe24..7061ff5 100644 --- a/gdb/guile/scm-symbol.c +++ b/gdb/guile/scm-symbol.c @@ -617,7 +617,8 @@ gdbscm_lookup_symbol (SCM name_scm, SCM rest) gdbscm_gdb_exception except {}; try { - symbol = lookup_symbol (name, block, (domain_enum) domain, + domain_search_flags flags = from_scripting_domain (domain); + symbol = lookup_symbol (name, block, flags, &is_a_field_of_this).symbol; } catch (const gdb_exception &ex) @@ -654,7 +655,8 @@ gdbscm_lookup_global_symbol (SCM name_scm, SCM rest) try { - symbol = lookup_global_symbol (name, NULL, (domain_enum) domain).symbol; + domain_search_flags flags = from_scripting_domain (domain); + symbol = lookup_global_symbol (name, NULL, flags).symbol; } catch (const gdb_exception &ex) { @@ -696,14 +698,15 @@ static const scheme_integer_constant symbol_integer_constants[] = #undef X #define DOMAIN(X) \ - { "SYMBOL_" #X "_DOMAIN", X ## _DOMAIN }, + { "SYMBOL_" #X "_DOMAIN", to_scripting_domain (X ## _DOMAIN) }, \ + { "SEARCH_" #X "_DOMAIN", to_scripting_domain (SEARCH_ ## X ## _DOMAIN) }, #include "sym-domains.def" #undef DOMAIN - /* These were never correct. */ - { "SYMBOL_VARIABLES_DOMAIN", VAR_DOMAIN }, - { "SYMBOL_FUNCTIONS_DOMAIN", VAR_DOMAIN }, - { "SYMBOL_TYPES_DOMAIN", VAR_DOMAIN }, + /* Historical. */ + { "SYMBOL_VARIABLES_DOMAIN", to_scripting_domain (SEARCH_VAR_DOMAIN) }, + { "SYMBOL_FUNCTIONS_DOMAIN", to_scripting_domain (SEARCH_FUNCTION_DOMAIN) }, + { "SYMBOL_TYPES_DOMAIN", to_scripting_domain (SEARCH_TYPE_DOMAIN) }, END_INTEGER_CONSTANTS }; |