[Ada] Do not give "bad indentation" error inside a declare_expression

2020-06-17  Bob Duff  <duff@adacore.com>

gcc/ada/

	* par.adb (P_Basic_Declarative_Items): Update comment about
	Declare_Expression.
	* par-ch3.adb (P_Declarative_Items): Pass in Declare_Expression
	flag, and if True, skip the call to Style.Check_Indentation.
	* par-ch4.adb (P_Declare_Expression): Fix incorrect comment.

diff --git a/gcc/ada/par-ch3.adb b/gcc/ada/par-ch3.adb
index 1fadf368c186519b0f1f1e7f26cec59fa37c9a0f..d224cc51c02a51ec967c299df9d1e81632b4058c 100644 (file)
--- a/gcc/ada/par-ch3.adb
+++ b/gcc/ada/par-ch3.adb
@@ -78,18 +78,24 @@ package body Ch3 is
    --  it very unlikely that this will ever arise in practice.
 
    procedure P_Declarative_Items
-     (Decls   : List_Id;
-      Done    : out Boolean;
-      In_Spec : Boolean);
+     (Decls              : List_Id;
+      Done               : out Boolean;
+      Declare_Expression : Boolean;
+      In_Spec            : Boolean);
    --  Scans out a single declarative item, or, in the case of a declaration
    --  with a list of identifiers, a list of declarations, one for each of the
    --  identifiers in the list. The declaration or declarations scanned are
    --  appended to the given list. Done indicates whether or not there may be
    --  additional declarative items to scan. If Done is True, then a decision
    --  has been made that there are no more items to scan. If Done is False,
-   --  then there may be additional declarations to scan. In_Spec is true if
-   --  we are scanning a package declaration, and is used to generate an
-   --  appropriate message if a statement is encountered in such a context.
+   --  then there may be additional declarations to scan.
+   --
+   --  Declare_Expression is true if we are parsing a declare_expression, in
+   --  which case we want to suppress certain style checking.
+   --
+   --  In_Spec is true if we are scanning a package declaration, and is used to
+   --  generate an appropriate message if a statement is encountered in such a
+   --  context.
 
    procedure P_Identifier_Declarations
      (Decls   : List_Id;
@@ -4310,7 +4316,8 @@ package body Ch3 is
       --  Loop to scan out the declarations
 
       loop
-         P_Declarative_Items (Decls, Done, In_Spec => False);
+         P_Declarative_Items
+           (Decls, Done, Declare_Expression => False, In_Spec => False);
          exit when Done;
       end loop;
 
@@ -4337,16 +4344,20 @@ package body Ch3 is
    --  then the scan is set past the next semicolon and Error is returned.
 
    procedure P_Declarative_Items
-     (Decls   : List_Id;
-      Done    : out Boolean;
-      In_Spec : Boolean)
+     (Decls              : List_Id;
+      Done               : out Boolean;
+      Declare_Expression : Boolean;
+      In_Spec            : Boolean)
    is
       Scan_State : Saved_Scan_State;
 
    begin
       Done := False;
 
-      if Style_Check then
+      --  In -gnatg mode, we don't want a "bad indentation" error inside a
+      --  declare_expression.
+
+      if Style_Check and not Declare_Expression then
          Style.Check_Indentation;
       end if;
 
@@ -4727,7 +4738,8 @@ package body Ch3 is
       Decls := New_List;
 
       loop
-         P_Declarative_Items (Decls, Done, In_Spec => True);
+         P_Declarative_Items
+           (Decls, Done, Declare_Expression, In_Spec => True);
          exit when Done;
       end loop;
 
@@ -4827,7 +4839,8 @@ package body Ch3 is
       Dummy_Done : Boolean;
       pragma Warnings (Off, Dummy_Done);
    begin
-      P_Declarative_Items (S, Dummy_Done, False);
+      P_Declarative_Items
+        (S, Dummy_Done, Declare_Expression => False, In_Spec => False);
    end Skip_Declaration;
 
    -----------------------------------------

diff --git a/gcc/ada/par-ch4.adb b/gcc/ada/par-ch4.adb
index e3f3f06f8a8f60495aa9db42a6c9cc4ce05b2e10..0360212934cd28c49aac8b8de3c5dead25dba7b0 100644 (file)
--- a/gcc/ada/par-ch4.adb
+++ b/gcc/ada/par-ch4.adb
@@ -3587,7 +3587,7 @@ package body Ch4 is
    function P_Declare_Expression return Node_Id is
       Loc : constant Source_Ptr := Token_Ptr;
    begin
-      Scan; -- past IF
+      Scan; -- past DECLARE
 
       declare
          Actions : constant List_Id := P_Basic_Declarative_Items

diff --git a/gcc/ada/par.adb b/gcc/ada/par.adb
index 78790808abda003b49c9f9fcb50b3760f6a52da6..4978dc5b983a6cf7a7ca808fd89552c87012bf65 100644 (file)
--- a/gcc/ada/par.adb
+++ b/gcc/ada/par.adb
@@ -699,7 +699,8 @@ function Par (Configuration_Pragmas : Boolean) return List_Id is
       --  private part (in which case Declare_Expression is False), and
       --  the declare_items of a declare_expression (in which case
       --  Declare_Expression is True). Declare_Expression is used to
-      --  affect the wording of error messages.
+      --  affect the wording of error messages, and to control style
+      --  checking.
 
       function P_Access_Definition
         (Null_Exclusion_Present : Boolean) return Node_Id;