diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-08-02 09:48:59 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-08-02 09:48:59 +0200 |
| commit | 767bb4e896d51ddb4aa6b44663f52f8be9d0f052 (patch) | |
| tree | 06749a59f6089a37e824cdbc898c258e53138c7e /gcc | |
| parent | 4ac2477e65c5b506eda0f3cef1696478270a1f97 (diff) | |
| download | gcc-767bb4e896d51ddb4aa6b44663f52f8be9d0f052.zip gcc-767bb4e896d51ddb4aa6b44663f52f8be9d0f052.tar.gz gcc-767bb4e896d51ddb4aa6b44663f52f8be9d0f052.tar.bz2 | |
[multiple changes]
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.
From-SVN: r177088
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/ada/par-ch10.adb | 47 | ||||
| -rw-r--r-- | gcc/ada/par-ch9.adb | 1 |
3 files changed, 32 insertions, 24 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 8a82c45..e9e0cce 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,11 @@ +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. + 2011-08-02 Javier Miranda <miranda@adacore.com> * sem_type.ads, sem_type.adb (Is_Ancestor): Addition of a new formal diff --git a/gcc/ada/par-ch10.adb b/gcc/ada/par-ch10.adb index 47e4fdb..6958209 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); diff --git a/gcc/ada/par-ch9.adb b/gcc/ada/par-ch9.adb index 83233b6..8290774 100644 --- a/gcc/ada/par-ch9.adb +++ b/gcc/ada/par-ch9.adb @@ -1063,6 +1063,7 @@ package body Ch9 is Scope.Table (Scope.Last).Ecol := Start_Column; Scope.Table (Scope.Last).Lreq := False; Scope.Table (Scope.Last).Etyp := E_Name; + Scope.Table (Scope.Last).Sloc := Token_Ptr; Name_Node := P_Defining_Identifier; Set_Defining_Identifier (Entry_Node, Name_Node); |