2005-02-09 Robert Dewar <dewar@adacore.com>

	    Thomas Quinot  <quinot@adacore.com>
	    Javier Miranda  <miranda@adacore.com>
	    Pascal Obry  <obry@adacore.com>
	    Ed Schonberg  <schonberg@adacore.com>
	    Doug Rupp  <rupp@adacore.com>
	    Gary Dismukes  <dismukes@adacore.com>
	    Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>

	* g-zstspl.ads: New file.

	* a-chahan.ads, a-chahan.adb: Add declarations from AI-285

	* a-string.ads: Add pragma Ada_05 for wide_wide_space to get warning in
	Ada 95 mode
	Add definition of Wide_Wide_Space for AI-285

	* impunit.ads, impunit.adb, sem_ch10.adb: Complete rewrite and new
	interface (to support Ada 95 and Ada 2005 units).
	Add Unbounded_IO files
	Add entries for Wide_Wide packages for AI-285
	Add list of containers packages to Ada 2005 unit list

	* a-swuwti.ads, a-swuwti.adb, a-suteio.ads, a-suteio.adb: Updates to
	support new Unbounded_IO package cleanly.

	* g-utf_32.ads, g-utf_32.adb: New files.

	* Makefile.rtl: Add entry for g-utf_32
	Add new files for Unbounded_IO
	Adjust make file for new AI-285 wide wide packages
	Add AI-302 containers to the run time.

	* a-stwibo.adb, a-stwibo.ads, a-stwisu.adb, a-stwisu.ads,
	a-strbou.ads, a-strbou.adb, a-strsup.ads, a-strsup.adb: New
	subprograms for AI-301.

	* a-stwiun.adb, a-stwiun.ads: Minor reformatting.

	* a-stunau.ads: Minor comment correction

	* rtsfind.ads, rtsfind.adb: Add definitions for Wide_Wide attributes
	etc.
	Also extend Text_IO_Kludge to support Wide_Wide_Text_IO
	(Check_RPC): Update to match changes in expanded code.
	Clean up unused entity.

	* exp_ch3.ads, exp_ch3.adb: Fix various places where Wide_Wide_String
	was not taken into account.
	This includes proper initialization with Normalize_Scalars.
	(Get_Simple_Init_Val): Major rewrite for initialize scalars and
	normalize scalars cases (particularly the latter) to do a better job
	of finding invalid representations.

	* s-scaval.ads, s-scaval.adb: Add values for zero invalid values

	* s-strops.ads, s-strops.adb: Remove string normalize routines, never
	used

	* exp_dist.adb: Add support for wide wide character type
	(Expand_Receiving_Stubs_Bodies): For a package declaration that has a
	private part, generate stub bodies at the end of the private part,
	not the visible part.
	(Add_RACW_Primitive_Operations_And_Bodies): Add last missing code for
	PolyORB support.
	(Add_Obj_RPC_Receiver_Completion): Add PCS-specific subprograms and
	generic wrapper to execute final processing after completing the
	expansion of the RPC receiver for an RACW.

	* snames.h, snames.ads, snames.adb: Add definitions for wide_wide
	packages and attributes.
	(Preset_Names): Addition of the new reserved words of Ada 2005,
	that is interface, overriding and synchronized.
	(Get_Pragma_Id): Give support to the use of the new reserved word
	"interface" as a pragma name.
	(Is_Pragma_Name): Give support to the use of the new reserved word
	"interface" as a pragma name.
	(Preset_Names): Add stream_size string for the Stream_Size Ada2005
	attribute implementation.

	* exp_attr.adb (Expand_Attribute_Reference): Do not apply validity
	checks to entities that are output parameters of Asm operations.
	Handle the Stream_Size attribute.
	Add implementation of Wide_Wide_Value, Wide_Wide_Image, Wide_Wide_Width

	* exp_imgv.ads, exp_imgv.adb: Add support for wide wide character type

	* sem_attr.adb (Eval_Attribute): Raise compile-time constraint error
	for second parameter being 0.0.
	Add support for wide wide character type.
	(Analyze_Attribute, Eval_Attribute): Handle the Stream_Size attribute.

	* s-valwch.adb, s-valwch.ads, s-imgwch.ads, s-imgwch.adb,
	s-wchstw.ads, s-wchstw.adb, s-wchwts.adb, s-wchwts.ads,
	s-widwch.adb, s-widwch.ads, s-wwdcha.adb, s-wwdcha.ads,
	s-wwdenu.adb, s-wwdenu.ads, s-wwdwch.adb, s-wwdwch.ads: Add support
	for wide wide character cases.

	* cstand.adb: Create entities for Wide_Wide_Character and
	Wide_Wide_String.

	* i-c.ads, i-c.adb: Fix not raising CE for null wide strings in
	accordance with AI-258.
	Add new declarations for 16/32 bit C character types (Part of AI285)

	* einfo.ads, einfo.adb (Is_Obsolescent, Is_Ada_2005): New flag
	(Obsolescent_Warning): New field
	(Rep_Clause): New local subprogram used to share code. Returns the rep
	clause for which the name is given in parameter.
	(Has_Stream_Size_Clause): New routine.
	(Stream_Size_Clause): Idem. Implementation is based on Rep_Clause.
	(Address_Clause): Implementation is now using Rep_Clause.
	(Alignment_Clause): Idem.
	(Size_Clause): Idem.

	* lib-xref.adb (Generate_Reference): Test for reference to Ada 2005
	entity in non-Ada 2005 mode and generate warning.

	* par-prag.adb: Add handling of one argument form for pragma Ada_05.
	(Prag): Code cleanup. Remove old gnat pragma "overriding"

	* sem_prag.adb: Add handling of one argument form for pragma Ada_05
	(Analyze_Pragma, case Elaborate, Elaborate_All): Do not disable warnings
	on the named unit if the pragma is not in the current compilation unit,
	so that elaboration calls in the current unit can set up an elaboration
	dependency on the named unit, as needed.
	(Analyze_Pragma, case Obsolescent): Allow pragma to be used for library
	subprogram as well as for subprograms declared within a package.
	(Analyze_Pragma, Sig_Flags): Code cleanup. Remove support for the GNAT
	pragma overriding.

	* krunch.ads, krunch.adb: Add special handling of Wide_Wide (krunched
	to z) to avoid some instances of duplication for Wide_Wide packages.

	* namet.ads, namet.adb: Implement encoding (WWhhhhhhhh) for wide wide
	characters.

	* scn.adb: Char_Literal_Value field is now a Uint

	* scng.adb: Significant rewrite to handle new Ada 2005 features
	allowing wide and wide wide characters in program text, e.g. for
	identifiers, as described in AI-285.
	(Set_Reserved): New procedure, makes setting up keywords cleaner.
	(Initialize_Scanner): Register the new reserved words of Ada 2005.
	(Scan): Give support to the new reserved words.

	* par-ch2.adb (P_Identifier): Compiling in Ada95 mode, generate a
	warning notifying that interface, overriding, and synchronized are
	new reserved words.
	(P_Pragma): Allow the use of the new reserved word "interface" as
	a pragma name.

	* gnatls.adb, gnatbind.adb,
	ali-util.adb, binde.adb, ali.ads, ali.adb: Code cleanup. Rename
	identifiers named "interface" to "SAL_Interface".

	* bindgen.adb (Gen_Main_Ada): Add support for the new SEH
	(Structured Exception handling).
	(Gen_Main_C): Idem.

	* bindgen.adb:
	(Gen_Main_Ada): Set the default exit code if specified.
	(Gen_Main_C): Likewise.
	Part of *DC20-006.
	(Gen_Output_File_C): Remove redundant output of gnat_exit_status.
	Code cleanup. Rename identifiers named "interface" to "SAL_Interface"

	* switch-b.adb, bindusg.adb, opt.ads, vms_data.ads: Add handling of
	new -Xnnn switch.

	* mlib-prj.adb, mlib.adb: Code cleanup. Rename one identifier that
	has a collision with the new Ada 2005 "interface" reserved word.

	* par-ch3.adb (P_Defining_Identifier): Compiling in Ada95 mode,
	generate a warning notifying that interface, overriding, and
	synchronized are new reserved words.

	* scans.ads (Token_Type): Addition of the tokens corresponding to the
	new reserved words of Ada 2005: Tok_Interface, Tok_Overriding
	and Tok_Synchronized.

	* sem_res.adb (Resolve_Actuals): Change error messages to refer to
	"dispatching" rather than "primitive" operations, since dispatching
	calls are now allowed to abstract formal subprograms (which are not
	primitive).
	Char_Literal_Value field is now a Uint
	(Resolve_Slice): If the prefix is an access to an unconstrained array,
	compute the actual subtype of the designated object to impose the proper
	index constraints.
	(Resolve_Selected_Component): Do not insert an access check if the
	prefix is an access type: such a node is expanded into an explicit
	dereference, on which the access check is performed anyway. Removes
	expensive duplicate checks.
	(Resolve_Call): Use new flag Is_Obsolescent and field
	Obsolescent_Warning so that pragma Obsolescent works on library
	subprograms.
	Add support for wide wide character type
	(Resolve_Allocator): Replace the error message on wrong null-exclusion
	value by a warning message.
	(Resolve_Type_Conversion): If the mixed-mode expression is interpreted
	as fixed-point, and one of the operands is non-static and universal, it
	can only be an illegal exponentiation operation, in which case there is
	no real value to retrieve.

	* exp_strm.adb: Add support for wide wide character type
	(Build_Elementary_Input_Call): Compute the size of the stream element by
	querying the rep chain to find the Stream_Attribute attribute value.
	(Build_Elementary_Write_Call): Ditto.

	* sem_aggr.adb: Char_Literal_Value field is now a Uint
	Add support for wide wide character type
	Replace the error messages on wrong null-exclusion value by warnings
	as described in Ada 2005.
	(Resolve_Extension_Aggregate): Document the fact that the error
	message on class-wide expressions in extensions aggregates.

	* sem_case.adb: Add support for wide wide character type

	* sem_ch13.adb: Add support for wide wide character type
	(Analyze_Attribute_Definition_Clause): Handle the Stream_Size attribute.

	* sem_ch3.adb: Add support for wide wide character type
	(Process_Subtype): If constraint is illegal for the type, set Ekind of
	now-useless Itype, to prevent cascaded errors on a compiler built
	without -gnatp.

	* sem_ch8.adb: Add with and use of Sem_Disp.
	(Analyze_Subprogram_Renaming): Replace unclean uses of
	Corresponding_Spec with Corresponding_Formal_Spec (and delete setting
	of Corresponding_Spec to Empty).
	(Attribute_Renaming): Replace use of Corresponding_Spec with
	Corresponding_ Formal_Spec and simplify condition.
	(Use_One_Package): Check that scope of homonym of identifier is defined,
	before checking whether it is a wrapper package.
	Add support for wide wide character type

	* sem_eval.adb: Add support for wide wide character type.
	(Eval_Arithmetic_Op): Check for compile time known signed integer
	overflow in the non-static case.
	(Subtypes_Statically_Match): A formal scalar type and its base type do
	not statically match.

	* sem_util.adb (Collect_Primitive_Operations): Minor change of "/=" to
	"not in" for test of N_Formal_Subprogram_Declaration (which is now a
	subtype).
	(Unit_Declaration_Node): Ditto.
	(Is_Variable_Prefix):  For the case of an indexed component whose prefix
	has a packed array type, the prefix has been rewritten into a type
	conversion. Determine variable-ness from the converted expression.
	Handle wide wide character cases.

	* stand.ads: Add types Wide_Wide_Character and Wide_Wide_String

	* stringt.ads, stringt.adb: Handle full UTF-32 range.
	Remove ["0A"] from comment, since it can look like a line terminator.
	Currently we don't permit this, but this is under discussion by the
	ARG, and it is easy enough to use a different example.

	* s-wchcon.ads, s-wchcnv.ads, s-wchcnv.adb: Add new subprograms for
	handling UTF-32 encoding for wide wide character.
	Implement new brackets coding ["hhhhhhhh"]
	Add UTF-8 encodings for full UTF-32 range

	* ttypes.ads: Add definition of Standard_Wide_Wide_Character_Size

	* types.h, types.ads, types.adb: Wide_Wide_Character now has full 31
	bit range Add full UTF-32 support.
	(RT_Exception_Code): Addition of CE_Null_Not_Allowed; used to
	notify that constraint error will be raised at run-time
	because a null value is assigned to a null-excluding object.
	Remove some obsolete declarations and make Char_Code
	unsigned.

	* a-except.adb (Rcheck_30): New subprogram. Addition of the message
	corresponding to CE_Null_Not_Allowed, and adjust the output of all the
	Rcheck subprograms.

	* checks.adb (Check_Null_Not_Allowed): Replace the error message on
	wrong null-exclusion value by a warning message.
	(Enable_Range_Check): Do range check if the prefix is an
	explicit dereference whose designated object is an unconstrained array.
	Current algorithm for removing duplicate checks is over-eager in this
	case.

	* sem_ch5.adb (Analyze_Assignment): Replace the error messages on wrong
	null-exclusion value by a warning message

	* atree.h, atree.ads, atree.adb: Remove Char_Code field support
	completely. Add support for Uint2 field

	sem_ch2.adb, exp_ch11.adb, exp_dbug.adb,
	exp_prag.adb: Char_Literal_Value field is now a Uint.

	* exp_util.adb (Insert_Actions): Replace
	N_Formal_Subprogram_Declaration by
	N_Formal_{Abstract|Concrete}_Subprogram_Declaration.
	Char_Literal_Value field is now a Uint.

	* sinfo.ads, sinfo.adb (Corresponding_Formal_Spec): New function
	defined for subprogram renaming declarations. When set, the field
	indicates the defining entity of a corresponding formal subprogram
	when the renaming corresponds to a formal subprogram association in an
	instantiation.
	(Set_Corresponding_Formal_Spec): New procedure to return
	Corresponding_Formal_Spec field.
	Minor changes of "=" to "in" in tests of N_Formal_Subprogram_Declaration
	(which is now a subtype).
	Char_Literal_Value field is now a Uint

	* exp_disp.ads, exp_disp.adb (Make_DT): Generate code that moves the
	pointer to the base of the dispatch table.
	Minor changes to comments.
	(Controlling_Type): New function for determining the tagged type
	associated with a tagged primitive subprogram.
	(Expand_Dispatching_Call): Add support for a controlling actual that is
	directly a value of type Ada.Tag rather than a tagged object.

	* i-cpp.ads, i-cpp.adb, a-tags.ads, a-tags.adb: Update documentation
	describing the new layout.
	(Dispatch_Table): The expander computes the actual array size, allocates
	the Dispatch_Table record accordingly, and generates code that displaces
	the base of the record after the Typeinfo_Ptr component. The access to
	these components is done by means of local functions.
	(Offset_To_Top): New function.
	(Typeinfo_Ptr): New function.
	(Get_TSD): Modified to access the new position of the TSD.
	(Set_TSD): Modified to save the TSD in its new position.

	* par-ch12.adb (P_Formal_Subprogram_Declaration): Add parsing for the
	case of formal abstract subprograms. Add check and message for -gnat05.
	Update comments.

	* sem_ch12.adb: Add with and use for Sem_Disp.
	(Analyze_Associations): Minor change from "=" to "in" for use of
	N_Formal_Subtype_Declaration (which is now a subtype).
	(Set_Analyzed_Formal): Minor changes from "=" to "in" for uses of
	N_Formal_Subtype_Declaration (which is now a subtype).
	(Analyze_Formal_Subprogram): Add handling for
	N_Formal_Abstract_Subprogram, marking the formal as abstract and
	dispatching, setting the controlling status of the formal parameters
	and result, and issuing an error if there is no controlling type for
	the formal subprogram.
	(Instantiate_Formal_Subprogram): Rather than setting Corresponding_Spec,
	which is an unclean use of that field, we set the new field
	Corresponding_Formal_Spec to make the formal subprogram available to
	processing in Analyze_Subprogram_Declaration.
	(Analyze_Formal_{Discrete, Decimal_Fixed_Point, Fixed_Point,
	Floating_Point, Modular_Integer, Signed_Integer}_Type: Make formal type
	Constrained, so that it is is does not statically match its anonymous
	base type.

	* sem_ch6.adb (Analyze_Subprogram_Specification): Include test for
	abstract formal subprograms in error check for functions returning
	abstract types. Set scope of new designator for
	a parameterless subprogram, so that it is available when checking the
	body for nested subprograms, before full analysis of said body.
	(Analyze_Subprogram_Body): Warn on inlining bodies with nested
	subprogram only if inner one comes from source.
	(Analyze_Function_Call): If the call is given in object notation, the
	analysis of the name rewrites the node and analyzes it with the proper
	argument list. After analyzing the name, if the call has been rewritten
	and the result type is set, no further analysis is needed.
	(Analyze_Return_Type): Subsidiary to Process_Formals: analyze subtype
	mark in function specification, in a context where the formals are
	visible and hide outer homographs.

	* sem_disp.adb (Check_Controlling_Type): Relax the check for same scope
	as the tagged type for the cases of abstract formal subprograms and
	renamings of those.  Clean up spec comments.
	(Check_Dispatching_Context): Add error message to indicate "abstract
	procedure", covering the case of a call to a formal abstract procedure
	that has statically tagged operands.
	(Check_Dispatching_Call): Check for the case of an actual given by
	a tag-indeterminate function call whose type is an ancestor of the
	containing call's associated tagged type. This situation can occur
	for inherited primitives with function defaults. In this case we
	use the tagged type's tag directly as the controlling argument for
	the calls.
	(Expand_Call): Name change on call to Expand_Dispatch_Call.

	* sprint.adb (Sprint_Node_Actual): Split
	N_Formal_Subprogram_Declaration into two alternatives for the new
	cases N_Formal_Abstract_Subprogram_Declaration and
	N_Formal_Concrete_Subprogram_Declaration.
	Char_Literal_Value field is now a Uint.

	* trans.c: Get rid of junk Uint2 reference.
	Char_Literal_Value field is now a Uint.
	(gnat_to_gnu, case N_Aggregate): Check TYPE_UNCHECKED_UNION_P.
	(gigi): Correct third arg to gimplify_body.

	* ada-tree.h: (TYPE_UNCHECKED_UNION_P): New flag.
	(TYPE_LANG_FLAG_0): Check for record or union.

	* treepr.adb: Char_Literal_Value field is now a Uint

	* uintp.h, uintp.ads, uintp.adb: Add new routines UI_To_CC and
	UI_From_CC.

	* widechar.ads, widechar.adb (Is_UTF_32_Non_Graphic): New function
	Add full UTF-32 support
	Char_Code is now 32 bits

	* sinput.ads, sinput.adb (Skip_Line_Terminators): Extend to deal with
	wide character UTF_32 line terminators.
	Initialize Main_Source_File to avoid error when no main
	source is loaded.

	* errout.adb (Finalize): Do not check Num_SRef_Pragmas
	(Main_Source_File) when no main source has been loaded, to avoid
	potential crash.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@94809 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 147 insertions, 137 deletions

diff --git a/gcc/ada/a-stwisu.ads b/gcc/ada/a-stwisu.ads
index 8ea068642f8..a9df6fa2547 100644
--- a/gcc/ada/a-stwisu.ads
+++ b/gcc/ada/a-stwisu.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 2003 Free Software Foundation, Inc.               --
+--          Copyright (C) 2003-2005 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- --
@@ -35,7 +35,7 @@
 --  generic package Ada.Strings.Wide_Bounded.Generic_Bounded_Length.
 
 --  It defines type Super_String as a discriminated record with the maximum
---  length as the discriminant. Individual instantiations of
+--  length as the discriminant. Individual instantiations of the package
 --  Strings.Wide_Bounded.Generic_Bounded_Length use this type with
 --  an appropriate discriminant value set.
 
@@ -50,14 +50,12 @@ pragma Preelaborate (Wide_Superbounded);
       Current_Length : Natural := 0;
       Data           : Wide_String (1 .. Max_Length) := (others => Wide_NUL);
    end record;
-   --  Type Wide_Bounded_String in
-   --  Ada.Strings.Wide_Bounded.Generic_Bounded_Length is derived from this
-   --  type, with the constraint of the maximum length.
+   --  Ada.Strings.Wide_Bounded.Generic_Bounded_Length.Wide_Bounded_String is
+   --  derived from this type, with the constraint of the maximum length.
 
-   --  The subprograms defined for Super_String are similar to those
-   --  defined for Wide_Bounded_String, except that they have different names,
-   --  so that they can be renamed in
-   --  Ada.Strings.Wide_Bounded.Generic_Bounded_Length.
+   --  The subprograms defined for Super_String are similar to those defined
+   --  for Bounded_Wide_String, except that they have different names, so that
+   --  they can be renamed in Ada.Strings.Wide_Bounded.Generic_Bounded_Length.
 
    function Super_Length (Source : Super_String) return Natural;
 
@@ -68,88 +66,83 @@ pragma Preelaborate (Wide_Superbounded);
    function To_Super_String
      (Source     : Wide_String;
       Max_Length : Natural;
-      Drop       : Truncation := Error)
-      return       Super_String;
+      Drop       : Truncation := Error) return Super_String;
    --  Note the additional parameter Max_Length, which specifies the maximum
    --  length setting of the resulting Super_String value.
 
    --  The following procedures have declarations (and semantics) that are
