diff options
| author | Robert Dewar <dewar@adacore.com> | 2011-08-05 13:35:04 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-08-05 15:35:04 +0200 |
| commit | 9aff36e9f183e2f4590a9e03d79ee1e3d21724a2 (patch) | |
| tree | ceb05eff07864148731708854889873363c69eb4 /gcc/ada/prj-conf.adb | |
| parent | 406935b64c887e2e7bb2882f4db5d2fa2e451b73 (diff) | |
| download | gcc-9aff36e9f183e2f4590a9e03d79ee1e3d21724a2.zip gcc-9aff36e9f183e2f4590a9e03d79ee1e3d21724a2.tar.gz gcc-9aff36e9f183e2f4590a9e03d79ee1e3d21724a2.tar.bz2 | |
exp_ch7.ads, [...]: Minor reformatting.
2011-08-05 Robert Dewar <dewar@adacore.com>
* exp_ch7.ads, sem_type.adb, make.adb, sem_prag.adb, sem_util.adb,
sem_util.ads, sem_attr.adb, restrict.ads, sem_ch6.adb, prj-conf.adb,
prj-conf.ads, s-atocou.ads, s-atocou.adb, s-atocou-x86.adb,
s-atocou-builtin.adb: Minor reformatting.
From-SVN: r177433
Diffstat (limited to 'gcc/ada/prj-conf.adb')
| -rw-r--r-- | gcc/ada/prj-conf.adb | 59 |
1 files changed, 30 insertions, 29 deletions
diff --git a/gcc/ada/prj-conf.adb b/gcc/ada/prj-conf.adb index ab297e5..2fa66ac 100644 --- a/gcc/ada/prj-conf.adb +++ b/gcc/ada/prj-conf.adb @@ -911,7 +911,7 @@ package body Prj.Conf is if Subdirs /= null then Add_Char_To_Name_Buffer (Directory_Separator); - Add_Str_To_Name_Buffer (Subdirs.all); + Add_Str_To_Name_Buffer (Subdirs.all); end if; for J in 1 .. Name_Len loop @@ -924,9 +924,8 @@ package body Prj.Conf is Obj_Dir : constant String := Name_Buffer (1 .. Name_Len); Config_Switches : Argument_List_Access; Args : Argument_List (1 .. 5); - Arg_Last : Positive; - - Obj_Dir_Exists : Boolean := True; + Arg_Last : Positive; + Obj_Dir_Exists : Boolean := True; begin -- Check if the object directory exists. If Setup_Projects is True @@ -958,11 +957,13 @@ package body Prj.Conf is when Error => Raise_Invalid_Config ("object directory " & Obj_Dir & " does not exist"); + when Warning => Prj.Err.Error_Msg (Env.Flags, "?object directory " & Obj_Dir & " does not exist"); Obj_Dir_Exists := False; + when Silent => null; end case; @@ -974,7 +975,8 @@ package body Prj.Conf is if RTS_Languages.Get_First = No_Name then declare Builder : constant Package_Id := - Value_Of (Name_Builder, Project.Decl.Packages, Shared); + Value_Of + (Name_Builder, Project.Decl.Packages, Shared); Switch_Array_Id : Array_Element_Id; procedure Check_RTS_Switches; @@ -988,17 +990,18 @@ package body Prj.Conf is procedure Check_RTS_Switches is Switch_Array : Array_Element; - Switch_List : String_List_Id := Nil_String; - Switch : String_Element; + Switch_List : String_List_Id := Nil_String; + Switch : String_Element; + + Lang : Name_Id; + Lang_Last : Positive; - Lang : Name_Id; - Lang_Last : Positive; begin while Switch_Array_Id /= No_Array_Element loop Switch_Array := Shared.Array_Elements.Table (Switch_Array_Id); - Switch_List := Switch_Array.Value.Values; + Switch_List := Switch_Array.Value.Values; while Switch_List /= Nil_String loop Switch := Shared.String_Elements.Table (Switch_List); @@ -1027,23 +1030,21 @@ package body Prj.Conf is Lang_Last := Lang_Last + 1; end loop; - if - Name_Buffer (Lang_Last + 1) = '=' - then + if Name_Buffer (Lang_Last + 1) = '=' then declare RTS : constant String := - Name_Buffer (Lang_Last + 2 .. - Name_Len); + Name_Buffer (Lang_Last + 2 .. + Name_Len); begin - Name_Buffer (1 .. Lang_Last - 6) - := Name_Buffer (7 .. Lang_Last); + Name_Buffer (1 .. Lang_Last - 6) := + Name_Buffer (7 .. Lang_Last); Name_Len := Lang_Last - 6; To_Lower (Name_Buffer (1 .. Name_Len)); Lang := Name_Find; - if - not Runtime_Name_Set_For (Lang) + if not + Runtime_Name_Set_For (Lang) then Set_Runtime_For (Lang, RTS); end if; @@ -1245,8 +1246,8 @@ package body Prj.Conf is -- If the config file is not auto-generated, warn if there is any --RTS -- switch on the command line. - elsif RTS_Languages.Get_First /= No_Name and then - Opt.Warning_Mode /= Opt.Suppress + elsif RTS_Languages.Get_First /= No_Name + and then Opt.Warning_Mode /= Opt.Suppress then Write_Line ("warning: --RTS is taken into account only in auto-configuration"); @@ -1266,14 +1267,14 @@ package body Prj.Conf is elsif Config_File_Path /= null then Prj.Part.Parse - (In_Tree => Project_Node_Tree, - Project => Config_Project_Node, - Project_File_Name => Config_File_Path.all, - Errout_Handling => Prj.Part.Finalize_If_Error, - Packages_To_Check => Packages_To_Check, - Current_Directory => Current_Directory, - Is_Config_File => True, - Env => Env); + (In_Tree => Project_Node_Tree, + Project => Config_Project_Node, + Project_File_Name => Config_File_Path.all, + Errout_Handling => Prj.Part.Finalize_If_Error, + Packages_To_Check => Packages_To_Check, + Current_Directory => Current_Directory, + Is_Config_File => True, + Env => Env); else Config_Project_Node := Empty_Node; end if; |