From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id D8B79398B89B; Thu, 8 Jul 2021 13:37:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D8B79398B89B MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-2154] [Ada] Fix style in comments and code related to compilation units X-Act-Checkin: gcc X-Git-Author: Piotr Trojanek X-Git-Refname: refs/heads/master X-Git-Oldrev: 62aae315f680f2205d474ff3ebcb1756a707f715 X-Git-Newrev: 3711c2e5a06ac318fec2f7a5cfbd1f0267607a0f Message-Id: <20210708133704.D8B79398B89B@sourceware.org> Date: Thu, 8 Jul 2021 13:37:04 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Jul 2021 13:37:05 -0000 https://gcc.gnu.org/g:3711c2e5a06ac318fec2f7a5cfbd1f0267607a0f commit r12-2154-g3711c2e5a06ac318fec2f7a5cfbd1f0267607a0f Author: Piotr Trojanek Date: Wed May 26 15:27:02 2021 +0200 [Ada] Fix style in comments and code related to compilation units gcc/ada/ * lib-load.adb (Load_Unit): Fix style in comment. * par-load.adb (Load): Likewise. * scng.adb (Initialize_Scanner): Fix whitespace. Diff: --- gcc/ada/lib-load.adb | 4 ++-- gcc/ada/par-load.adb | 4 ++-- gcc/ada/scng.adb | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gcc/ada/lib-load.adb b/gcc/ada/lib-load.adb index 19afe268ea7..f7534b6016b 100644 --- a/gcc/ada/lib-load.adb +++ b/gcc/ada/lib-load.adb @@ -823,7 +823,7 @@ package body Lib.Load is Units.Table (Calling_Unit).Fatal_Error := Error_Detected; -- If with'ed unit had an ignored error, then propagate it - -- but do not overide an existring setting. + -- but do not overide an existing setting. when Error_Ignored => if Units.Table (Calling_Unit).Fatal_Error = None then @@ -900,7 +900,7 @@ package body Lib.Load is Remove_Unit (Unum); -- If unit not required, remove load stack entry and the junk - -- file table entry, and return No_Unit to indicate not found, + -- file table entry, and return No_Unit to indicate not found. else Load_Stack.Decrement_Last; diff --git a/gcc/ada/par-load.adb b/gcc/ada/par-load.adb index 6079fa477f6..dcba6d516a9 100644 --- a/gcc/ada/par-load.adb +++ b/gcc/ada/par-load.adb @@ -129,8 +129,8 @@ begin Save_Style_Check_Options (Save_Style_Checks); Save_Style_Check := Opt.Style_Check; - -- If main unit, set Main_Unit_Entity (this will get overwritten if - -- the main unit has a separate spec, that happens later on in Load) + -- If main unit, set Main_Unit_Entity (this will get overwritten if the + -- main unit has a separate spec, that happens later on in Load). if Cur_Unum = Main_Unit then Main_Unit_Entity := Cunit_Entity (Main_Unit); diff --git a/gcc/ada/scng.adb b/gcc/ada/scng.adb index 66b11055dd1..bf1307cb229 100644 --- a/gcc/ada/scng.adb +++ b/gcc/ada/scng.adb @@ -230,16 +230,16 @@ package body Scng is -- Initialize scan control variables - Current_Source_File := Index; - Source := Source_Text (Current_Source_File); - Scan_Ptr := Source_First (Current_Source_File); - Token := No_Token; - Token_Ptr := Scan_Ptr; - Current_Line_Start := Scan_Ptr; - Token_Node := Empty; - Token_Name := No_Name; - Start_Column := Set_Start_Column; - First_Non_Blank_Location := Scan_Ptr; + Current_Source_File := Index; + Source := Source_Text (Current_Source_File); + Scan_Ptr := Source_First (Current_Source_File); + Token := No_Token; + Token_Ptr := Scan_Ptr; + Current_Line_Start := Scan_Ptr; + Token_Node := Empty; + Token_Name := No_Name; + Start_Column := Set_Start_Column; + First_Non_Blank_Location := Scan_Ptr; Initialize_Checksum; Wide_Char_Byte_Count := 0;