-   --  exactly analogous to those declared in Ada.Strings.Bounded.
+   --  exactly analogous to those declared in Ada.Strings.Wide_Bounded.
 
    function Super_To_String (Source : Super_String) return Wide_String;
 
+   procedure Set_Super_String
+     (Target : out Super_String;
+      Source : Wide_String;
+      Drop   : Truncation := Error);
+
    function Super_Append
-     (Left, Right : Super_String;
-      Drop        : Truncation  := Error)
-      return        Super_String;
+     (Left  : Super_String;
+      Right : Super_String;
+      Drop  : Truncation := Error) return Super_String;
 
    function Super_Append
      (Left  : Super_String;
       Right : Wide_String;
-      Drop  : Truncation := Error)
-      return  Super_String;
+      Drop  : Truncation := Error) return Super_String;
 
    function Super_Append
      (Left  : Wide_String;
       Right : Super_String;
-      Drop  : Truncation := Error)
-      return  Super_String;
+      Drop  : Truncation := Error) return Super_String;
 
    function Super_Append
      (Left  : Super_String;
       Right : Wide_Character;
-      Drop  : Truncation := Error)
-      return  Super_String;
+      Drop  : Truncation := Error) return Super_String;
 
    function Super_Append
      (Left  : Wide_Character;
       Right : Super_String;
-      Drop  : Truncation := Error)
-      return  Super_String;
+      Drop  : Truncation := Error) return Super_String;
 
    procedure Super_Append
      (Source   : in out Super_String;
       New_Item : Super_String;
-      Drop     : Truncation  := Error);
+      Drop     : Truncation := Error);
 
    procedure Super_Append
      (Source   : in out Super_String;
       New_Item : Wide_String;
-      Drop     : Truncation  := Error);
+      Drop     : Truncation := Error);
 
    procedure Super_Append
      (Source   : in out Super_String;
       New_Item : Wide_Character;
-      Drop     : Truncation  := Error);
+      Drop     : Truncation := Error);
 
    function Concat
