* The grand 2005-2006 replace.

[lilypond.git] / flower / warn.cc

diff --git a/flower/warn.cc b/flower/warn.cc
index 270b4c2525ad190f6d3ce7578adc668c25beab7f..24117d7ec4d9632270aa16b576066482cd16c8c8 100644 (file)
--- a/flower/warn.cc
+++ b/flower/warn.cc
@@ -3,34 +3,55 @@
 
   source file of the Flower Library
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include <stdlib.h>
-#include <stdio.h>
-
 #include "warn.hh"
 
+#include <cstdlib>
+#include <cstdio>
+using namespace std;
+
+/* Is progress indication at NEWLINE?  */
+static bool progress_newline = true;
 
+/* Display user information that is not a full message.  */
 void
-message (String s)
+progress_indication (String s)
 {
+  /* Test if all silly progress_indication ("\n") can be dropped now.  */
+  if (s == "\n")
+    return;
+
   fputs (s.to_str0 (), stderr);
   fflush (stderr);
+  if (s.length ())
+    progress_newline = s[s.length () - 1] == '\n';
+}
+
+/* Display a single user message.  Always starts on a new line.  */
+void
+message (String s)
+{
+  if (!progress_newline)
+    fputc ('\n', stderr);
+  progress_indication (s);
 }
 
+/* Display a warning message.  Always starts on a new line.  */
 void
 warning (String s)
 {
-  message (_f ("warning: %s\n", s.to_str0 ()));
+  message (_f ("warning: %s", s.to_str0 ()) + "\n");
 }
 
 void
 non_fatal_error (String s)
 {
-  message (_f ("error: %s\n", s.to_str0 ()));
+  message (_f ("error: %s", s.to_str0 ()) + "\n");
 }
 
+/* Display an error message.  Always starts on a new line.  */
 void
 error (String s)
 {
@@ -41,7 +62,7 @@ error (String s)
 void
 programming_error (String s)
 {
-  message (_f ("programming error: %s (Continuing; cross thumbs)\n",
-              s.to_str0 ()));
+  message (_f ("programming error: %s", s) + "\n");
+  message (_ ("continuing, cross fingers") + "\n");
 }