[multiple changes]

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

	* sprint.adb (Write_Itype): Print proper header for string
	literal subtype.

2014-07-17  Steve Baird  <baird@adacore.com>

	* sinfo.ads, sem_scil.ads: Improve comments, minor reformatting.

From-SVN: r212731

4 files changed, 51 insertions, 18 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index c2351f9..0dfddec 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,12 @@
+2014-07-17  Robert Dewar  <dewar@adacore.com>
+
+	* sprint.adb (Write_Itype): Print proper header for string
+	literal subtype.
+
+2014-07-17  Steve Baird  <baird@adacore.com>
+
+	* sinfo.ads, sem_scil.ads: Improve comments, minor reformatting.
+
 2014-07-17  Vincent Celier  <celier@adacore.com>
 
 	* gnatbind.adb: Change in message "try ... for more information".
diff --git a/gcc/ada/sem_scil.ads b/gcc/ada/sem_scil.ads
index 1a6e45c..3eb0237 100644
--- a/gcc/ada/sem_scil.ads
+++ b/gcc/ada/sem_scil.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 2009-2010, Free Software Foundation, Inc.         --
+--          Copyright (C) 2009-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- --
@@ -31,7 +31,20 @@ with Types; use Types;
 
 package Sem_SCIL is
 
-   --  Here would be a good place to document what SCIL is all about ???
+   --  SCIL (Statically Checkable Intermediate Language) is produced by the
+   --  CodePeer back end (aka gnat2scil). For some constructs (tagged type
+   --  declarations, dispatching calls, classwide membership tests), the
+   --  CodePeer back end needs to locate certain nodes in the tree. To allow
+   --  CodePeer to do this without introducing unwanted dependencies on the
+   --  details of the FE's expansion strategies, SCIL_Nodes are generated.
+
+   --  For example, a dispatching call in the Ada source will, if CodePeer mode
+   --  is enabled, result in the FE's generation of an N_Scil_Dispatching_Call
+   --  node decorated with semantic attributes which identify the call itself,
+   --  the primitive operation being called, the tagged type to which the
+   --  operation belongs, and the controlling tag value of the call. If the FE
+   --  implements some new expansion strategy for dispatching calls but this
+   --  interface is preserved, the CodePeer back end should be unaffected.
 
    function Check_SCIL_Node (N : Node_Id) return Traverse_Result;
    --  Process a single node during the tree traversal. Done to verify that
diff --git a/gcc/ada/sinfo.ads b/gcc/ada/sinfo.ads
index 4bb9d4f..d611648 100644
--- a/gcc/ada/sinfo.ads
+++ b/gcc/ada/sinfo.ads
@@ -1959,20 +1959,27 @@ package Sinfo is
    --    and multiplication operations.
 
    --  SCIL_Entity (Node4-Sem)
-   --    Present in SCIL nodes. Used to reference the tagged type associated
-   --    with the SCIL node.
+   --    Present in SCIL nodes. References the specific tagged type associated
+   --    with the SCIL node (for an N_SCIL_Dispatching_Call node, this is
+   --    the controlling type of the call; for an N_SCIL_Membership_Test node
+   --    generated as part of testing membership in T'Class, this is T; for an
+   --    N_SCIL_Dispatch_Table_Tag_Init node, this is the type being declared).
 
    --  SCIL_Controlling_Tag (Node5-Sem)
-   --    Present in N_SCIL_Dispatching_Call nodes. Used to reference the
-   --    controlling tag of a dispatching call.
+   --    Present in N_SCIL_Dispatching_Call nodes. References the
+   --    controlling tag of a dispatching call. This is usually an
+   --    N_Selected_Component node (for a _tag component), but may
+   --    be an N_Object_Declaration or N_Parameter_Specification node
+   --    in some cases (e.g., for a call to a classwide streaming operation
+   --    or to an instance of Ada.Tags.Generic_Dispatching_Constructor).
 
    --  SCIL_Tag_Value (Node5-Sem)
    --    Present in N_SCIL_Membership_Test nodes. Used to reference the tag
-   --    value that is being tested.
+   --    of the value that is being tested.
 
    --  SCIL_Target_Prim (Node2-Sem)
-   --    Present in N_SCIL_Dispatching_Call nodes. Used to reference the tagged
-   --    type primitive associated with the SCIL node.
+   --    Present in N_SCIL_Dispatching_Call nodes. References the primitive
+   --    operation named (statically) in a dispatching call.
 
    --  Scope (Node3-Sem)
    --    Present in defining identifiers, defining character literals and
@@ -7834,16 +7841,19 @@ package Sinfo is
       --  Note: in the case where a debug source file is generated, the Sloc
       --  for this node points to the quote in the Sprint file output.
 
-      -----------------
-      --  SCIL Nodes --
-      -----------------
+      ----------------
+      -- SCIL Nodes --
+      ----------------
+
+      --  SCIL nodes are special nodes added to the tree when the CodePeer mode
+      --  is active. They are only generated if SCIL generation is enabled.
+      --  A standard tree-walk will not encounter these nodes even if they
+      --  are present; these nodes are only accessible via the function
+      --  SCIL_LL.Get_SCIL_Node. These nodes have no associated dynamic
+      --  semantics.
 
-      --  SCIL nodes are special nodes added to the tree when the CodePeer
-      --  mode is active. They help the CodePeer backend to locate nodes that
-      --  require special processing. They are only generated if SCIL
-      --  generation is enabled. A standard tree-walk will not encounter
-      --  these nodes even if they are present; these nodes are only
-      --  accessible via the function SCIL_LL.Get_SCIL_Node.
+      --  Sprint syntax: [ <node kind> ]
+      --  No semantic field values are displayed.
 
       --  N_SCIL_Dispatch_Table_Tag_Init
       --  Sloc references a node for a tag initialization
diff --git a/gcc/ada/sprint.adb b/gcc/ada/sprint.adb
index 9a55e8c..f6980ab 100644
--- a/gcc/ada/sprint.adb
+++ b/gcc/ada/sprint.adb
@@ -4322,6 +4322,7 @@ package body Sprint is
                         Len : constant Uint :=
                                 String_Literal_Length (Typ);
                      begin
+                        Write_Header (False);
                         Write_Str ("String (");
                         Write_Int (UI_To_Int (LB));
                         Write_Str (" .. ");