re PR ada/17566 (Gnatxref formatting)

2009-08-10  Vincent Celier  <celier@adacore.com>

	PR ada/17566
	* xref_lib.adb (Print_Xref): Make sure that there is at least one space
	between a declaration name and its type.

From-SVN: r150617

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 87b5356..43bf836 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-10  Vincent Celier  <celier@adacore.com>
+
+       PR ada/17566
+       * xref_lib.adb (Print_Xref): Make sure that there is at least one space
+       between a declaration name and its type.
+
 2009-08-07  Javier Miranda  <miranda@adacore.com>
 
        * exp_ch7.adb (Wrap_Transient_Expression): Add missing adjustment of

diff --git a/gcc/ada/xref_lib.adb b/gcc/ada/xref_lib.adb
index 475f15e..f4d0fc2 100644 (file)
--- a/gcc/ada/xref_lib.adb
+++ b/gcc/ada/xref_lib.adb
@@ -1607,10 +1607,16 @@ package body Xref_Lib is
 
          Write_Str (Get_Symbol (Decl));
 
-         while Column < Type_Position loop
+         --  Put the declaration type in column Type_Position, but if the
+         --  declaration name is too long, put at least one space between its
+         --  name and its type.
+
+         while Column < Type_Position - 1 loop
             Write_Char (' ');
          end loop;
 
+         Write_Char (' ');
+
          Write_Line (Get_Full_Type (Decl));
 
          Write_Parent_Info : declare