Run `make grand-replace'.

[lilypond.git] / lily / input.cc

diff --git a/lily/input.cc b/lily/input.cc
index 1ff4e8624431809cb2092c3b175a54af61ac75b7..b6378af67f1d1761bfea7a44a29cb1a15da24b5c 100644 (file)
--- a/lily/input.cc
+++ b/lily/input.cc
@@ -3,83 +3,193 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
-#include "proto.hh"
+
 #include "input.hh"
-#include "string.hh"
-#include "source.hh"
+
+#include <cstdio>
+using namespace std;
+
+#include "international.hh"
 #include "source-file.hh"
+#include "sources.hh"
+#include "warn.hh"
+
+Input::Input (Input const &i)
+{
+  source_file_ = i.source_file_;
+  start_ = i.start_;
+  end_ = i.end_;
+}
+
+Input::Input ()
+{
+  source_file_ = 0;
+  start_ = 0;
+  end_ = 0;
+}
+
+Input
+Input::spot () const
+{
+  return *this;
+}
+
+void
+Input::set_spot (Input const &i)
+{
+  *this = i;
+}
 
-Input::Input(Sources*s, char const *cl)
+void
+Input::step_forward ()
+{
+  if (end_ == start_)
+    end_++;
+  start_++;
+}
+
+void
+Input::set_location (Input const &i_start, Input const &i_end)
+{
+  source_file_ = i_start.source_file_;
+  start_ = i_start.start_;
+  end_ = i_end.end_;
+}
+
+/*
+  Produce GNU-compliant error message.  Correcting lilypond source is
+  such a breeze if you ('re edidor) know (s) the error column too
+
+  Format:
+
+  [file:line:column:][warning:]message
+*/
+void
+Input::message (string s) const
 {
-    sources_l_=s;
-    defined_ch_C_=cl;
+  if (source_file_)
+    s = location_string () + ": " + s + "\n"
+      + source_file_->quote_input (start_) + "\n";
+  ::message (s);
 }
 
-Input::Input()
+
+void
+Input::programming_error (string s) const
 {
-    sources_l_ = 0;
-    defined_ch_C_ = 0;
+  message (_f ("programming error: %s", s.c_str ()));
+  message (_ ("continuing, cross fingers") + "\n");
 }
 
-Input::Input(Input const &s)
+
+void
+Input::warning (string s) const
 {
-    sources_l_ = s.sources_l_;
-    defined_ch_C_ = s.defined_ch_C_;
+  message (_f ("warning: %s", s));
 }
 
 void
-Input::set_spot(Input const &i)
+Input::error (string s) const
 {
-    *this  = i;
+  message (_f ("error: %s", s));
+  // UGH, fix naming or usage
+  // exit (1);
 }
 
 void
-Input::message(String message_str)const
-{
-    String str = "";
-    Source_file* sourcefile_l=0;
-    
-    if (sources_l_) 
-       sourcefile_l = sources_l_->sourcefile_l( defined_ch_C_ );
-    
-    if ( sourcefile_l ) {
-       str += sourcefile_l->file_line_no_str(defined_ch_C_) + String(": ");
-    }
-    
-    str += message_str;
-    if ( sourcefile_l ) {
-       str += ":\n";
-       str += sourcefile_l->error_str( defined_ch_C_);
-    }
-    /*
-    if ( busy_parsing() )
-       cerr << endl;
-       */
-    cerr << str << endl;
+Input::non_fatal_error (string s) const
+{
+  message (_f ("error: %s", s));
+}
+
+string
+Input::location_string () const
+{
+  if (source_file_)
+    return source_file_->file_line_column_string (start_);
+  return " (" + _ ("position unknown") + ")";
+}
+
+string
+Input::line_number_string () const
+{
+  if (source_file_)
+    return to_string (source_file_->get_line (start_));
+  return "?";
+}
+
+string
+Input::file_string () const
+{
+  if (source_file_)
+    return source_file_->name_string ();
+  return "";
+}
+
+int
+Input::line_number () const
+{
+  if (source_file_)
+    return source_file_->get_line (start_);
+  return 0;
+}
+
+int
+Input::column_number () const
+{
+  int line, chr, col = 0;
+  source_file_->get_counts (start_, &line, &chr, &col);
+
+  return col;
+}
+
+int
+Input::end_line_number () const
+{
+  if (source_file_)
+    return source_file_->get_line (end_);
+  return 0;
+}
+
+int
+Input::end_column_number () const
+{
+  int line, chr, col = 0;
+  source_file_->get_counts (end_, &line, &chr, &col);
+
+  return col;
 }
 
 void
-Input::warning( String message_str)const
+Input::get_counts (int *line, int *chr, int *col) const
 {
-    message( "warning: " + message_str);
+  source_file_->get_counts (start_, line, chr, col);
 }
+
 void
-Input::error(String s)const
+Input::set (Source_file *sf, char const *start, char const *end)
+{
+  source_file_ = sf;
+  start_ = start;
+  end_ = end;
+}
+
+Source_file *
+Input::get_source_file () const
+{
+  return source_file_;
+}
+
+char const *
+Input::start () const
 {
-    message("error: "+ s);
-    exit (1);
+  return start_;
 }
 
-String
-Input::location_str()const
+char const *
+Input::end () const
 {
-    Source_file * sourcefile_l=0;
-    if (sources_l_)
-       sourcefile_l = sources_l_->sourcefile_l (defined_ch_C_);
-    if (sourcefile_l) 
-       return sourcefile_l->file_line_no_str(defined_ch_C_);
-    else
-       return "(location unknown)";
+  return end_;
 }