-     (Left, Right : Super_String)
-      return        Super_String;
+     (Left  : Super_String;
+      Right : Super_String) return Super_String;
 
    function Concat
      (Left  : Super_String;
-      Right : Wide_String)
-      return  Super_String;
+      Right : Wide_String) return Super_String;
 
    function Concat
      (Left  : Wide_String;
-      Right : Super_String)
-      return  Super_String;
+      Right : Super_String) return Super_String;
 
    function Concat
      (Left  : Super_String;
-      Right : Wide_Character)
-      return  Super_String;
+      Right : Wide_Character) return Super_String;
 
    function Concat
      (Left  : Wide_Character;
-      Right : Super_String)
-      return  Super_String;
+      Right : Super_String) return Super_String;
 
    function Super_Element
      (Source : Super_String;
-      Index  : Positive)
-      return   Wide_Character;
+      Index  : Positive) return Wide_Character;
 
    procedure Super_Replace_Element
      (Source : in out Super_String;
@@ -159,70 +152,82 @@ pragma Preelaborate (Wide_Superbounded);
    function Super_Slice
      (Source : Super_String;
       Low    : Positive;
-      High   : Natural)
-      return   Wide_String;
+      High   : Natural) return Wide_String;
+
+   function Super_Slice
+     (Source : Super_String;
+      Low    : Positive;
+      High   : Natural) return Super_String;
+
+   procedure Super_Slice
+     (Source : Super_String;
+      Target : out Super_String;
+      Low    : Positive;
+      High   : Natural);
 
