diff options
Diffstat (limited to 'gcc/ada/par-ch10.adb')
| -rw-r--r-- | gcc/ada/par-ch10.adb | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/gcc/ada/par-ch10.adb b/gcc/ada/par-ch10.adb index f8b3f339207..e4298e88f4b 100644 --- a/gcc/ada/par-ch10.adb +++ b/gcc/ada/par-ch10.adb @@ -511,7 +511,7 @@ package body Ch10 is -- Another error from which it is hard to recover - if Nkind_In (Unit_Node, N_Subprogram_Body_Stub, N_Package_Body_Stub) then + if Nkind (Unit_Node) in N_Subprogram_Body_Stub | N_Package_Body_Stub then Cunit_Error_Flag := True; return Error; end if; @@ -527,10 +527,10 @@ package body Ch10 is Unit_Node := Specification (Unit_Node); end if; - if Nkind_In (Unit_Node, N_Package_Declaration, - N_Subprogram_Declaration, - N_Subprogram_Body, - N_Subprogram_Renaming_Declaration) + if Nkind (Unit_Node) in N_Package_Declaration + | N_Subprogram_Declaration + | N_Subprogram_Body + | N_Subprogram_Renaming_Declaration then Unit_Node := Specification (Unit_Node); @@ -541,27 +541,26 @@ package body Ch10 is end if; end if; - if Nkind_In (Unit_Node, N_Task_Body, - N_Protected_Body, - N_Task_Type_Declaration, - N_Protected_Type_Declaration, - N_Single_Task_Declaration, - N_Single_Protected_Declaration) + if Nkind (Unit_Node) in N_Task_Body + | N_Protected_Body + | N_Task_Type_Declaration + | N_Protected_Type_Declaration + | N_Single_Task_Declaration + | N_Single_Protected_Declaration then Name_Node := Defining_Identifier (Unit_Node); - elsif Nkind_In (Unit_Node, N_Function_Instantiation, - N_Function_Specification, - N_Generic_Function_Renaming_Declaration, - N_Generic_Package_Renaming_Declaration, - N_Generic_Procedure_Renaming_Declaration) - or else - Nkind_In (Unit_Node, N_Package_Body, - N_Package_Instantiation, - N_Package_Renaming_Declaration, - N_Package_Specification, - N_Procedure_Instantiation, - N_Procedure_Specification) + elsif Nkind (Unit_Node) in N_Function_Instantiation + | N_Function_Specification + | N_Generic_Function_Renaming_Declaration + | N_Generic_Package_Renaming_Declaration + | N_Generic_Procedure_Renaming_Declaration + or else Nkind (Unit_Node) in N_Package_Body + | N_Package_Instantiation + | N_Package_Renaming_Declaration + | N_Package_Specification + | N_Procedure_Instantiation + | N_Procedure_Specification then Name_Node := Defining_Unit_Name (Unit_Node); |