From 7969ec4835be2e8745b648bf47cd97c30ae71ade Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Mon, 22 Feb 2016 20:31:21 +0100
Subject: grt: fix incorrect use of stdout for some errors.

---
 src/grt/grt-disp_signals.adb | 20 +++++++++++---------
 src/grt/grt-signals.adb      |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/grt/grt-disp_signals.adb b/src/grt/grt-disp_signals.adb
index a9b613c60..e635733d9 100644
--- a/src/grt/grt-disp_signals.adb
+++ b/src/grt/grt-disp_signals.adb
@@ -247,26 +247,28 @@ package body Grt.Disp_Signals is
 
    procedure Disp_Signal_Name (Stream : FILEs;
                                Ctxt : Rti_Context;
-                               Sig : Ghdl_Rtin_Object_Acc) is
+                               Sig : Ghdl_Rtin_Object_Acc)
+   is
+      procedure Disp_Prefix (Stream : FILEs; Ctxt : Rti_Context) is
+      begin
+         Put (Stream, Ctxt);
+         Put (Stream, ".");
+      end Disp_Prefix;
    begin
       case Sig.Common.Kind is
          when Ghdl_Rtik_Signal
            | Ghdl_Rtik_Port
            | Ghdl_Rtik_Guard =>
-            Put (stdout, Ctxt);
-            Put (".");
+            Disp_Prefix (Stream, Ctxt);
             Put (Stream, Sig.Name);
          when Ghdl_Rtik_Attribute_Quiet =>
-            Put (stdout, Ctxt);
-            Put (".");
+            Disp_Prefix (Stream, Ctxt);
             Put (Stream, " 'quiet");
          when Ghdl_Rtik_Attribute_Stable =>
-            Put (stdout, Ctxt);
-            Put (".");
+            Disp_Prefix (Stream, Ctxt);
             Put (Stream, " 'stable");
          when Ghdl_Rtik_Attribute_Transaction =>
-            Put (stdout, Ctxt);
-            Put (".");
+            Disp_Prefix (Stream, Ctxt);
             Put (Stream, " 'transaction");
          when others =>
             null;
diff --git a/src/grt/grt-signals.adb b/src/grt/grt-signals.adb
index d78027487..2d4eae3b0 100644
--- a/src/grt/grt-signals.adb
+++ b/src/grt/grt-signals.adb
@@ -335,7 +335,7 @@ package body Grt.Signals is
             --  LRM 4.3.1.2 Signal Declaration
             --  It is an error if, after the elaboration of a description, a
             --  signal has multiple sources and it is not a resolved signal.
-            Put ("for signal: ");
+            Put (stderr, "for signal: ");
             Disp_Signals.Put_Signal_Name (stderr, Sig);
             New_Line (stderr);
             Error ("several sources for unresolved signal");
-- 
cgit v1.2.3