-   function "="  (Left, Right : Super_String) return Boolean;
+   function "="
+     (Left  : Super_String;
+      Right : Super_String) return Boolean;
 
-   function Equal (Left, Right : Super_String) return Boolean renames "=";
+   function Equal
+     (Left  : Super_String;
+      Right : Super_String) return Boolean renames "=";
 
    function Equal
      (Left  : Super_String;
-      Right : Wide_String)
-      return  Boolean;
+      Right : Wide_String) return Boolean;
 
    function Equal
      (Left  : Wide_String;
-      Right : Super_String)
-      return  Boolean;
+      Right : Super_String) return Boolean;
 
-   function Less (Left, Right : Super_String) return Boolean;
+   function Less
+     (Left  : Super_String;
+      Right : Super_String) return Boolean;
 
    function Less
      (Left  : Super_String;
-      Right : Wide_String)
-      return  Boolean;
+      Right : Wide_String) return Boolean;
 
    function Less
      (Left  : Wide_String;
-      Right : Super_String)
-      return  Boolean;
+      Right : Super_String) return Boolean;
 
-   function Less_Or_Equal (Left, Right : Super_String) return Boolean;
+   function Less_Or_Equal
+     (Left  : Super_String;
+      Right : Super_String) return Boolean;
 
    function Less_Or_Equal
      (Left  : Super_String;
-      Right : Wide_String)
-      return  Boolean;
+      Right : Wide_String) return Boolean;
 
    function Less_Or_Equal
      (Left  : Wide_String;
-      Right : Super_String)
-      return  Boolean;
+      Right : Super_String) return Boolean;
 
