From 12a8d31ee478a11dba2c6dc631c066452b986907 Mon Sep 17 00:00:00 2001 From: charlet Date: Fri, 24 Oct 2003 13:02:42 +0000 Subject: * adadecode.c (ostrcpy): New function. (__gnat_decode): Use ostrcpy of strcpy. (has_prefix): Set first parameter a const. (has_suffix): Set first parameter a const. Update copyright notice. Fix source name in header. Removes a trailing space. PR ada/12014. * exp_disp.adb: Remove the test against being in No_Run_Time_Mode before generating a call to Register_Tag. It is redundant with the test against the availability of the function Register_Tag. * g-catiio.adb: (Month_Name): Correct spelling of February * make.adb: (Mains): New package (Initialize): Call Mains.Delete (Gnatmake): Check that each main on the command line is a source of a project file and, if there are several mains, each of them is a source of the same project file. (Gnatmake): When a foreign language is specified in attribute Languages, no main is specified on the command line and attribute Mains is not empty, only build the Ada main. If there is no Ada main, just compile the Ada sources and their closure. (Gnatmake): If a main is specified on the command line with directory information, check that the source exists and, if it does, that the path is the actual path of a source of a project. * prj-env.adb: (File_Name_Of_Library_Unit_Body): New Boolean parameter Full_Path. When Full_Path is True, return the full path instead of the simple file name. (Project_Of): New function * prj-env.ads: (File_Name_Of_Library_Unit_Body): New Boolean parameter Full_Path, defaulted to False. (Project_Of): New function * Makefile.generic: Ensure objects of main project are always checked and rebuilt if needed. Set CC to gcc by default. Prepare new handling of link by creating a global archive (not activated yet). * adadecode.h, atree.h, elists.h, nlists.h, raise.h, stringt.h: Update copyright notice. Remove trailing blanks. Fix source name in header. * sem_ch12.adb: Minor reformatting * sem_ch3.adb: Minor reformatting (including new function return style throughout) * sem_ch3.ads: Minor reformatting (including new function return style throughout) * Make-lang.in: Makefile automatically updated git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72893 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/sem_ch12.adb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gcc/ada/sem_ch12.adb') diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb index e25284185c0..60dbbe595c3 100644 --- a/gcc/ada/sem_ch12.adb +++ b/gcc/ada/sem_ch12.adb @@ -7688,7 +7688,6 @@ package body Sem_Ch12 is or else Ekind (Get_Instance_Of (A_Gen_T)) = E_Record_Type_With_Private then - -- Check whether the parent is another derived formal type -- in the same generic unit. @@ -7697,19 +7696,19 @@ package body Sem_Ch12 is and then Scope (Etype (A_Gen_T)) = Scope (A_Gen_T) and then Etype (Etype (A_Gen_T)) /= Etype (A_Gen_T) then - -- Locate ancestor of parent from the subtype declaration -- created for the actual. declare Decl : Node_Id; + begin Decl := First (Actual_Decls); while (Present (Decl)) loop if Nkind (Decl) = N_Subtype_Declaration - and then Chars (Defining_Identifier (Decl)) - = Chars (Etype (A_Gen_T)) + and then Chars (Defining_Identifier (Decl)) = + Chars (Etype (A_Gen_T)) then Ancestor := Generic_Parent_Type (Decl); exit; -- cgit v1.2.1