diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-02 07:48:59 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-02 07:48:59 +0000 |
| commit | df9048c5e6d3ee699dbec3d6bc7a2d8acdb15a6f (patch) | |
| tree | 06749a59f6089a37e824cdbc898c258e53138c7e /gcc/ada/par-ch10.adb | |
| parent | cb4af01d28adba9fb85499018a67ee926b9e95a2 (diff) | |
| download | gcc-df9048c5e6d3ee699dbec3d6bc7a2d8acdb15a6f.tar.gz | |
2011-08-02 Robert Dewar <dewar@adacore.com>
* par-ch10.adb: Minor code reorganization (use Nkind_In).
2011-08-02 Ed Schonberg <schonberg@adacore.com>
* par-ch9.adb: save location of entry for proper error message.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@177088 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/par-ch10.adb')
| -rw-r--r-- | gcc/ada/par-ch10.adb | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/gcc/ada/par-ch10.adb b/gcc/ada/par-ch10.adb index 47e4fdb7d7e..6958209305c 100644 --- a/gcc/ada/par-ch10.adb +++ b/gcc/ada/par-ch10.adb @@ -508,9 +508,7 @@ package body Ch10 is -- Another error from which it is hard to recover - if Nkind (Unit_Node) = N_Subprogram_Body_Stub - or else Nkind (Unit_Node) = N_Package_Body_Stub - then + if Nkind_In (Unit_Node, N_Subprogram_Body_Stub, N_Package_Body_Stub) then Cunit_Error_Flag := True; return Error; end if; @@ -526,10 +524,10 @@ package body Ch10 is Unit_Node := Specification (Unit_Node); end if; - if Nkind (Unit_Node) = N_Package_Declaration - or else Nkind (Unit_Node) = N_Subprogram_Declaration - or else Nkind (Unit_Node) = N_Subprogram_Body - or else Nkind (Unit_Node) = N_Subprogram_Renaming_Declaration + if Nkind_In (Unit_Node, N_Package_Declaration, + N_Subprogram_Declaration, + N_Subprogram_Body, + N_Subprogram_Renaming_Declaration) then Unit_Node := Specification (Unit_Node); @@ -540,26 +538,27 @@ package body Ch10 is end if; end if; - if Nkind (Unit_Node) = N_Task_Body - or else Nkind (Unit_Node) = N_Protected_Body - or else Nkind (Unit_Node) = N_Task_Type_Declaration - or else Nkind (Unit_Node) = N_Protected_Type_Declaration - or else Nkind (Unit_Node) = N_Single_Task_Declaration - or else Nkind (Unit_Node) = N_Single_Protected_Declaration + 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) then Name_Node := Defining_Identifier (Unit_Node); - elsif Nkind (Unit_Node) = N_Function_Instantiation - or else Nkind (Unit_Node) = N_Function_Specification - or else Nkind (Unit_Node) = N_Generic_Function_Renaming_Declaration - or else Nkind (Unit_Node) = N_Generic_Package_Renaming_Declaration - or else Nkind (Unit_Node) = N_Generic_Procedure_Renaming_Declaration - or else Nkind (Unit_Node) = N_Package_Body - or else Nkind (Unit_Node) = N_Package_Instantiation - or else Nkind (Unit_Node) = N_Package_Renaming_Declaration - or else Nkind (Unit_Node) = N_Package_Specification - or else Nkind (Unit_Node) = N_Procedure_Instantiation - or else Nkind (Unit_Node) = N_Procedure_Specification + 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) then Name_Node := Defining_Unit_Name (Unit_Node); |