-   function Greater  (Left, Right : Super_String) return Boolean;
+   function Greater
+     (Left  : Super_String;
+      Right : Super_String) return Boolean;
 
    function Greater
      (Left  : Super_String;
-      Right : Wide_String)
-      return  Boolean;
+      Right : Wide_String) return Boolean;
 
    function Greater
      (Left  : Wide_String;
-      Right : Super_String)
-      return  Boolean;
+      Right : Super_String) return Boolean;
 
-   function Greater_Or_Equal (Left, Right : Super_String) return Boolean;
+   function Greater_Or_Equal
+     (Left  : Super_String;
+      Right : Super_String) return Boolean;
 
    function Greater_Or_Equal
      (Left  : Super_String;
-      Right : Wide_String)
-      return  Boolean;
+      Right : Wide_String) return Boolean;
 
    function Greater_Or_Equal
      (Left  : Wide_String;
-      Right : Super_String)
-      return  Boolean;
+      Right : Super_String) return Boolean;
 
    ----------------------
    -- Search Functions --
@@ -233,43 +238,65 @@ pragma Preelaborate (Wide_Superbounded);
       Pattern : Wide_String;
       Going   : Direction := Forward;
       Mapping : Wide_Maps.Wide_Character_Mapping := Wide_Maps.Identity)
-      return    Natural;
+      return Natural;
 
    function Super_Index
      (Source  : Super_String;
       Pattern : Wide_String;
       Going   : Direction := Forward;
-      Mapping : Wide_Maps.Wide_Character_Mapping_Function)
-      return    Natural;
+      Mapping : Wide_Maps.Wide_Character_Mapping_Function) return Natural;
 
    function Super_Index
      (Source : Super_String;
       Set    : Wide_Maps.Wide_Character_Set;
       Test   : Membership := Inside;
-      Going  : Direction  := Forward)
-      return   Natural;
+      Going  : Direction  := Forward) return Natural;
+
+   function Super_Index
+     (Source  : Super_String;
+      Pattern : Wide_String;
+      From    : Positive;
+      Going   : Direction := Forward;
+      Mapping : Wide_Maps.Wide_Character_Mapping := Wide_Maps.Identity)
+      return Natural;
+
+   function Super_Index
+     (Source  : Super_String;
+      Pattern : Wide_String;
+      From    : Positive;
+      Going   : Direction := Forward;
+      Mapping : Wide_Maps.Wide_Character_Mapping_Function) return Natural;
+
+   function Super_Index
+     (Source : Super_String;
+      Set    : Wide_Maps.Wide_Character_Set;
+      From   : Positive;
+      Test   : Membership := Inside;
+      Going  : Direction := Forward) return Natural;
+
+   function Super_Index_Non_Blank
+     (Source : Super_String;
+      Going  : Direction := Forward) return Natural;
 
    function Super_Index_Non_Blank
      (Source : Super_String;
-      Going  : Direction := Forward)
-      return   Natural;
+      From   : Positive;
+      Going  : Direction := Forward) return Natural;
 
    function Super_Count
      (Source  : Super_String;
       Pattern : Wide_String;
       Mapping : Wide_Maps.Wide_Character_Mapping := Wide_Maps.Identity)
-      return    Natural;
+      return Natural;
 
    function Super_Count
      (Source  : Super_String;
       Pattern : Wide_String;
-      Mapping : Wide_Maps.Wide_Character_Mapping_Function)
-      return    Natural;
+      Mapping : Wide_Maps.Wide_Character_Mapping_Function) return Natural;
 
    function Super_Count
      (Source : Super_String;
-      Set    : Wide_Maps.Wide_Character_Set)
-      return   Natural;
+      Set    : Wide_Maps.Wide_Character_Set) return Natural;
 
    procedure Super_Find_Token
      (Source : Super_String;
@@ -278,14 +305,13 @@ pragma Preelaborate (Wide_Superbounded);
       First  : out Positive;
       Last   : out Natural);
 
-   -----------------------------------------
-   -- Wide_String Translation Subprograms --
-   -----------------------------------------
+   ------------------------------------
+   -- String Translation Subprograms --
+   ------------------------------------
 
    function Super_Translate
-     (Source   : Super_String;
-      Mapping  : Wide_Maps.Wide_Character_Mapping)
-      return     Super_String;
+     (Source  : Super_String;
+      Mapping : Wide_Maps.Wide_Character_Mapping) return Super_String;
 
    procedure Super_Translate
      (Source   : in out Super_String;
@@ -293,38 +319,35 @@ pragma Preelaborate (Wide_Superbounded);
 
    function Super_Translate
      (Source  : Super_String;
-      Mapping : Wide_Maps.Wide_Character_Mapping_Function)
-      return    Super_String;
+      Mapping : Wide_Maps.Wide_Character_Mapping_Function) return Super_String;
 
    procedure Super_Translate
      (Source  : in out Super_String;
       Mapping : Wide_Maps.Wide_Character_Mapping_Function);
 
-   --------------------------------------------
-   -- Wide_String Transformation Subprograms --
-   --------------------------------------------
+   ---------------------------------------
+   -- String Transformation Subprograms --
+   ---------------------------------------
 
    function Super_Replace_Slice
-     (Source   : Super_String;
-      Low      : Positive;
-      High     : Natural;
-      By       : Wide_String;
-      Drop     : Truncation := Error)
-      return     Super_String;
+     (Source : Super_String;
+      Low    : Positive;
+      High   : Natural;
+      By     : Wide_String;
+      Drop   : Truncation := Error) return Super_String;
 
    procedure Super_Replace_Slice
-     (Source   : in out Super_String;
-      Low      : Positive;
-      High     : Natural;
-      By       : Wide_String;
-      Drop     : Truncation := Error);
+     (Source  : in out Super_String;
+      Low     : Positive;
+      High    : Natural;
+      By      : Wide_String;
+      Drop    : Truncation := Error);
 
    function Super_Insert
      (Source   : Super_String;
       Before   : Positive;
       New_Item : Wide_String;
-      Drop     : Truncation := Error)
-      return     Super_String;
+      Drop     : Truncation := Error) return Super_String;
 
    procedure Super_Insert
      (Source   : in out Super_String;
@@ -333,11 +356,10 @@ pragma Preelaborate (Wide_Superbounded);
       Drop     : Truncation := Error);
 
    function Super_Overwrite
