https://gcc.gnu.org/g:906793f2deeff0409668af79ab143193b06d33cc
commit r17-1691-g906793f2deeff0409668af79ab143193b06d33cc Author: Marc Poulhiès <[email protected]> Date: Thu Jun 4 13:21:06 2026 +0200 ada: Rename left-over parameterized expression to expression function The terminology was changed back in 2011 (see "[Ada] Change parameterized expression to expression function"), but this one was left behind. Renaming it to "Expf" as it is more self describing. Also rename some variable name to reflect the change. gcc/ada/ChangeLog: * par.adb (Pf_Rec.Pexp): Renamed to... (Pf_Rec.Expf): ...this. (Pf_Decl_Gins_Pbod_Rnam_Stub_Pexp): Renamed to... (Pf_Decl_Gins_Pbod_Rnam_Stub_Expf): ... this. (Pf_Decl_Gins_Pbod_Rnam_Stub_Pexp): Renamed to... (Pf_Decl_Gins_Pbod_Rnam_Stub_Expf): ... this. (Pf_Decl_Gins_Pbod_Rnam_Pexp): Renamed to ... (Pf_Decl_Gins_Pbod_Rnam_Expf): ... this. (Pf_Decl_Pbod_Pexp): Renamed to ... (Pf_Decl_Pbod_Expf): ... this. (Pf_Pbod_Pexp): Renamed to ... (Pf_Pbod_Expf): ... this. * par-ch6.adb (Rewrite_Entity_If_Direct_Attribute_Def) (Likely_Expression_Function): Adjust. * par-ch10.adb (P_Compilation_Unit, P_Subunit): Likewise. * par-ch3.adb (P_Declarative_Item): Likewise. * par-ch7.adb (P_Package): Likewise. * par-ch9.adb (P_Entry_Or_Subprogram_With_Indicator) (P_Protected_Operation_Items): Adjust. Diff: --- gcc/ada/par-ch10.adb | 10 +++++----- gcc/ada/par-ch3.adb | 6 +++--- gcc/ada/par-ch6.adb | 8 ++++---- gcc/ada/par-ch7.adb | 2 +- gcc/ada/par-ch9.adb | 6 +++--- gcc/ada/par.adb | 12 ++++++------ 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/gcc/ada/par-ch10.adb b/gcc/ada/par-ch10.adb index a2e112758830..69be62eb408b 100644 --- a/gcc/ada/par-ch10.adb +++ b/gcc/ada/par-ch10.adb @@ -369,10 +369,10 @@ package body Ch10 is Error_Msg_BC -- CODEFIX ("keyword BODY expected here '[see file name']"); Restore_Scan_State (Scan_State); - Set_Unit (Comp_Unit_Node, P_Package (Pf_Pbod_Pexp)); + Set_Unit (Comp_Unit_Node, P_Package (Pf_Pbod_Expf)); else Restore_Scan_State (Scan_State); - Set_Unit (Comp_Unit_Node, P_Package (Pf_Decl_Gins_Pbod_Rnam_Pexp)); + Set_Unit (Comp_Unit_Node, P_Package (Pf_Decl_Gins_Pbod_Rnam_Expf)); end if; elsif Token = Tok_Generic then @@ -383,7 +383,7 @@ package body Ch10 is elsif Token in Tok_Function | Tok_Not | Tok_Overriding | Tok_Procedure then - Set_Unit (Comp_Unit_Node, P_Subprogram (Pf_Decl_Gins_Pbod_Rnam_Pexp)); + Set_Unit (Comp_Unit_Node, P_Subprogram (Pf_Decl_Gins_Pbod_Rnam_Expf)); -- A little bit of an error recovery check here. If we just scanned -- a subprogram declaration (as indicated by an SIS entry being @@ -1053,10 +1053,10 @@ package body Ch10 is Ignore (Tok_Semicolon); if Token in Tok_Function | Tok_Not | Tok_Overriding | Tok_Procedure then - Body_Node := P_Subprogram (Pf_Pbod_Pexp); + Body_Node := P_Subprogram (Pf_Pbod_Expf); elsif Token = Tok_Package then - Body_Node := P_Package (Pf_Pbod_Pexp); + Body_Node := P_Package (Pf_Pbod_Expf); elsif Token = Tok_Protected then Scan; -- past PROTECTED diff --git a/gcc/ada/par-ch3.adb b/gcc/ada/par-ch3.adb index c2f8eaf6c9db..de2afb95e003 100644 --- a/gcc/ada/par-ch3.adb +++ b/gcc/ada/par-ch3.adb @@ -4566,7 +4566,7 @@ package body Ch3 is | Tok_Procedure => Check_Bad_Layout; - Append (P_Subprogram (Pf_Decl_Gins_Pbod_Rnam_Stub_Pexp), Decls); + Append (P_Subprogram (Pf_Decl_Gins_Pbod_Rnam_Stub_Expf), Decls); when Tok_For => Check_Bad_Layout; @@ -4624,7 +4624,7 @@ package body Ch3 is Error_Msg_SC ("\unit must be compiled with -gnat05 switch"); Token := Tok_Overriding; - Append (P_Subprogram (Pf_Decl_Gins_Pbod_Rnam_Stub_Pexp), Decls); + Append (P_Subprogram (Pf_Decl_Gins_Pbod_Rnam_Stub_Expf), Decls); -- Normal case, no overriding, or overriding followed by colon @@ -4638,7 +4638,7 @@ package body Ch3 is when Tok_Package => Check_Bad_Layout; - Append (P_Package (Pf_Decl_Gins_Pbod_Rnam_Stub_Pexp), Decls); + Append (P_Package (Pf_Decl_Gins_Pbod_Rnam_Stub_Expf), Decls); when Tok_Pragma => -- If we see a pragma and In_Statements is true, we want to let diff --git a/gcc/ada/par-ch6.adb b/gcc/ada/par-ch6.adb index 063e528aa1fd..d4356ab1b907 100644 --- a/gcc/ada/par-ch6.adb +++ b/gcc/ada/par-ch6.adb @@ -338,11 +338,11 @@ package body Ch6 is -- declarations and bodies can occur. The Pf_Pbod case is for -- subunits. - if Pf_Flags /= Pf_Decl_Gins_Pbod_Rnam_Stub_Pexp + if Pf_Flags /= Pf_Decl_Gins_Pbod_Rnam_Stub_Expf and then - Pf_Flags /= Pf_Decl_Pbod_Pexp + Pf_Flags /= Pf_Decl_Pbod_Expf and then - Pf_Flags /= Pf_Pbod_Pexp + Pf_Flags /= Pf_Pbod_Expf then Error_Msg_SC ("overriding indicator not allowed here!"); @@ -882,7 +882,7 @@ package body Ch6 is then -- Check expression function allowed here - if not Pf_Flags.Pexp then + if not Pf_Flags.Expf then Error_Msg_SC ("expression function not allowed here!"); end if; diff --git a/gcc/ada/par-ch7.adb b/gcc/ada/par-ch7.adb index 565ca5527756..f60750e3925c 100644 --- a/gcc/ada/par-ch7.adb +++ b/gcc/ada/par-ch7.adb @@ -118,7 +118,7 @@ package body Ch7 is -- Case of package body. Note that we demand a package body if that -- is the only possibility (even if the BODY keyword is not present) - if Token = Tok_Body or else Pf_Flags = Pf_Pbod_Pexp then + if Token = Tok_Body or else Pf_Flags = Pf_Pbod_Expf then if not Pf_Flags.Pbod then Error_Msg_SC ("package body cannot appear here!"); end if; diff --git a/gcc/ada/par-ch9.adb b/gcc/ada/par-ch9.adb index 11e7645d587d..dd0f8af05445 100644 --- a/gcc/ada/par-ch9.adb +++ b/gcc/ada/par-ch9.adb @@ -750,7 +750,7 @@ package body Ch9 is Set_Must_Not_Override (Decl, Not_Overriding); elsif Token in Tok_Function | Tok_Procedure then - Decl := P_Subprogram (Pf_Decl_Pexp); + Decl := P_Subprogram (Pf_Decl_Expf); Set_Must_Override (Specification (Decl), Is_Overriding); Set_Must_Not_Override (Specification (Decl), Not_Overriding); @@ -790,7 +790,7 @@ package body Ch9 is when Tok_Function | Tok_Procedure => - Result := P_Subprogram (Pf_Decl_Pexp); + Result := P_Subprogram (Pf_Decl_Expf); exit; when Tok_Identifier => @@ -878,7 +878,7 @@ package body Ch9 is or else Token = Tok_Not or else Bad_Spelling_Of (Tok_Not) then - Append (P_Subprogram (Pf_Decl_Pbod_Pexp), Item_List); + Append (P_Subprogram (Pf_Decl_Pbod_Expf), Item_List); elsif Token = Tok_Pragma or else Bad_Spelling_Of (Tok_Pragma) then P_Pragmas_Opt (Item_List); diff --git a/gcc/ada/par.adb b/gcc/ada/par.adb index 53966bc4c77c..f776bfb9da65 100644 --- a/gcc/ada/par.adb +++ b/gcc/ada/par.adb @@ -382,18 +382,18 @@ function Par (Configuration_Pragmas : Boolean) return List_Id is Pbod : Boolean; -- True if proper body OK Rnam : Boolean; -- True if renaming declaration OK Stub : Boolean; -- True if body stub OK - Pexp : Boolean; -- True if parameterized expression OK + Expf : Boolean; -- True if expression function OK end record; pragma Pack (Pf_Rec); function T return Boolean renames True; function F return Boolean renames False; - Pf_Decl_Gins_Pbod_Rnam_Stub_Pexp : constant Pf_Rec := (F, T, T, T, T, T, T); - Pf_Decl_Pexp : constant Pf_Rec := (F, T, F, F, F, F, T); - Pf_Decl_Gins_Pbod_Rnam_Pexp : constant Pf_Rec := (F, T, T, T, T, F, T); - Pf_Decl_Pbod_Pexp : constant Pf_Rec := (F, T, F, T, F, F, T); - Pf_Pbod_Pexp : constant Pf_Rec := (F, F, F, T, F, F, T); + Pf_Decl_Gins_Pbod_Rnam_Stub_Expf : constant Pf_Rec := (F, T, T, T, T, T, T); + Pf_Decl_Expf : constant Pf_Rec := (F, T, F, F, F, F, T); + Pf_Decl_Gins_Pbod_Rnam_Expf : constant Pf_Rec := (F, T, T, T, T, F, T); + Pf_Decl_Pbod_Expf : constant Pf_Rec := (F, T, F, T, F, F, T); + Pf_Pbod_Expf : constant Pf_Rec := (F, F, F, T, F, F, T); Pf_Spcn : constant Pf_Rec := (T, F, F, F, F, F, F); -- The above are the only allowed values of Pf_Rec arguments
