[multiple changes]

2009-07-09  Emmanuel Briot  <briot@adacore.com>

	* prj-nmsc.adb (Find_Sources): Avoid error messages from gprbuild from
	multi-unit files.

2009-07-09  Thomas Quinot  <quinot@adacore.com>

	* freeze.adb: Minor reformatting

	* exp_ch3.adb: Minor comment fix.

	* sinfo.ads: Minor comment fix

2009-07-09  Ed Schonberg  <schonberg@adacore.com>

	* exp_ch4.adb (Expand_N_Conditional_Expression): Set Related_Expression.

From-SVN: r149411

gcc/ada/ChangeLog

+2009-07-09  Emmanuel Briot  <briot@adacore.com>
+
+	* prj-nmsc.adb (Find_Sources): Avoid error messages from gprbuild from
+	multi-unit files.
+
+2009-07-09  Thomas Quinot  <quinot@adacore.com>
+
+	* freeze.adb: Minor reformatting
+
+	* exp_ch3.adb: Minor comment fix.
+
+	* sinfo.ads: Minor comment fix
+
+2009-07-09  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_ch4.adb (Expand_N_Conditional_Expression): Set Related_Expression.
+
 2009-07-09  Ed Schonberg  <schonberg@adacore.com>
 
 	* freeze.adb (Freeze_Expression): If the expression is the name of a

gcc/ada/exp_ch3.adb

@@ -6014,7 +6014,7 @@ package body Exp_Ch3 is
             Append_Freeze_Actions (Def_Id, Wrapper_Body_List);
          end if;
 
-         --  Create extra actuals for the primitive operations of the type.
+         --  Create extra formals for the primitive operations of the type.
          --  This must be done before analyzing the body of the initialization
          --  procedure, because a self-referential type might call one of these
          --  primitives in the body of the init_proc itself.

gcc/ada/exp_ch4.adb

@@ -4046,8 +4046,8 @@ package body Exp_Ch4 is
                  Name => New_Occurrence_Of (Cnn, Sloc (Elsex)),
                  Expression => Relocate_Node (Elsex))));
 
-         --  Move the SLOC of the parent If statement to the newly created
-         --  one and change it to the SLOC of the expression which, after
+         --  Move the SLOC of the parent If statement to the newly created one
+         --  and change it to the SLOC of the expression which, after
          --  expansion, will correspond to what is being evaluated.
 
          if Present (Parent (N))
@@ -4079,6 +4079,10 @@ package body Exp_Ch4 is
 
          Insert_Action (N, New_If);
          Analyze_And_Resolve (N, Typ);
+
+         --  Link temporary to original expression, for Codepeer
+
+         Set_Related_Expression (Cnn, Original_Node (N));
       end if;
    end Expand_N_Conditional_Expression;
 

gcc/ada/freeze.adb

@@ -4014,7 +4014,7 @@ package body Freeze is
 
       --  For a function, we freeze the entity when the subprogram declaration
       --  is frozen, but a function call may appear in an initialization proc.
-      --  before the  declaration  is frozen. We need to generate  the extra
+      --  before the declaration is frozen. We need to generate the extra
       --  formals, if any, to ensure that the expansion of the call includes
       --  the proper actuals.
 
@@ -4067,12 +4067,12 @@ package body Freeze is
          return;
       end if;
 
-      --  Loop for looking at the right place to insert the freeze nodes
+      --  Loop for looking at the right place to insert the freeze nodes,
       --  exiting from the loop when it is appropriate to insert the freeze
       --  node before the current node P.
 
-      --  Also checks some special exceptions to the freezing rules. These
-      --  cases result in a direct return, bypassing the freeze action.
+      --  Also checks som special exceptions to the freezing rules. These cases
+      --  result in a direct return, bypassing the freeze action.
 
       P := N;
       loop

gcc/ada/sinfo.ads

@@ -6460,7 +6460,7 @@ package Sinfo is
       --  The Ada language does not permit conditional expressions, however
       --  this is under discussion as a possible extension by the ARG, and we
       --  have implemented a form of this capability in GNAT under control of
-      --  the -X switch. The syntax is:
+      --  the -gnatX switch. The syntax is:
 
       --  CONDITIONAL_EXPRESSION ::=
       --    if EXPRESSION then EXPRESSION