X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsource-file.hh;h=2fd1bfc073b9959cb056cd6af6a6dfe08a31e131;hb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;hp=faf8e5c66ba2479837b31994804b8e9d28879373;hpb=bdf4ab13203502e7ec7cf9cf5896527643a07c1f;p=lilypond.git

diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh
index faf8e5c66b..2fd1bfc073 100644
--- a/lily/include/source-file.hh
+++ b/lily/include/source-file.hh
@@ -3,17 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef SOURCE_FILE_HH
 #define SOURCE_FILE_HH
 
-#include <iostream>
+#include "std-vector.hh"
+#include "lily-proto.hh"
+#include "smobs.hh"
 
-#include "string.hh"
-#include "protected-scm.hh"
-#include "parray.hh"
+#include <iostream>
+using namespace std;
 
 /**
    class for reading and mapping a file.
@@ -25,58 +26,43 @@
 
 class Source_file
 {
-public:
-  Source_file (String fn);
-  Source_file (String, String);
+  vector<char const*> newline_locations_;
+  istream *istream_;
+  vector<char> characters_;
+  SCM str_port_;
 
-  virtual ~Source_file ();
+  void load_stdin ();
+  void init_port ();
+  void init ();
+  
+  DECLARE_SMOBS (Source_file);
+public:
+  Source_file (string fn);
+  Source_file (string, string);
 
-  char const *to_str0 () const;
-  virtual String error_string (char const *pos_str0) const;
-  std::istream *get_istream ();
+  char const *c_str () const;
+  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;
-  String name_string () const;
-  String file_line_column_string (char const *str0) const;
-
-  // return start + n
-  char const *seek_str0 (int n);
+  void set_line (char const *pos_str0, int i);
+  string name_string () const;
+  string file_line_column_string (char const *str0) const;
 
-  int tell () const;
-  // return here + n bytes
-  char const *forward_str0 (int n);
-  char const *pos_str0 () { return pos_str0_; }
-  String get_string (int n);
-  void set_pos (char const *pos_str0);
 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 (char const *pos_str0) const;
-
-  /*
-    JUNKME.
-
-    This thing doubles as a file-storage/file-iterator object.
-  */
-  char const *pos_str0_;
-
-  SCM get_port () const { return str_port_; }
-  String name_;
-
-private:
-  Link_array<char> newline_locations_;
-  std::istream *istream_;
-  char *contents_str0_;
-  int length_;
-  void load_stdin ();
-  void init_port ();
-
-  Protected_scm str_port_;
+  string line_string (char const *pos_str0) const;
+  void get_counts (char const *pos_str0, int *, int *, int *) const;
+  
+  SCM get_port () const;
+  string name_;
+
+protected:
+  int line_offset_;
 };
 
-char *gulp_file (String fn, int *len);
+vector<char> gulp_file (string fn, int desired);
 
 #endif /* SOURCE_FILE_HH */