OSDN Git Service
(root)
/
pf3gnuchains
/
gcc-fork.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2007-04-20 Ed Schonberg <schonberg@adacore.com>
[pf3gnuchains/gcc-fork.git]
/
gcc
/
ada
/
s-io.adb
diff --git
a/gcc/ada/s-io.adb
b/gcc/ada/s-io.adb
index
2baf255
..
4a6a0af
100644
(file)
--- a/
gcc/ada/s-io.adb
+++ b/
gcc/ada/s-io.adb
@@
-6,7
+6,7
@@
-- --
-- B o d y --
-- --
-- --
-- B o d y --
-- --
--- Copyright (C) 1992-200
5 Free Software Foundation, Inc.
--
+-- Copyright (C) 1992-200
6, 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- --
-- --
-- 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- --
@@
-16,8
+16,8
@@
-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --
-- for more details. You should have received a copy of the GNU General --
-- Public License distributed with GNAT; see file COPYING. If not, write --
-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --
-- for more details. You should have received a copy of the GNU General --
-- Public License distributed with GNAT; see file COPYING. If not, write --
--- to the
Free Software Foundation, 59 Temple Place - Suite 330, Boston
, --
---
MA 02111-1307, USA.
--
+-- to the
Free Software Foundation, 51 Franklin Street, Fifth Floor
, --
+--
Boston, MA 02110-1301, USA.
--
-- --
-- As a special exception, if other files instantiate generics from this --
-- unit, or you link this unit with other files to produce an executable, --
-- --
-- As a special exception, if other files instantiate generics from this --
-- unit, or you link this unit with other files to produce an executable, --
@@
-33,6
+33,10
@@
package body System.IO is
package body System.IO is
+ Current_Out : File_Type := Stdout;
+ pragma Atomic (Current_Out);
+ -- Current output file (modified by Set_Output)
+
--------------
-- New_Line --
--------------
--------------
-- New_Line --
--------------
@@
-49,21
+53,35
@@
package body System.IO is
---------
procedure Put (X : Integer) is
---------
procedure Put (X : Integer) is
-
procedure Put_Int (X : Integer);
pragma Import (C, Put_Int, "put_int");
procedure Put_Int (X : Integer);
pragma Import (C, Put_Int, "put_int");
+ procedure Put_Int_Err (X : Integer);
+ pragma Import (C, Put_Int_Err, "put_int_stderr");
+
begin
begin
- Put_Int (X);
+ case Current_Out is
+ when Stdout =>
+ Put_Int (X);
+ when Stderr =>
+ Put_Int_Err (X);
+ end case;
end Put;
procedure Put (C : Character) is
end Put;
procedure Put (C : Character) is
-
procedure Put_Char (C : Character);
pragma Import (C, Put_Char, "put_char");
procedure Put_Char (C : Character);
pragma Import (C, Put_Char, "put_char");
+ procedure Put_Char_Stderr (C : Character);
+ pragma Import (C, Put_Char_Stderr, "put_char_stderr");
+
begin
begin
- Put_Char (C);
+ case Current_Out is
+ when Stdout =>
+ Put_Char (C);
+ when Stderr =>
+ Put_Char_Stderr (C);
+ end case;
end Put;
procedure Put (S : String) is
end Put;
procedure Put (S : String) is
@@
-83,4
+101,31
@@
package body System.IO is
New_Line;
end Put_Line;
New_Line;
end Put_Line;
+ ---------------------
+ -- Standard_Output --
+ ---------------------
+
+ function Standard_Output return File_Type is
+ begin
+ return Stdout;
+ end Standard_Output;
+
+ --------------------
+ -- Standard_Error --
+ --------------------
+
+ function Standard_Error return File_Type is
+ begin
+ return Stderr;
+ end Standard_Error;
+
+ ----------------
+ -- Set_Output --
+ ----------------
+
+ procedure Set_Output (File : File_Type) is
+ begin
+ Current_Out := File;
+ end Set_Output;
+
end System.IO;
end System.IO;