[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

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index a5453b2b46af70daf9df2cb09478b504cee2d41c..191b17b636d6d6a21e246ddbe8330915420d7a4a 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,15 @@
+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>
 
        * a-except-2005.adb, a-except.adb: Remove obsolete comments.

diff --git a/gcc/ada/par-ch5.adb b/gcc/ada/par-ch5.adb
index 1d5504df922c8f6a0945b06a44385b69e8e41a3a..7b1bc44f39d97da6d2c602538f1c135d30e7a45f 100644 (file)
--- a/gcc/ada/par-ch5.adb
+++ b/gcc/ada/par-ch5.adb
@@ -699,6 +699,11 @@ package body Ch5 is
 
                      else
                         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;
                      end if;
 

diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb
index e6a1f4c601be2fc11731c3d9071bbd5c35245235..6f8b7133c8aba4d0fba74652c8b1bcd13a5f9820 100644 (file)
--- a/gcc/ada/prj-nmsc.adb
+++ b/gcc/ada/prj-nmsc.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 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 --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -3243,9 +3243,6 @@ package body Prj.Nmsc is
                     (Data.Flags,
                      "library directory { does not exist",
                      Lib_Dir.Location, Project);
-
-               else
-                  Project.Library_Dir := No_Path_Information;
                end if;
 
             --  Checks for object/source directories
@@ -5514,9 +5511,6 @@ package body Prj.Nmsc is
                     (Data.Flags, Data.Flags.Require_Obj_Dirs,
                      "object directory { not found",
                      Project.Location, Project);
-
-               else
-                  Project.Object_Directory := No_Path_Information;
                end if;
             end if;
          end if;

diff --git a/gcc/ada/prj.ads b/gcc/ada/prj.ads
index ce6e01e7e16b582e9a00733d4e19d1afa2a4d7be..83c9c89cba2ffbc0cdc46e6d09cae740e1db6f1d 100644 (file)
--- a/gcc/ada/prj.ads
+++ b/gcc/ada/prj.ads
@@ -1882,10 +1882,11 @@ package Prj is
    --       * user project also includes a "with" that can only be resolved
    --         once we have found the gnatls
 
-   Gprbuild_Flags : constant Processing_Flags;
-   Gprclean_Flags : constant Processing_Flags;
-   Gprexec_Flags  : constant Processing_Flags;
-   Gnatmake_Flags : constant Processing_Flags;
+   Gprbuild_Flags   : constant Processing_Flags;
+   Gprinstall_Flags : constant Processing_Flags;
+   Gprclean_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
    --  through Prj.Err.
 
@@ -2034,52 +2035,64 @@ private
       Ignore_Missing_With        : Boolean;
    end record;
 
-   Gprbuild_Flags : constant Processing_Flags :=
-                      (Report_Error               => null,
-                       When_No_Sources            => Warning,
-                       Require_Sources_Other_Lang => True,
-                       Allow_Duplicate_Basenames  => False,
-                       Compiler_Driver_Mandatory  => True,
-                       Error_On_Unknown_Language  => True,
-                       Require_Obj_Dirs           => Error,
-                       Allow_Invalid_External     => Error,
-                       Missing_Source_Files       => Error,
-                       Ignore_Missing_With        => False);
-
-   Gprclean_Flags : constant Processing_Flags :=
-                      (Report_Error               => null,
-                       When_No_Sources            => Warning,
-                       Require_Sources_Other_Lang => True,
-                       Allow_Duplicate_Basenames  => False,
-                       Compiler_Driver_Mandatory  => True,
-                       Error_On_Unknown_Language  => True,
-                       Require_Obj_Dirs           => Warning,
-                       Allow_Invalid_External     => Error,
-                       Missing_Source_Files       => Error,
-                       Ignore_Missing_With        => False);
-
-   Gprexec_Flags :  constant Processing_Flags :=
-                      (Report_Error               => null,
-                       When_No_Sources            => Silent,
-                       Require_Sources_Other_Lang => False,
-                       Allow_Duplicate_Basenames  => False,
-                       Compiler_Driver_Mandatory  => False,
-                       Error_On_Unknown_Language  => True,
-                       Require_Obj_Dirs           => Silent,
-                       Allow_Invalid_External     => Error,
-                       Missing_Source_Files       => Silent,
-                       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);
+   Gprbuild_Flags   : constant Processing_Flags :=
+                        (Report_Error               => null,
+                         When_No_Sources            => Warning,
+                         Require_Sources_Other_Lang => True,
+                         Allow_Duplicate_Basenames  => False,
+                         Compiler_Driver_Mandatory  => True,
+                         Error_On_Unknown_Language  => True,
+                         Require_Obj_Dirs           => Error,
+                         Allow_Invalid_External     => Error,
+                         Missing_Source_Files       => Error,
+                         Ignore_Missing_With        => False);
+
+   Gprinstall_Flags : constant Processing_Flags :=
+                        (Report_Error               => null,
+                         When_No_Sources            => Warning,
+                         Require_Sources_Other_Lang => True,
+                         Allow_Duplicate_Basenames  => False,
+                         Compiler_Driver_Mandatory  => True,
+                         Error_On_Unknown_Language  => True,
+                         Require_Obj_Dirs           => Silent,
+                         Allow_Invalid_External     => Error,
+                         Missing_Source_Files       => Error,
+                         Ignore_Missing_With        => False);
+
+   Gprclean_Flags   : constant Processing_Flags :=
+                        (Report_Error               => null,
+                         When_No_Sources            => Warning,
+                         Require_Sources_Other_Lang => True,
+                         Allow_Duplicate_Basenames  => False,
+                         Compiler_Driver_Mandatory  => True,
+                         Error_On_Unknown_Language  => True,
+                         Require_Obj_Dirs           => Warning,
+                         Allow_Invalid_External     => Error,
+                         Missing_Source_Files       => Error,
+                         Ignore_Missing_With        => False);
+
+   Gprexec_Flags    : constant Processing_Flags :=
+                        (Report_Error               => null,
+                         When_No_Sources            => Silent,
+                         Require_Sources_Other_Lang => False,
+                         Allow_Duplicate_Basenames  => False,
+                         Compiler_Driver_Mandatory  => False,
+                         Error_On_Unknown_Language  => True,
+                         Require_Obj_Dirs           => Silent,
+                         Allow_Invalid_External     => Error,
+                         Missing_Source_Files       => Silent,
+                         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;