* par-ch9.adb, sem_aggr.adb, sem_ch3.adb, layout.adb, sem_ch4.adb,

	sem_ch5.adb, sem_mech.adb, exp_util.adb, par-ch10.adb, sem_ch6.adb,
	par-ch11.adb, sem_ch7.adb, par-prag.adb, exp_disp.adb, par-ch12.adb,
	sem_ch8.adb, style.adb, sem_ch9.adb, sem_ch10.adb, prep.adb,
	sem_warn.adb, par-util.adb, scng.adb, sem_eval.adb, checks.adb,
	sem_prag.adb, sem_ch12.adb, styleg.adb, sem_ch13.adb, par-ch3.adb,
	par-tchk.adb, freeze.adb, sfn_scan.adb, par-ch4.adb, sem_util.adb,
	sem_res.adb, par-ch5.adb, lib-xref.adb, sem_attr.adb, par-ch6.adb,
	sem_disp.adb, prepcomp.adb, par-ch7.adb, sem_elab.adb, exp_ch4.adb,
	errout.ads: Update comments. Minor reformatting.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160979 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 28 insertions, 27 deletions

diff --git a/gcc/ada/scng.adb b/gcc/ada/scng.adb
index af1f3bbc3a0..5a2dc00a6c4 100644
--- a/gcc/ada/scng.adb
+++ b/gcc/ada/scng.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2009, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2010, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -325,7 +325,8 @@ package body Scng is
            and then Source (Scan_Ptr + 2) = C
          then
             Scan_Ptr := Scan_Ptr + 1;
-            Error_Msg_S ("no space allowed here");
+            Error_Msg_S -- CODEFIX
+              ("no space allowed here");
             Scan_Ptr := Scan_Ptr + 2;
             return True;
 
@@ -380,16 +381,14 @@ package body Scng is
                Error_Msg_S -- CODEFIX
                  ("two consecutive underlines not permitted");
             else
-               Error_Msg_S -- CODEFIX???
-                 ("underline cannot follow punctuation character");
+               Error_Msg_S ("underline cannot follow punctuation character");
             end if;
 
          else
             if Source (Scan_Ptr - 1) = '_' then
-               Error_Msg_S -- CODEFIX???
-                 ("punctuation character cannot follow underline");
+               Error_Msg_S ("punctuation character cannot follow underline");
             else
-               Error_Msg_S -- CODEFIX???
+               Error_Msg_S
                  ("two consecutive punctuation characters not permitted");
             end if;
          end if;
@@ -572,8 +571,7 @@ package body Scng is
                if Warn_On_Obsolescent_Feature then
                   Error_Msg_S
                     ("use of "":"" is an obsolescent feature (RM J.2(3))?");
-                  Error_Msg_S
-                    ("\use ""'#"" instead?");
+                  Error_Msg_S ("\use ""'#"" instead?");
                end if;
             end if;
 
@@ -658,9 +656,11 @@ package body Scng is
 
                elsif not Identifier_Char (C) then
                   if Base_Char = '#' then
-                     Error_Msg_S ("missing '#");
+                     Error_Msg_S -- CODEFIX
+                       ("missing '#");
                   else
-                     Error_Msg_S ("missing ':");
+                     Error_Msg_S -- CODEFIX
+                       ("missing ':");
                   end if;
 
                   exit;
@@ -875,7 +875,7 @@ package body Scng is
                end if;
             end if;
 
-            Error_Msg_S --  CODEFIX
+            Error_Msg_S -- CODEFIX
               ("missing string quote");
          end Error_Unterminated_String;
 
@@ -1215,7 +1215,8 @@ package body Scng is
             Accumulate_Checksum ('&');
 
             if Source (Scan_Ptr + 1) = '&' then
-               Error_Msg_S ("'&'& should be `AND THEN`");
+               Error_Msg_S -- CODEFIX
+                 ("'&'& should be `AND THEN`");
                Scan_Ptr := Scan_Ptr + 2;
                Token := Tok_And;
                return;
@@ -1263,7 +1264,8 @@ package body Scng is
               and then Source (Scan_Ptr + 2) /= '-'
             then
                Token := Tok_Colon_Equal;
-               Error_Msg (":- should be :=", Scan_Ptr);
+               Error_Msg -- CODEFIX
+                 (":- should be :=", Scan_Ptr);
                Scan_Ptr := Scan_Ptr + 2;
                return;
 
@@ -1367,7 +1369,8 @@ package body Scng is
                return;
 
             elsif Source (Scan_Ptr + 1) = '=' then
-               Error_Msg_S ("== should be =");
+               Error_Msg_S -- CODEFIX
+                 ("== should be =");
                Scan_Ptr := Scan_Ptr + 1;
             end if;
 
@@ -1588,8 +1591,7 @@ package body Scng is
             if Warn_On_Obsolescent_Feature then
                Error_Msg_S
                  ("use of ""'%"" is an obsolescent feature (RM J.2(4))?");
-               Error_Msg_S
-                 ("\use """""" instead?");
+               Error_Msg_S ("\use """""" instead?");
             end if;
 
             Slit;
@@ -1669,13 +1671,13 @@ package body Scng is
                   elsif Ada_Version >= Ada_05
                     and then Is_UTF_32_Non_Graphic (UTF_32 (Code))
                   then
-                     Error_Msg
+                     Error_Msg -- CODEFIX????
                        ("(Ada 2005) non-graphic character not permitted " &
                         "in character literal", Wptr);
                   end if;
 
                   if Source (Scan_Ptr) /= ''' then
-                     Error_Msg_S ("missing apostrophe");
+                        Error_Msg_S ("missing apostrophe");
                   else
                      Scan_Ptr := Scan_Ptr + 1;
                   end if;
@@ -1789,7 +1791,8 @@ package body Scng is
             --  Special check for || to give nice message
 
             if Source (Scan_Ptr + 1) = '|' then
-               Error_Msg_S ("""'|'|"" should be `OR ELSE`");
+               Error_Msg_S -- CODEFIX
+                 ("""'|'|"" should be `OR ELSE`");
                Scan_Ptr := Scan_Ptr + 2;
                Token := Tok_Or;
                return;
@@ -1815,12 +1818,12 @@ package body Scng is
             if Warn_On_Obsolescent_Feature then
                Error_Msg_S
                  ("use of ""'!"" is an obsolescent feature (RM J.2(2))?");
-               Error_Msg_S
-                 ("\use ""'|"" instead?");
+               Error_Msg_S ("\use ""'|"" instead?");
             end if;
 
             if Source (Scan_Ptr + 1) = '=' then
-               Error_Msg_S ("'!= should be /=");
+               Error_Msg_S -- CODEFIX
+                 ("'!= should be /=");
                Scan_Ptr := Scan_Ptr + 2;
                Token := Tok_Not_Equal;
                return;
@@ -2068,8 +2071,7 @@ package body Scng is
             --  Punctuation is an error (at start of identifier)
 
             elsif Is_UTF_32_Punctuation (Cat) then
-               Error_Msg
-                 ("identifier cannot start with punctuation", Wptr);
+               Error_Msg ("identifier cannot start with punctuation", Wptr);
                Scan_Ptr := Wptr;
                Name_Len := 0;
                Underline_Found := False;
@@ -2078,8 +2080,7 @@ package body Scng is
             --  Mark character is an error (at start of identifier)
 
             elsif Is_UTF_32_Mark (Cat) then
-               Error_Msg
-                 ("identifier cannot start with mark character", Wptr);
+               Error_Msg ("identifier cannot start with mark character", Wptr);
                Scan_Ptr := Wptr;
                Name_Len := 0;
                Underline_Found := False;