Commit b970af39 by Thomas Quinot Committed by Arnaud Charlet

par-endh.adb: Minor reformatting.

2011-08-29  Thomas Quinot  <quinot@adacore.com>

	* par-endh.adb: Minor reformatting.

From-SVN: r178189
parent 92db5dee
2011-08-29 Thomas Quinot <quinot@adacore.com>
* par-endh.adb: Minor reformatting.
z
2011-08-29 Tristan Gingold <gingold@adacore.com> 2011-08-29 Tristan Gingold <gingold@adacore.com>
* a-exexpr-gcc.adb (Unwind_Action) Rewrite as an integer with constants. * a-exexpr-gcc.adb (Unwind_Action) Rewrite as an integer with constants.
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -123,7 +123,7 @@ package body Endh is ...@@ -123,7 +123,7 @@ package body Endh is
function Explicit_Start_Label (SS_Index : Nat) return Boolean; function Explicit_Start_Label (SS_Index : Nat) return Boolean;
-- Determines whether the specified entry in the scope stack has an -- Determines whether the specified entry in the scope stack has an
-- explicit start label (i.e. one other than one that was created by -- 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; procedure Output_End_Deleted;
-- Output a message complaining that the current END structure does not -- Output a message complaining that the current END structure does not
...@@ -240,7 +240,7 @@ package body Endh is ...@@ -240,7 +240,7 @@ package body Endh is
End_Type := E_Loop; End_Type := E_Loop;
-- FOR or WHILE allowed (signalling error) to substitute for 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) elsif (Token = Tok_For or else Token = Tok_While)
and then not Token_Is_At_Start_Of_Line and then not Token_Is_At_Start_Of_Line
...@@ -800,19 +800,20 @@ package body Endh is ...@@ -800,19 +800,20 @@ package body Endh is
-- against lines containing previously reported syntax errors. -- against lines containing previously reported syntax errors.
elsif (Etyp = E_Loop elsif (Etyp = E_Loop
or else Etyp = E_Name or else Etyp = E_Name
or else Etyp = E_Suspicious_Is or else Etyp = E_Suspicious_Is
or else Etyp = E_Bad_Is) or else Etyp = E_Bad_Is)
and then Comes_From_Source (L) and then Comes_From_Source (L)
then then
return True; return True;
else else
return False; return False;
end if; end if;
end Explicit_Start_Label; end Explicit_Start_Label;
------------------------ ------------------------
-- Output End Deleted -- -- Output_End_Deleted --
------------------------ ------------------------
procedure Output_End_Deleted is procedure Output_End_Deleted is
...@@ -842,23 +843,23 @@ package body Endh is ...@@ -842,23 +843,23 @@ package body Endh is
end Output_End_Deleted; end Output_End_Deleted;
------------------------- -------------------------
-- Output End Expected -- -- Output_End_Expected --
------------------------- -------------------------
procedure Output_End_Expected (Ins : Boolean) is procedure Output_End_Expected (Ins : Boolean) is
End_Type : SS_End_Type; End_Type : SS_End_Type;
begin begin
-- Suppress message if this was a potentially junk entry (e.g. a -- Suppress message if this was a potentially junk entry (e.g. a record
-- record entry where no record keyword was present. -- entry where no record keyword was present).
if Scope.Table (Scope.Last).Junk then if Scope.Table (Scope.Last).Junk then
return; return;
end if; end if;
End_Type := Scope.Table (Scope.Last).Etyp; End_Type := Scope.Table (Scope.Last).Etyp;
Error_Msg_Col := Scope.Table (Scope.Last).Ecol; Error_Msg_Col := Scope.Table (Scope.Last).Ecol;
Error_Msg_Sloc := Scope.Table (Scope.Last).Sloc; Error_Msg_Sloc := Scope.Table (Scope.Last).Sloc;
if Explicit_Start_Label (Scope.Last) then if Explicit_Start_Label (Scope.Last) then
Error_Msg_Node_1 := Scope.Table (Scope.Last).Labl; Error_Msg_Node_1 := Scope.Table (Scope.Last).Labl;
...@@ -903,11 +904,11 @@ package body Endh is ...@@ -903,11 +904,11 @@ package body Endh is
Error_Msg_SC -- CODEFIX Error_Msg_SC -- CODEFIX
("`END SELECT;` expected@ for SELECT#!"); ("`END SELECT;` expected@ for SELECT#!");
-- All remaining cases are cases with a name (we do not treat -- All remaining cases are cases with a name (we do not treat the
-- the suspicious is cases specially for a replaced end, only -- suspicious is cases specially for a replaced end, only for an
-- for an inserted end). -- 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 if Error_Msg_Node_1 = Empty then
Error_Msg_SC -- CODEFIX Error_Msg_SC -- CODEFIX
("`END;` expected@ for BEGIN#!"); ("`END;` expected@ for BEGIN#!");
...@@ -918,7 +919,7 @@ package body Endh is ...@@ -918,7 +919,7 @@ package body Endh is
-- The other possibility is a missing END for a subprogram with a -- The other possibility is a missing END for a subprogram with a
-- suspicious IS (that probably should have been a semicolon). The -- 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 else -- End_Type = E_Suspicious_Is or E_Bad_Is
Scope.Table (Scope.Last).Etyp := E_Bad_Is; Scope.Table (Scope.Last).Etyp := E_Bad_Is;
...@@ -926,15 +927,15 @@ package body Endh is ...@@ -926,15 +927,15 @@ package body Endh is
end Output_End_Expected; end Output_End_Expected;
------------------------ ------------------------
-- Output End Missing -- -- Output_End_Missing --
------------------------ ------------------------
procedure Output_End_Missing is procedure Output_End_Missing is
End_Type : SS_End_Type; End_Type : SS_End_Type;
begin begin
-- Suppress message if this was a potentially junk entry (e.g. a -- Suppress message if this was a potentially junk entry (e.g. a record
-- record entry where no record keyword was present. -- entry where no record keyword was present).
if Scope.Table (Scope.Last).Junk then if Scope.Table (Scope.Last).Junk then
return; return;
...@@ -987,7 +988,7 @@ package body Endh is ...@@ -987,7 +988,7 @@ package body Endh is
end Output_End_Missing; end Output_End_Missing;
--------------------- ---------------------
-- Pop End Context -- -- Pop_End_Context --
--------------------- ---------------------
procedure Pop_End_Context is procedure Pop_End_Context is
...@@ -1041,9 +1042,9 @@ package body Endh is ...@@ -1041,9 +1042,9 @@ package body Endh is
-- We also reserve an end with a name before the end of file if the -- 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. -- name is the one we expect at the outer level.
if (Token = Tok_EOF or else if (Token = Tok_EOF
Token = Tok_With or else or else Token = Tok_With
Token = Tok_Separate) or else Token = Tok_Separate)
and then End_Type >= E_Name and then End_Type >= E_Name
and then (not End_Labl_Present and then (not End_Labl_Present
or else Same_Label (End_Labl, Scope.Table (1).Labl)) or else Same_Label (End_Labl, Scope.Table (1).Labl))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment