aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorThomas Quinot <quinot@adacore.com>2011-08-29 10:22:44 +0000
committerArnaud Charlet <charlet@gcc.gnu.org>2011-08-29 12:22:44 +0200
commitb970af399230f7b18a3c602fcf57b7d9bfe5415c (patch)
tree9e139a36bfeb77c3171e1169c2005e65d60ff0d8 /gcc
parent92db5dee00b7dfdba5f8a66c67e5ce64843b5897 (diff)
downloadgcc-b970af399230f7b18a3c602fcf57b7d9bfe5415c.zip
gcc-b970af399230f7b18a3c602fcf57b7d9bfe5415c.tar.gz
gcc-b970af399230f7b18a3c602fcf57b7d9bfe5415c.tar.bz2
par-endh.adb: Minor reformatting.
2011-08-29 Thomas Quinot <quinot@adacore.com> * par-endh.adb: Minor reformatting. From-SVN: r178189
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ada/ChangeLog4
-rw-r--r--gcc/ada/par-endh.adb49
2 files changed, 29 insertions, 24 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 0440dda..5d533d3 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-29 Thomas Quinot <quinot@adacore.com>
+
+ * par-endh.adb: Minor reformatting.
+z
2011-08-29 Tristan Gingold <gingold@adacore.com>
* a-exexpr-gcc.adb (Unwind_Action) Rewrite as an integer with constants.
diff --git a/gcc/ada/par-endh.adb b/gcc/ada/par-endh.adb
index 84833cd..4ecc49d 100644
--- a/gcc/ada/par-endh.adb
+++ b/gcc/ada/par-endh.adb
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 1992-2010, Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2011, 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- --
@@ -123,7 +123,7 @@ package body Endh is
function Explicit_Start_Label (SS_Index : Nat) return Boolean;
-- Determines whether the specified entry in the scope stack has an
-- explicit start label (i.e. one other than one that was created by
- -- the parser when no explicit label was present)
+ -- the parser when no explicit label was present).
procedure Output_End_Deleted;
-- Output a message complaining that the current END structure does not
@@ -240,7 +240,7 @@ package body Endh is
End_Type := E_Loop;
-- FOR or WHILE allowed (signalling error) to substitute for LOOP
- -- if on the same line as the END
+ -- if on the same line as the END.
elsif (Token = Tok_For or else Token = Tok_While)
and then not Token_Is_At_Start_Of_Line
@@ -800,19 +800,20 @@ package body Endh is
-- against lines containing previously reported syntax errors.
elsif (Etyp = E_Loop
- or else Etyp = E_Name
- or else Etyp = E_Suspicious_Is
- or else Etyp = E_Bad_Is)
+ or else Etyp = E_Name
+ or else Etyp = E_Suspicious_Is
+ or else Etyp = E_Bad_Is)
and then Comes_From_Source (L)
then
return True;
+
else
return False;
end if;
end Explicit_Start_Label;
------------------------
- -- Output End Deleted --
+ -- Output_End_Deleted --
------------------------
procedure Output_End_Deleted is
@@ -842,23 +843,23 @@ package body Endh is
end Output_End_Deleted;
-------------------------
- -- Output End Expected --
+ -- Output_End_Expected --
-------------------------
procedure Output_End_Expected (Ins : Boolean) is
End_Type : SS_End_Type;
begin
- -- Suppress message if this was a potentially junk entry (e.g. a
- -- record entry where no record keyword was present.
+ -- Suppress message if this was a potentially junk entry (e.g. a record
+ -- entry where no record keyword was present).
if Scope.Table (Scope.Last).Junk then
return;
end if;
End_Type := Scope.Table (Scope.Last).Etyp;
- Error_Msg_Col := Scope.Table (Scope.Last).Ecol;
- Error_Msg_Sloc := Scope.Table (Scope.Last).Sloc;
+ Error_Msg_Col := Scope.Table (Scope.Last).Ecol;
+ Error_Msg_Sloc := Scope.Table (Scope.Last).Sloc;
if Explicit_Start_Label (Scope.Last) then
Error_Msg_Node_1 := Scope.Table (Scope.Last).Labl;
@@ -903,11 +904,11 @@ package body Endh is
Error_Msg_SC -- CODEFIX
("`END SELECT;` expected@ for SELECT#!");
- -- All remaining cases are cases with a name (we do not treat
- -- the suspicious is cases specially for a replaced end, only
- -- for an inserted end).
+ -- All remaining cases are cases with a name (we do not treat the
+ -- suspicious is cases specially for a replaced end, only for an
+ -- inserted end).
- elsif End_Type = E_Name or else (not Ins) then
+ elsif End_Type = E_Name or else not Ins then
if Error_Msg_Node_1 = Empty then
Error_Msg_SC -- CODEFIX
("`END;` expected@ for BEGIN#!");
@@ -918,7 +919,7 @@ package body Endh is
-- The other possibility is a missing END for a subprogram with a
-- suspicious IS (that probably should have been a semicolon). The
- -- Missing IS confirms the suspicion!
+ -- missing IS confirms the suspicion!
else -- End_Type = E_Suspicious_Is or E_Bad_Is
Scope.Table (Scope.Last).Etyp := E_Bad_Is;
@@ -926,15 +927,15 @@ package body Endh is
end Output_End_Expected;
------------------------
- -- Output End Missing --
+ -- Output_End_Missing --
------------------------
procedure Output_End_Missing is
End_Type : SS_End_Type;
begin
- -- Suppress message if this was a potentially junk entry (e.g. a
- -- record entry where no record keyword was present.
+ -- Suppress message if this was a potentially junk entry (e.g. a record
+ -- entry where no record keyword was present).
if Scope.Table (Scope.Last).Junk then
return;
@@ -987,7 +988,7 @@ package body Endh is
end Output_End_Missing;
---------------------
- -- Pop End Context --
+ -- Pop_End_Context --
---------------------
procedure Pop_End_Context is
@@ -1041,9 +1042,9 @@ package body Endh is
-- We also reserve an end with a name before the end of file if the
-- name is the one we expect at the outer level.
- if (Token = Tok_EOF or else
- Token = Tok_With or else
- Token = Tok_Separate)
+ if (Token = Tok_EOF
+ or else Token = Tok_With
+ or else Token = Tok_Separate)
and then End_Type >= E_Name
and then (not End_Labl_Present
or else Same_Label (End_Labl, Scope.Table (1).Labl))