aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Celier <celier@adacore.com>2008-03-26 08:36:23 +0100
committerArnaud Charlet <charlet@gcc.gnu.org>2008-03-26 08:36:23 +0100
commitcfd712162fc617ed0f7da30991e539b9b9cea9ff (patch)
tree3173470e6e27e281b642f203e4f297feb2f09086
parent1b24ada5aba090c1b641353f94cba86730c99105 (diff)
downloadgcc-cfd712162fc617ed0f7da30991e539b9b9cea9ff.zip
gcc-cfd712162fc617ed0f7da30991e539b9b9cea9ff.tar.gz
gcc-cfd712162fc617ed0f7da30991e539b9b9cea9ff.tar.bz2
a-szuzti.adb, [...] (functions Get_Line): Improve memory usage to avoid use of stack.
2008-03-26 Vincent Celier <celier@adacore.com> * a-szuzti.adb, a-swuwti.adb, a-suteio.adb (functions Get_Line): Improve memory usage to avoid use of stack. From-SVN: r133550
-rw-r--r--gcc/ada/a-suteio.adb10
-rw-r--r--gcc/ada/a-swuwti.adb10
-rw-r--r--gcc/ada/a-szuzti.adb10
3 files changed, 21 insertions, 9 deletions
diff --git a/gcc/ada/a-suteio.adb b/gcc/ada/a-suteio.adb
index 98034e2..ef01398 100644
--- a/gcc/ada/a-suteio.adb
+++ b/gcc/ada/a-suteio.adb
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 1997-2005, Free Software Foundation, Inc. --
+-- Copyright (C) 1997-2007, 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- --
@@ -51,7 +51,9 @@ package body Ada.Strings.Unbounded.Text_IO is
Str1 := new String'(Buffer (1 .. Last));
while Last = Buffer'Last loop
Get_Line (Buffer, Last);
- Str2 := new String'(Str1.all & Buffer (1 .. Last));
+ Str2 := new String (1 .. Str1'Last + Last);
+ Str2 (Str1'Range) := Str1.all;
+ Str2 (Str1'Last + 1 .. Str2'Last) := Buffer (1 .. Last);
Free (Str1);
Str1 := Str2;
end loop;
@@ -73,7 +75,9 @@ package body Ada.Strings.Unbounded.Text_IO is
Str1 := new String'(Buffer (1 .. Last));
while Last = Buffer'Last loop
Get_Line (File, Buffer, Last);
- Str2 := new String'(Str1.all & Buffer (1 .. Last));
+ Str2 := new String (1 .. Str1'Last + Last);
+ Str2 (Str1'Range) := Str1.all;
+ Str2 (Str1'Last + 1 .. Str2'Last) := Buffer (1 .. Last);
Free (Str1);
Str1 := Str2;
end loop;
diff --git a/gcc/ada/a-swuwti.adb b/gcc/ada/a-swuwti.adb
index 1e6bb2e..bd06eb1 100644
--- a/gcc/ada/a-swuwti.adb
+++ b/gcc/ada/a-swuwti.adb
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 1997-2005, Free Software Foundation, Inc. --
+-- Copyright (C) 1997-2007, 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- --
@@ -51,7 +51,9 @@ package body Ada.Strings.Wide_Unbounded.Wide_Text_IO is
Str1 := new Wide_String'(Buffer (1 .. Last));
while Last = Buffer'Last loop
Get_Line (Buffer, Last);
- Str2 := new Wide_String'(Str1.all & Buffer (1 .. Last));
+ Str2 := new Wide_String (1 .. Str1'Last + Last);
+ Str2 (Str1'Range) := Str1.all;
+ Str2 (Str1'Last + 1 .. Str2'Last) := Buffer (1 .. Last);
Free (Str1);
Str1 := Str2;
end loop;
@@ -75,7 +77,9 @@ package body Ada.Strings.Wide_Unbounded.Wide_Text_IO is
Str1 := new Wide_String'(Buffer (1 .. Last));
while Last = Buffer'Last loop
Get_Line (File, Buffer, Last);
- Str2 := new Wide_String'(Str1.all & Buffer (1 .. Last));
+ Str2 := new Wide_String (1 .. Str1'Last + Last);
+ Str2 (Str1'Range) := Str1.all;
+ Str2 (Str1'Last + 1 .. Str2'Last) := Buffer (1 .. Last);
Free (Str1);
Str1 := Str2;
end loop;
diff --git a/gcc/ada/a-szuzti.adb b/gcc/ada/a-szuzti.adb
index 850ae78..7a8a313 100644
--- a/gcc/ada/a-szuzti.adb
+++ b/gcc/ada/a-szuzti.adb
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 1997-2005, Free Software Foundation, Inc. --
+-- Copyright (C) 1997-2007, 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- --
@@ -51,7 +51,9 @@ package body Ada.Strings.Wide_Wide_Unbounded.Wide_Wide_Text_IO is
Str1 := new Wide_Wide_String'(Buffer (1 .. Last));
while Last = Buffer'Last loop
Get_Line (Buffer, Last);
- Str2 := new Wide_Wide_String'(Str1.all & Buffer (1 .. Last));
+ Str2 := new Wide_Wide_String (1 .. Str1'Last + Last);
+ Str2 (Str1'Range) := Str1.all;
+ Str2 (Str1'Last + 1 .. Str2'Last) := Buffer (1 .. Last);
Free (Str1);
Str1 := Str2;
end loop;
@@ -76,7 +78,9 @@ package body Ada.Strings.Wide_Wide_Unbounded.Wide_Wide_Text_IO is
while Last = Buffer'Last loop
Get_Line (File, Buffer, Last);
- Str2 := new Wide_Wide_String'(Str1.all & Buffer (1 .. Last));
+ Str2 := new Wide_Wide_String (1 .. Str1'Last + Last);
+ Str2 (Str1'Range) := Str1.all;
+ Str2 (Str1'Last + 1 .. Str2'Last) := Buffer (1 .. Last);
Free (Str1);
Str1 := Str2;
end loop;