+/*
+ warn.cc -- implement warning and error messages. Needs cleanup.
+
+ source file of the GNU LilyPond music typesetter
+
+ (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
#include "proto.hh"
-#include "plist.hh"
#include "debug.hh"
#include "my-lily-lexer.hh"
#include "moment.hh"
-#include "time-description.hh"
+#include "timing-translator.hh"
#include "source-file.hh"
#include "source.hh"
#include "main.hh"
+#include "input.hh"
ostream &warnout (cerr);
-ostream *mlog(&cerr);
-/*
-void
-warning(String s)
-{
- WARN << s;
-}
-*/
void
-error(String s)
+progress_indication (String s)
{
- cerr << "error: " << s << "\n";
-
- exit(1);
+ cerr << s << flush;
}
-void
-error_t(String const & s, Moment const & r)
-{
- String t_mom = String(trunc(r)) + String(r - Moment(trunc(r)));
- String e=s+ " (t = " + t_mom + ")";
- error(e);
-}
-
-void
-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
-message( String message_str, char const* context_ch_C )
-{
- String str = ""; //"lilypond: ";// GNU format messages!
- Source_file* sourcefile_l = source_l_g->sourcefile_l( context_ch_C );
- if ( sourcefile_l ) {
- str += sourcefile_l->file_line_no_str(context_ch_C) + String(": ");
- }
- str += message_str;
- if ( sourcefile_l ) {
- str += ":\n";
- str += sourcefile_l->error_str( context_ch_C );
- }
- if ( busy_parsing() )
- cerr << endl;
- cerr << str << endl;
-}
-
-void
-warning( String message_str, char const* context_ch_C )
-{
- message( "warning: " + message_str, context_ch_C );
-}
-
-void
-error( String message_str, char const* context_ch_C )
-{
- message( message_str, context_ch_C );
- // since when exits error again?
- // i-d say: error: errorlevel |= 1; -> no output upon error
- // warning: recovery -> output (possibly wrong)
-/* if ( lexer )
- lexer->errorlevel_i_ |= 1;*/
-// exit( 1 );
-}