-     (Source    : Super_String;
-      Position  : Positive;
-      New_Item  : Wide_String;
-      Drop      : Truncation := Error)
-      return      Super_String;
+     (Source   : Super_String;
+      Position : Positive;
+      New_Item : Wide_String;
+      Drop     : Truncation := Error) return Super_String;
 
    procedure Super_Overwrite
      (Source    : in out Super_String;
@@ -348,32 +370,29 @@ pragma Preelaborate (Wide_Superbounded);
    function Super_Delete
      (Source  : Super_String;
       From    : Positive;
-      Through : Natural)
-      return    Super_String;
+      Through : Natural) return Super_String;
 
    procedure Super_Delete
      (Source  : in out Super_String;
       From    : Positive;
       Through : Natural);
 
-   --------------------------------------
-   -- Wide_String Selector Subprograms --
-   --------------------------------------
+   ---------------------------------
+   -- String Selector Subprograms --
+   ---------------------------------
 
    function Super_Trim
      (Source : Super_String;
-      Side   : Trim_End)
-      return   Super_String;
+      Side   : Trim_End) return Super_String;
 
    procedure Super_Trim
      (Source : in out Super_String;
       Side   : Trim_End);
 
    function Super_Trim
-     (Source  : Super_String;
+     (Source : Super_String;
       Left   : Wide_Maps.Wide_Character_Set;
-      Right  : Wide_Maps.Wide_Character_Set)
-      return   Super_String;
+      Right  : Wide_Maps.Wide_Character_Set) return Super_String;
 
    procedure Super_Trim
      (Source : in out Super_String;
@@ -384,30 +403,28 @@ pragma Preelaborate (Wide_Superbounded);
      (Source : Super_String;
       Count  : Natural;
       Pad    : Wide_Character := Wide_Space;
-      Drop   : Truncation     := Error)
-      return   Super_String;
+      Drop   : Truncation := Error) return Super_String;
 
    procedure Super_Head
      (Source : in out Super_String;
       Count  : Natural;
       Pad    : Wide_Character := Wide_Space;
-      Drop   : Truncation     := Error);
+      Drop   : Truncation := Error);
 
    function Super_Tail
      (Source : Super_String;
       Count  : Natural;
       Pad    : Wide_Character := Wide_Space;
-      Drop   : Truncation     := Error)
-      return Super_String;
+      Drop   : Truncation := Error) return Super_String;
 
    procedure Super_Tail
      (Source : in out Super_String;
       Count  : Natural;
       Pad    : Wide_Character := Wide_Space;
-      Drop   : Truncation     := Error);
+      Drop   : Truncation := Error);
 
    ------------------------------------
-   -- Wide_String Constructor Subprograms --
+   -- String Constructor Subprograms --
    ------------------------------------
 
    --  Note: in some of the following routines, there is an extra parameter
@@ -417,46 +434,39 @@ pragma Preelaborate (Wide_Superbounded);
    function Times
      (Left       : Natural;
       Right      : Wide_Character;
-      Max_Length : Positive)
-      return       Super_String;
+      Max_Length : Positive) return Super_String;
    --  Note the additional parameter Max_Length
 
    function Times
      (Left       : Natural;
       Right      : Wide_String;
-      Max_Length : Positive)
-      return       Super_String;
+      Max_Length : Positive) return Super_String;
    --  Note the additional parameter Max_Length
 
    function Times
      (Left  : Natural;
-      Right : Super_String)
-      return  Super_String;
+      Right : Super_String) return Super_String;
 
    function Super_Replicate
      (Count      : Natural;
       Item       : Wide_Character;
       Drop       : Truncation := Error;
-      Max_Length : Positive)
-      return       Super_String;
+      Max_Length : Positive) return Super_String;
    --  Note the additional parameter Max_Length
 
    function Super_Replicate
      (Count      : Natural;
       Item       : Wide_String;
       Drop       : Truncation := Error;
-      Max_Length : Positive)
-      return       Super_String;
+      Max_Length : Positive) return Super_String;
    --  Note the additional parameter Max_Length
 
    function Super_Replicate
      (Count : Natural;
       Item  : Super_String;
-      Drop  : Truncation := Error)
-      return  Super_String;
+      Drop  : Truncation := Error) return Super_String;
 
 private
-
       --  Pragma Inline declarations
 
       pragma Inline ("=");