Skip to content

R
riscv-gcc-1
Commit 43174f15 by Arnaud Charlet
Options

[multiple changes] 

2014-07-30  Robert Dewar  <dewar@adacore.com>

	* par-ch5.adb (P_Sequence_Of_Statements): Properly handle
	missing semicolon after name.

2014-07-30  Pascal Obry  <obry@adacore.com>

	* prj.ads (Gprinstall_Flags): New constant.
	* prj-nmsc.adb (Check_Library_Attributes): Do not fails for
	missing library dir if Directories_Must_Exist_In_Projects
	is false.

From-SVN: r213282
parent 734e72dd
Showing with 82 additions and 58 deletions
gcc/ada/ChangeLog
2014-07-30 Robert Dewar <dewar@adacore.com>
* par-ch5.adb (P_Sequence_Of_Statements): Properly handle
missing semicolon after name.
2014-07-30 Pascal Obry <obry@adacore.com>
* prj.ads (Gprinstall_Flags): New constant.
* prj-nmsc.adb (Check_Library_Attributes): Do not fails for
missing library dir if Directories_Must_Exist_In_Projects
is false.
2014-07-30 Bob Duff <duff@adacore.com> 2014-07-30 Bob Duff <duff@adacore.com>
* a-except-2005.adb, a-except.adb: Remove obsolete comments. * a-except-2005.adb, a-except.adb: Remove obsolete comments.
......
gcc/ada/par-ch5.adb
...@@ -699,6 +699,11 @@ package body Ch5 is ...@@ -699,6 +699,11 @@ package body Ch5 is
else else
TF_Semicolon; TF_Semicolon;
-- Normal processing as though semicolon were present
Change_Name_To_Procedure_Call_Statement (Name_Node);
Append_To (Statement_List, Name_Node);
Statement_Required := False; Statement_Required := False;
end if; end if;
......
gcc/ada/prj-nmsc.adb
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2000-2013, Free Software Foundation, Inc. -- -- Copyright (C) 2000-2014, Free Software Foundation, Inc. --
-- -- -- --
-- GNAT is free software; you can redistribute it and/or modify it under -- -- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -3243,9 +3243,6 @@ package body Prj.Nmsc is ...@@ -3243,9 +3243,6 @@ package body Prj.Nmsc is
(Data.Flags, (Data.Flags,
"library directory { does not exist", "library directory { does not exist",
Lib_Dir.Location, Project); Lib_Dir.Location, Project);
else
Project.Library_Dir := No_Path_Information;
end if; end if;
-- Checks for object/source directories -- Checks for object/source directories
...@@ -5514,9 +5511,6 @@ package body Prj.Nmsc is ...@@ -5514,9 +5511,6 @@ package body Prj.Nmsc is
(Data.Flags, Data.Flags.Require_Obj_Dirs, (Data.Flags, Data.Flags.Require_Obj_Dirs,
"object directory { not found", "object directory { not found",
Project.Location, Project); Project.Location, Project);
else
Project.Object_Directory := No_Path_Information;
end if; end if;
end if; end if;
end if; end if;
......
gcc/ada/prj.ads
...@@ -1882,10 +1882,11 @@ package Prj is ...@@ -1882,10 +1882,11 @@ package Prj is
-- * user project also includes a "with" that can only be resolved -- * user project also includes a "with" that can only be resolved
-- once we have found the gnatls -- once we have found the gnatls
Gprbuild_Flags : constant Processing_Flags; Gprbuild_Flags : constant Processing_Flags;
Gprclean_Flags : constant Processing_Flags; Gprinstall_Flags : constant Processing_Flags;
Gprexec_Flags : constant Processing_Flags; Gprclean_Flags : constant Processing_Flags;
Gnatmake_Flags : constant Processing_Flags; Gprexec_Flags : constant Processing_Flags;
Gnatmake_Flags : constant Processing_Flags;
-- Flags used by the various tools. They all display the error messages -- Flags used by the various tools. They all display the error messages
-- through Prj.Err. -- through Prj.Err.
...@@ -2034,52 +2035,64 @@ private ...@@ -2034,52 +2035,64 @@ private
Ignore_Missing_With : Boolean; Ignore_Missing_With : Boolean;
end record; end record;
Gprbuild_Flags : constant Processing_Flags := Gprbuild_Flags : constant Processing_Flags :=
(Report_Error => null, (Report_Error => null,
When_No_Sources => Warning, When_No_Sources => Warning,
Require_Sources_Other_Lang => True, Require_Sources_Other_Lang => True,
Allow_Duplicate_Basenames => False, Allow_Duplicate_Basenames => False,
Compiler_Driver_Mandatory => True, Compiler_Driver_Mandatory => True,
Error_On_Unknown_Language => True, Error_On_Unknown_Language => True,
Require_Obj_Dirs => Error, Require_Obj_Dirs => Error,
Allow_Invalid_External => Error, Allow_Invalid_External => Error,
Missing_Source_Files => Error, Missing_Source_Files => Error,
Ignore_Missing_With => False); Ignore_Missing_With => False);
Gprclean_Flags : constant Processing_Flags := Gprinstall_Flags : constant Processing_Flags :=
(Report_Error => null, (Report_Error => null,
When_No_Sources => Warning, When_No_Sources => Warning,
Require_Sources_Other_Lang => True, Require_Sources_Other_Lang => True,
Allow_Duplicate_Basenames => False, Allow_Duplicate_Basenames => False,
Compiler_Driver_Mandatory => True, Compiler_Driver_Mandatory => True,
Error_On_Unknown_Language => True, Error_On_Unknown_Language => True,
Require_Obj_Dirs => Warning, Require_Obj_Dirs => Silent,
Allow_Invalid_External => Error, Allow_Invalid_External => Error,
Missing_Source_Files => Error, Missing_Source_Files => Error,
Ignore_Missing_With => False); Ignore_Missing_With => False);
Gprexec_Flags : constant Processing_Flags := Gprclean_Flags : constant Processing_Flags :=
(Report_Error => null, (Report_Error => null,
When_No_Sources => Silent, When_No_Sources => Warning,
Require_Sources_Other_Lang => False, Require_Sources_Other_Lang => True,
Allow_Duplicate_Basenames => False, Allow_Duplicate_Basenames => False,
Compiler_Driver_Mandatory => False, Compiler_Driver_Mandatory => True,
Error_On_Unknown_Language => True, Error_On_Unknown_Language => True,
Require_Obj_Dirs => Silent, Require_Obj_Dirs => Warning,
Allow_Invalid_External => Error, Allow_Invalid_External => Error,
Missing_Source_Files => Silent, Missing_Source_Files => Error,
Ignore_Missing_With => False); Ignore_Missing_With => False);
Gnatmake_Flags : constant Processing_Flags := Gprexec_Flags : constant Processing_Flags :=
(Report_Error => null, (Report_Error => null,
When_No_Sources => Error, When_No_Sources => Silent,
Require_Sources_Other_Lang => False, Require_Sources_Other_Lang => False,
Allow_Duplicate_Basenames => False, Allow_Duplicate_Basenames => False,
Compiler_Driver_Mandatory => False, Compiler_Driver_Mandatory => False,
Error_On_Unknown_Language => False, Error_On_Unknown_Language => True,
Require_Obj_Dirs => Error, Require_Obj_Dirs => Silent,
Allow_Invalid_External => Error, Allow_Invalid_External => Error,
Missing_Source_Files => Error, Missing_Source_Files => Silent,
Ignore_Missing_With => False); Ignore_Missing_With => False);
Gnatmake_Flags : constant Processing_Flags :=
(Report_Error => null,
When_No_Sources => Error,
Require_Sources_Other_Lang => False,
Allow_Duplicate_Basenames => False,
Compiler_Driver_Mandatory => False,
Error_On_Unknown_Language => False,
Require_Obj_Dirs => Error,
Allow_Invalid_External => Error,
Missing_Source_Files => Error,
Ignore_Missing_With => False);
end Prj; end Prj;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment