Fix build failure on macOS
Commit Message
>>>>> "Pedro" == Pedro Alves <palves@redhat.com> writes:
Pedro> I'd rather rename SIGNED to FIELD_SIGNED as well, for consistency.
Pedro> It no longer looks funny that way.
Here's v2.
Tom
commit 445716fd7ce9d59ec463047fb441b63a52544581
Author: Tom Tromey <tromey@adacore.com>
Date: Wed Dec 18 08:03:01 2019 -0700
Fix build failure on macOS
PR build/25250 notes that the gdb 9 pre-release fails to build on
macOS, due to a name clash between field_kind::STRING and the STRING
token in ada-exp.y. I am not sure (I couldn't reproduce this myself),
but presumably this is due to differences caused by the version of
bison in use there.
This patch works around the problem by renaming the field_kind
enumerator. I chose to rename this one because it is used in
relatively few places -- it's just an implementation detail of the
style code.
This version also renames field_kind::SIGNED for consistency.
Let me know what you think. I intend to check this in on the gdb 9
branch as well.
gdb/ChangeLog
2019-12-18 Tom Tromey <tromey@adacore.com>
PR build/25250:
* ui-out.c (ui_out::vmessage): Update.
* ui-out.h (enum class field_kind) <FIELD_STRING, FIELD_SIGNED>:
Rename.
(string_field): Update.
(signed_field): Update.
Change-Id: Iae9f36f1b793e22c61fee0de2ab2d508668ee7e4
Comments
On 12/18/19 4:35 PM, Tom Tromey wrote:
>>>>>> "Pedro" == Pedro Alves <palves@redhat.com> writes:
>
> Pedro> I'd rather rename SIGNED to FIELD_SIGNED as well, for consistency.
> Pedro> It no longer looks funny that way.
>
> Here's v2.
OK.
Thanks,
Pedro Alves
On Wed, Dec 18, 2019 at 10:35 AM Tom Tromey <tromey@adacore.com> wrote:
> --- a/gdb/ui-out.h
> +++ b/gdb/ui-out.h
> @@ -77,8 +77,11 @@ enum ui_out_type
> /* The possible kinds of fields. */
> enum class field_kind
> {
> - SIGNED,
> - STRING,
> + /* "FIELD_STRING" needs has a funny name to avoid clashes with
Remove either "needs" or "has"?
It is very unfortunate that a member of an enum class will need a
prefix, since the entire point of an enum class is not to need that :(
Christian
>>>>> "Christian" == Christian Biesinger via gdb-patches <gdb-patches@sourceware.org> writes:
Christian> On Wed, Dec 18, 2019 at 10:35 AM Tom Tromey <tromey@adacore.com> wrote:
>> --- a/gdb/ui-out.h
>> +++ b/gdb/ui-out.h
>> @@ -77,8 +77,11 @@ enum ui_out_type
>> /* The possible kinds of fields. */
>> enum class field_kind
>> {
>> - SIGNED,
>> - STRING,
>> + /* "FIELD_STRING" needs has a funny name to avoid clashes with
Christian> Remove either "needs" or "has"?
Ugh, sorry. I'll fix it.
Christian> It is very unfortunate that a member of an enum class will need a
Christian> prefix, since the entire point of an enum class is not to need that :(
Yeah. I have a dream of not using bison at all, but that's a lot of
work for a pretty small benefit in the end.
Also sometimes I wonder if we want to continue using all caps for "enum
class" constants.
Tom
@@ -1,3 +1,12 @@
+2019-12-18 Tom Tromey <tromey@adacore.com>
+
+ PR build/25250:
+ * ui-out.c (ui_out::vmessage): Update.
+ * ui-out.h (enum class field_kind) <FIELD_STRING, FIELD_SIGNED>:
+ Rename.
+ (string_field): Update.
+ (signed_field): Update.
+
2019-12-17 Christian Biesinger <cbiesinger@google.com>
* bsd-kvm.c: Include gdbsupport/pathstuff.h.
@@ -730,13 +730,13 @@ ui_out::vmessage (const ui_file_style &in_style, const char *format,
base_field_s *bf = va_arg (args, base_field_s *);
switch (bf->kind)
{
- case field_kind::SIGNED:
+ case field_kind::FIELD_SIGNED:
{
auto *f = (signed_field_s *) bf;
field_signed (f->name, f->val);
}
break;
- case field_kind::STRING:
+ case field_kind::FIELD_STRING:
{
auto *f = (string_field_s *) bf;
field_string (f->name, f->str);
@@ -77,8 +77,11 @@ enum ui_out_type
/* The possible kinds of fields. */
enum class field_kind
{
- SIGNED,
- STRING,
+ /* "FIELD_STRING" needs has a funny name to avoid clashes with
+ tokens named "STRING". See PR build/25250. FIELD_SIGNED is
+ given a similar name for consistency. */
+ FIELD_SIGNED,
+ FIELD_STRING,
};
/* The base type of all fields that can be emitted using %pF. */
@@ -105,7 +108,7 @@ signed_field (const char *name, LONGEST val,
signed_field_s &&tmp = {})
{
tmp.name = name;
- tmp.kind = field_kind::SIGNED;
+ tmp.kind = field_kind::FIELD_SIGNED;
tmp.val = val;
return &tmp;
}
@@ -126,7 +129,7 @@ string_field (const char *name, const char *str,
string_field_s &&tmp = {})
{
tmp.name = name;
- tmp.kind = field_kind::STRING;
+ tmp.kind = field_kind::FIELD_STRING;
tmp.str = str;
return &tmp;
}