diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-04-08 06:47:40 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-04-08 06:47:40 +0000 |
| commit | f970b6bf3b38e38b8b3218ad6a22879e12e46b42 (patch) | |
| tree | 77d7d9886a963ac78f8b41a3084495723a3098f2 | |
| parent | aec1fb1161557691f1196f8933974ad19652fd60 (diff) | |
| download | gcc-f970b6bf3b38e38b8b3218ad6a22879e12e46b42.tar.gz | |
2008-04-08 Robert Dewar <dewar@adacore.com>
* a-strbou.ads, a-strbou.adb (From_String): New procedure (for use by
Stream_Convert)
* sem_ch13.ads (Rep_Item_Too_Late): Document that Stream_Convert sets
FOnly
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@134019 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ada/a-strbou.adb | 11 | ||||
| -rw-r--r-- | gcc/ada/a-strbou.ads | 8 | ||||
| -rw-r--r-- | gcc/ada/sem_ch13.ads | 5 |
3 files changed, 20 insertions, 4 deletions
diff --git a/gcc/ada/a-strbou.adb b/gcc/ada/a-strbou.adb index 015123a8faf..d7ddc5878e7 100644 --- a/gcc/ada/a-strbou.adb +++ b/gcc/ada/a-strbou.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2005, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2008, 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- -- @@ -60,6 +60,15 @@ package body Ada.Strings.Bounded is return Times (Left, Right, Max_Length); end "*"; + ----------------- + -- From_String -- + ----------------- + + function From_String (Source : String) return Bounded_String is + begin + return To_Super_String (Source, Max_Length, Error); + end From_String; + --------------- -- Replicate -- --------------- diff --git a/gcc/ada/a-strbou.ads b/gcc/ada/a-strbou.ads index 13f51a4e81e..9961b638b76 100644 --- a/gcc/ada/a-strbou.ads +++ b/gcc/ada/a-strbou.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2006, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2008, Free Software Foundation, Inc. -- -- -- -- This specification is derived from the Ada Reference Manual for use with -- -- GNAT. The copyright notice above, and the license provisions that follow -- @@ -469,6 +469,12 @@ package Ada.Strings.Bounded is -- the generic instantiation is compatible with the Super_String -- type declared in the Superbounded package. + function From_String (Source : String) return Bounded_String; + -- Private routine used only by Stream_Convert + + pragma Stream_Convert (Bounded_String, From_String, To_String); + -- Provide stream routines without dragging in Ada.Streams + Null_Bounded_String : constant Bounded_String := (Max_Length => Max_Length, Current_Length => 0, diff --git a/gcc/ada/sem_ch13.ads b/gcc/ada/sem_ch13.ads index 3c5681c7bf2..204a0832549 100644 --- a/gcc/ada/sem_ch13.ads +++ b/gcc/ada/sem_ch13.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2007, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2008, 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- -- @@ -121,7 +121,8 @@ package Sem_Ch13 is -- stream attributes, which, although certainly not subtype related -- attributes, clearly should not be subject to the para 10 restrictions -- (see AI95-00137). Similarly, we also skip the para 10 restrictions for - -- the Storage_Size case where they also clearly do not apply. + -- the Storage_Size case where they also clearly do not apply, and for + -- Stream_Convert which is in the same category as the strem attributes. -- -- If the rep item is too late, an appropriate message is output and -- True is returned, which is a signal that the caller should abandon |