Commit f9534f4b by Eric Botcazou Committed by Pierre-Marie de Rodat

[Ada] Minor tweak to -gnatR output

This makes sure that the numbers present in the -gnatR output are
printed in decimal format in all cases, since the hexadecimal format is
not compatible with the JSON syntax.

2019-07-23  Eric Botcazou  <ebotcazou@adacore.com>

gcc/ada/

	* repinfo.adb (List_Component_Layout): Pass Decimal to UI_Write.
	(Write_Val): Likewise.

From-SVN: r273723
parent c910db71
2019-07-23 Eric Botcazou <ebotcazou@adacore.com>
* repinfo.adb (List_Component_Layout): Pass Decimal to UI_Write.
(Write_Val): Likewise.
2019-07-23 Ed Schonberg <schonberg@adacore.com> 2019-07-23 Ed Schonberg <schonberg@adacore.com>
* aspects.ads: New table Operational_Aspect, used to distinguish * aspects.ads: New table Operational_Aspect, used to distinguish
......
...@@ -1150,7 +1150,7 @@ package body Repinfo is ...@@ -1150,7 +1150,7 @@ package body Repinfo is
if Ekind (Ent) = E_Discriminant then if Ekind (Ent) = E_Discriminant then
Spaces (Indent); Spaces (Indent);
Write_Str (" ""discriminant"": "); Write_Str (" ""discriminant"": ");
UI_Write (Discriminant_Number (Ent)); UI_Write (Discriminant_Number (Ent), Decimal);
Write_Line (","); Write_Line (",");
end if; end if;
Spaces (Indent); Spaces (Indent);
...@@ -1181,7 +1181,7 @@ package body Repinfo is ...@@ -1181,7 +1181,7 @@ package body Repinfo is
Spaces (Max_Spos_Length - 2); Spaces (Max_Spos_Length - 2);
if Starting_Position /= Uint_0 then if Starting_Position /= Uint_0 then
UI_Write (Starting_Position); UI_Write (Starting_Position, Decimal);
Write_Str (" + "); Write_Str (" + ");
end if; end if;
...@@ -1205,7 +1205,7 @@ package body Repinfo is ...@@ -1205,7 +1205,7 @@ package body Repinfo is
Sbit := Sbit - SSU; Sbit := Sbit - SSU;
end if; end if;
UI_Write (Sbit); UI_Write (Sbit, Decimal);
if List_Representation_Info_To_JSON then if List_Representation_Info_To_JSON then
Write_Line (", "); Write_Line (", ");
...@@ -1227,13 +1227,13 @@ package body Repinfo is ...@@ -1227,13 +1227,13 @@ package body Repinfo is
Lbit := Sbit + Esiz - 1; Lbit := Sbit + Esiz - 1;
if List_Representation_Info_To_JSON then if List_Representation_Info_To_JSON then
UI_Write (Esiz); UI_Write (Esiz, Decimal);
else else
if Lbit >= 0 and then Lbit < 10 then if Lbit >= 0 and then Lbit < 10 then
Write_Char (' '); Write_Char (' ');
end if; end if;
UI_Write (Lbit); UI_Write (Lbit, Decimal);
end if; end if;
-- The test for Esize (Ent) not Uint_0 here is an annoying special -- The test for Esize (Ent) not Uint_0 here is an annoying special
...@@ -2414,7 +2414,7 @@ package body Repinfo is ...@@ -2414,7 +2414,7 @@ package body Repinfo is
end if; end if;
else else
UI_Write (Val); UI_Write (Val, Decimal);
end if; end if;
end Write_Val; end Write_Val;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment