release: 1.1.62

[lilypond.git] / lib / input.cc

diff --git a/lib/input.cc b/lib/input.cc
index 46ddcb2ca60f8073ac7decafe65cf46fd8caf564..d159319a45002b98a1ef165bf577d35bc1e8625b 100644 (file)
--- a/lib/input.cc
+++ b/lib/input.cc
@@ -3,7 +3,7 @@
 
  source file of the LilyPond music typesetter
 
- (c) 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+ (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "proto.hh"
 #include "input.hh"
@@ -23,10 +23,10 @@ Input::Input ()
   defined_ch_C_ = 0;
 }
 
-Input::Input (Input const &s)
+Input
+Input::spot () const
 {
-  source_file_l_ = s.source_file_l_;
-  defined_ch_C_ = s.defined_ch_C_;
+  return *this;
 }
 
 void
@@ -94,7 +94,7 @@ Input::error (String s) const
 void
 Input::non_fatal_error (String s) const
 {
-  message (_ ("Non fatal error: ")+ s);
+  message (_ ("Non fatal error: ") + s);
 }
 String
 Input::location_str () const
@@ -102,5 +102,6 @@ Input::location_str () const
   if (source_file_l_)
     return source_file_l_->file_line_column_str (defined_ch_C_);
   else
-    return _("(location unknown)");
+    return "(" + _ ("position unknown") + ")";
 }
+