From 1bbc983105406a22a22a8fa1aa8fdbcc964d2678 Mon Sep 17 00:00:00 2001 From: charlet Date: Wed, 5 May 2004 10:09:56 +0000 Subject: 2004-05-05 Emmanuel Briot * g-os_lib.ads (Invalid_Time): New constant * adaint.h, adaint.c (__gnat_file_time_name, __gnat_file_time_fd): Now return OS_Time instead of time_t to match what is imported by Ada. Now return -1 if the file doesn't exist, instead of a random value 2004-05-05 Robert Dewar * usage.adb: Add line for -gnatR?s switch * sem_ch13.adb, exp_ch2.adb: Minor reformatting * g-regpat.ads, g-regpat.adb: Add documentation on handling of Size and for Match (Data_First, Data_last) * lib-writ.adb (Write_With_Lines): Ensure that correct index number is written when we are dealing with multi-unit files. 2004-05-05 Jerome Guitton * Makefile.in: Remove unused targets and variables. 2004-05-05 Vincent Celier * switch-m.adb: New gnatmake switch -eI * vms_data.ads: Add VMS equivalents of new gnatclean swith -innn and of new gnatmake switch -eInnn. * makegpr.adb: Take into account new parameters Index and Src_Index in Prj.Util. * clean.adb: Implement support for multi-unit sources, including new switch -i. * gnatcmd.adb (GNATCmd): Call Prj.Util.Value_Of with new parameter Src_Index. * make.ads, make.adb (Insert_Q): New parameter Index, defaulted to 0 (Extract_From_Q): New out parameter Index (Mark, Is_Marked): Subprograms moved to Makeutl (Switches_Of): New parameter Source_Index (Add_Switch): New parameter Index (Check): New parameter Source_Index (Collect_Arguments): New parameter Source_Index (Collect_Arguments_And_Compile): New parameter Source_Index (Compile): New parameter Source_Index Put subprograms in alphabetical order Add support for multi-source sources, including in project files. * makeutl.ads, makeutl.adb (Unit_Index_Of): New function (Mark, Is_Marked, Delete_All_Marks): New subprograms, moved from Make. * makeusg.adb: New gnatmake switch -eInnn * mlib-prj.adb (Build_Library): Add new parameter Src_Index to call to Prj.Util.Value_Of. * opt.ads (Main_Index): New variable, defaulted to 0. * osint.ads, osinte.adb (Add_File): New parameter Index (Current_Source_Index): New function * prj.adb: Take into account new components Index and Src_Index * prj.ads (String_Element): New component Index (Variable_Value): New component Index (Array_Element): New component Src_Index * prj-attr.adb: Indicate that optional index may be specified for attributes Main, Executable, Spec, Body and some of Switches. * prj-attr.ads (Attribute_Kind): New values for optional indexes (Attribute_Record): New component Optional_Index * prj-com.ads (File_Name_Data): New component Index * prj-dect.adb (Parse_Attribute_Declaration): Process optional index * prj-env.adb (Put): Output optional index * prj-makr.adb: Put indexes for multi-unit sources in SFN pragmas and attributes Spec and Body. * prj-nmsc.adb: Process optional indexes * prj-pp.adb: Ouput "at" for optional indexes * prj-proc.adb: Take into account optional indexes * prj-strt.ads, prj-strt.adb (Terms): New Boolean parameter Optional_Index. For string literal, process optional index when Optional_Index is True. (Parse_Expresion): New Boolean parameter Optional_Index * prj-tree.ads, prj-tree.adb (Source_Index_Of): New function (Set_Source_Index_Of): New procedure * prj-util.adb (Executable_Of, Value_Of): Take into account optional index. * prj-util.ads (Executable_Of): New parameter Index (Value_Of (Name_Id, Array_Element_Id) returning Variable_Value): New parameter Src_Index, defaulted to 0. 2004-05-05 Ed Schonberg PR ada/15257 * sem_ch3.adb (Access_Definition): If this is an access parameter whose designated type is imported through a limited_with clause, do not add the enclosing subprogram to the list of private dependents of the type. 2004-05-05 Ed Schonberg PR ada/15258 * sem_ch6.adb (Base_Types_Match): True if one type is imported through a limited_with clause, and the other is its non-limited view. 2004-05-05 Thomas Quinot * cstand.adb (Create_Standard): Initialize Stand.Boolean_Literals. * exp_attr.adb, exp_ch5.adb, exp_ch9.adb, exp_disp.adb, exp_fixd.adb, sem_attr.adb, sem_dist.adb, sem_util.adb: Use Stand.Boolean_Literals to produce references to entities Standard_False and Standard_True from compile-time computed boolean values. * stand.ads (Boolean_Literals): New variable, provides the entity values for False and True, for use by the expander. 2004-05-05 Doug Rupp * 5vinmaop.adb, 5[vx]system.ads: Add Short_Address subtype 5vinmaop.adb: Unchecked convert Short_Address vice Address * adaint.c, raise.c: Caste CRTL function return value to avoid gcc error on 32/64 bit IVMS. * Makefile.in [VMS]: Use iar archiver if host = Alpha/VMS and target = IA64/VMS. * init.c[VMS]: Only call Alpha specific __gnat_error_prehandler IN_RTS. * 5qsystem.ads (Address): Declare as Long_Integer (Short_Address): Declare as 32 bit subtype of Address Declare abstract address operations to avoid gratuitous ambiguities. 2004-05-05 Jose Ruiz * gnat_rm.texi: Use the new restriction Simple_Barriers (AI-249) instead of the old Boolean_Entry_Barriers. Ditto for No_Task_Attributes_Package instead of No_Task_Attributes. 2004-05-05 GNAT Script * Make-lang.in: Makefile automatically updated git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@81519 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/prj-attr.adb | 58 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 17 deletions(-) (limited to 'gcc/ada/prj-attr.adb') diff --git a/gcc/ada/prj-attr.adb b/gcc/ada/prj-attr.adb index 6e8cc6cccb0..a0588bcb4e1 100644 --- a/gcc/ada/prj-attr.adb +++ b/gcc/ada/prj-attr.adb @@ -39,7 +39,9 @@ package body Prj.Attr is -- The first letter is one of -- 'S' for Single - -- 'L' for list + -- 's' for Single with optional index + -- 'L' for List + -- 'l' for List of strings with optional indexes -- The second letter is one of -- 'V' for single variable @@ -47,6 +49,7 @@ package body Prj.Attr is -- 'a' for case insensitive associative array -- 'b' for associative array, case insensitive if file names are case -- insensitive + -- 'c' same as 'b', with optional index -- End is indicated by two consecutive '#'. @@ -72,7 +75,7 @@ package body Prj.Attr is "SVlibrary_symbol_file#" & "SVlibrary_symbol_policy#" & "SVlibrary_reference_symbol_file#" & - "LVmain#" & + "lVmain#" & "LVlanguages#" & "SVmain_language#" & @@ -86,10 +89,10 @@ package body Prj.Attr is "SVseparate_suffix#" & "SVcasing#" & "SVdot_replacement#" & - "SAspecification#" & - "SAspec#" & - "SAimplementation#" & - "SAbody#" & + "sAspecification#" & + "sAspec#" & + "sAimplementation#" & + "sAbody#" & "Laspecification_exceptions#" & "Laimplementation_exceptions#" & @@ -97,15 +100,15 @@ package body Prj.Attr is "Pcompiler#" & "Ladefault_switches#" & - "Lbswitches#" & + "Lcswitches#" & "SVlocal_configuration_pragmas#" & -- package Builder "Pbuilder#" & "Ladefault_switches#" & - "Lbswitches#" & - "Sbexecutable#" & + "Lcswitches#" & + "Scexecutable#" & "SVexecutable_suffix#" & "SVglobal_configuration_pragmas#" & @@ -118,13 +121,13 @@ package body Prj.Attr is "Pbinder#" & "Ladefault_switches#" & - "Lbswitches#" & + "Lcswitches#" & -- package Linker "Plinker#" & "Ladefault_switches#" & - "Lbswitches#" & + "Lcswitches#" & "LVlinker_options#" & -- package Cross_Reference @@ -184,6 +187,7 @@ package body Prj.Attr is Current_Attribute : Attribute_Node_Id := Empty_Attribute; Is_An_Attribute : Boolean := False; Kind_1 : Variable_Kind := Undefined; + Optional_Index : Boolean := False; Kind_2 : Attribute_Kind := Single; Package_Name : Name_Id := No_Name; Attribute_Name : Name_Id := No_Name; @@ -232,10 +236,20 @@ package body Prj.Attr is Start := Finish + 1; when 'S' => - Kind_1 := Single; + Kind_1 := Single; + Optional_Index := False; + + when 's' => + Kind_1 := Single; + Optional_Index := True; when 'L' => - Kind_1 := List; + Kind_1 := List; + Optional_Index := False; + + when 'l' => + Kind_1 := List; + Optional_Index := True; when others => raise Program_Error; @@ -263,6 +277,14 @@ package body Prj.Attr is Kind_2 := Case_Insensitive_Associative_Array; end if; + when 'c' => + if File_Names_Case_Sensitive then + Kind_2 := Optional_Index_Associative_Array; + else + Kind_2 := + Optional_Index_Case_Insensitive_Associative_Array; + end if; + when others => raise Program_Error; end case; @@ -279,6 +301,7 @@ package body Prj.Attr is To_Lower (Initialization_Data (Start .. Finish - 1)); Attribute_Name := Name_Find; Attributes.Increment_Last; + if Current_Attribute = Empty_Attribute then First_Attribute := Attributes.Last; @@ -306,10 +329,11 @@ package body Prj.Attr is Current_Attribute := Attributes.Last; Attributes.Table (Current_Attribute) := - (Name => Attribute_Name, - Kind_1 => Kind_1, - Kind_2 => Kind_2, - Next => Empty_Attribute); + (Name => Attribute_Name, + Kind_1 => Kind_1, + Optional_Index => Optional_Index, + Kind_2 => Kind_2, + Next => Empty_Attribute); Start := Finish + 1; end if; end loop; -- cgit v1.2.1