* The grand 2005-2006 replace.

[lilypond.git] / lily / include / source-file.hh

diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh
index 90ec4dd710d8d305fd96043077ee0e1a1d189f04..d3c5ab0aa5dfdcb2cfdd26d8d526e3fc556a71c3 100644 (file)
--- a/lily/include/source-file.hh
+++ b/lily/include/source-file.hh
@@ -3,13 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef SOURCE_FILE_HH
 #define SOURCE_FILE_HH
 
 #include <iostream>
+using namespace std;
 
 #include "string.hh"
 #include "protected-scm.hh"
@@ -32,8 +33,8 @@ public:
   virtual ~Source_file ();
 
   char const *to_str0 () const;
-  virtual String error_string (char const *pos_str0) const;
-  std::istream *get_istream ();
+  virtual String quote_input (char const *pos_str0) const;
+  istream *get_istream ();
   bool contains (char const *pos_str0) const;
   int length () const;
   virtual int get_line (char const *pos_str0) const;
@@ -52,8 +53,7 @@ public:
 public:
   Slice line_slice (char const *pos_str0) const;
   String line_string (char const *pos_str0) const;
-  int get_column (char const *pos_str0) const;
-  int get_char_of_line (char const *pos_str0) const;
+  void get_counts (char const *pos_str0, int *, int *, int *) const;
 
   /*
     JUNKME.
@@ -62,12 +62,12 @@ public:
   */
   char const *pos_str0_;
 
-  SCM get_port () const { return str_port_; }
+  SCM get_port () const;
   String name_;
 
 private:
   Link_array<char> newline_locations_;
-  std::istream *istream_;
+  istream *istream_;
   char *contents_str0_;
   int length_;
   void load_stdin ();