[multiple changes]

2010-06-17  Thomas Quinot  <quinot@adacore.com>

	* put_scos.adb: Do not generate a blank line in SCOs when omitting the
	CP line for a disabled pragma.

2010-06-17  Emmanuel Briot  <briot@adacore.com>

	* prj-proc.adb, prj.adb, prj.ads (Check_Or_Set_Typed_Variable): New
	subprogram.
	(Process_Declarative_Item): An invalid value in an typed variable
	declaration is no longer always fatal.

From-SVN: r160875

1 files changed, 4 insertions, 2 deletions

diff --git a/gcc/ada/put_scos.adb b/gcc/ada/put_scos.adb
index 53962b2..db608af 100644
--- a/gcc/ada/put_scos.adb
+++ b/gcc/ada/put_scos.adb
@@ -134,6 +134,8 @@ begin
                         end if;
                      end loop;
 
+                     Write_Info_Terminate;
+
                   --  Statement continuations should not occur since they
                   --  are supposed to have been handled in the loop above.
 
@@ -197,13 +199,13 @@ begin
                               Start := Start + 1;
                            end;
                         end loop;
+
+                        Write_Info_Terminate;
                      end if;
 
                   when others =>
                      raise Program_Error;
                end case;
-
-               Write_Info_Terminate;
             end Output_SCO_Line;
 
             Start := Start + 1;