lilypond-0.0.49

diff --git a/lily/include/debug.hh b/lily/include/debug.hh
new file mode 100644 (file)
index 0000000..00f0a38
--- /dev/null
+++ b/lily/include/debug.hh
@@ -0,0 +1,36 @@
+/*
+  Argh! this sux! implementation not liblily
+ */
+
+#ifndef DEBUG_HH
+#define DEBUG_HH
+
+#include <assert.h>
+#include <iostream.h>
+#include "dstream.hh"
+#include "real.hh"
+#include "proto.hh"
+#include "warn.hh"
+
+void error_t(const String& s, Time_description const &  t_tdes);
+void error_t(String const &s, const Moment &when);
+
+#define WARN warnout << "warning: "<<__FUNCTION__ << "(): "
+extern ostream &warnout ;
+
+// progress
+extern ostream *mlog;
+
+// debugging
+extern Dstream *monitor; // monitor
+
+
+#ifdef NPRINT
+#define mtor if (0) *monitor   // clever hack 
+#else
+#define mtor if (check_debug) monitor->identify_as(__PRETTY_FUNCTION__)
+#endif
+
+extern bool check_debug;
+
+#endif

diff --git a/lily/warn.cc b/lily/warn.cc
index 08c8b526960dbc03f1be58e4a0ad1b39ee4afa06..3e6b98f9f12d917d2dec6a1de41fe52be160a743 100644 (file)
--- a/lily/warn.cc
+++ b/lily/warn.cc
@@ -21,13 +21,6 @@ ostream &warnout (cerr);
 ostream *mlog(&cerr);
 
 
-void
-error(String s)
-{
-    cerr <<  "error: " << s << "\n";
-       
-    exit(1);
-}
 
 void
 error_t(String const & s, Moment const & r)
@@ -43,16 +36,3 @@ error_t(String const & s, Time_description const &t_tdes)
     String e=s+ " (at t=" + String(t_tdes.bars_i_) + ": " + String(t_tdes.whole_in_measure_) + ")\n";
     error(e);
 }
-
-void
-warning(String m)
-{
-    cerr << "warning" <<m <<endl;
-
-}
-
-void
-message(String m)
-{
-    cerr << m<<endl;
-}

diff --git a/mi2mu/include/mi2mu.hh b/mi2mu/include/mi2mu.hh
index a6a7c591024bd09112e9a0ef44a795748c840674..9d9bf8ecc092dcde2eb53eff2754534a0fb5736a 100644 (file)
--- a/mi2mu/include/mi2mu.hh
+++ b/mi2mu/include/mi2mu.hh
@@ -21,7 +21,7 @@
 
 #include "proto.hh"
 #include "plist.hh"
-#include "debug.hh"
+#include "warn.hh"
 #ifdef mtor
 #undef mtor
 #endif