FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename split_style::DOT

Browse source 
This renames split_style::DOT, to avoid name clashes when building gdb
with an old version of Bison (2.3, the version available on macOS).

In particular the error looks like:

./split-name.h:34:3: error: expected identifier
  DOT,
  ^
m2-exp.c:163:13: note: expanded from macro 'DOT'

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30286
This commit is contained in:
Tom Tromey 2023-08-31 07:33:34 -06:00
parent 0a43fbaa23
commit fe26aa9533
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gdb/dwarf2/cooked-index.c
View file

@ -267,7 +267,7 @@ cooked_index_shard::handle_gnat_encoded_entry (cooked_index_entry *entry,
if (canonical.empty ())
return {};
std::vector<gdb::string_view> names = split_name (canonical.c_str (),
split_style::DOT);
split_style::DOT_STYLE);
gdb::string_view tail = names.back ();
names.pop_back ();

2
gdb/split-name.c
View file

@ -58,7 +58,7 @@ split_name (const char *name, split_style style)
}
break;
case split_style::DOT:
case split_style::DOT_STYLE:
/* D and Go-style names. */
for (const char *iter = strchr (name, '.');
iter != nullptr;

5
gdb/split-name.h
View file

@ -30,8 +30,9 @@ enum class split_style
NONE,
/* C++ style, with "::" and template parameter intelligence. */
CXX,
/* Split at ".". Used by Ada, Go, D. */
DOT,
/* Split at ".". Used by Ada, Go, D. This has a funny name to work
around a bug in Bison 2.3, which is used on macOS. */
DOT_STYLE,
/* Split at "__". Used by Ada encoded names. */
UNDERSCORE,
};

2
gdb/symtab.h
View file

@ -305,7 +305,7 @@ class lookup_name_info final
break;
case language_d:
case language_go:
style = split_style::DOT;
style = split_style::DOT_STYLE;
break;
}
return ::split_name (language_lookup_name (lang), style);