X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsource-file.hh;h=88120da55c1d2d94269dfb6439ab20273f2ef20d;hb=a9c0c06eca7cf482bd550be17e4a4dbdfc7cc22a;hp=098ae759252a57720edc0d569fca9e19bece2f43;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git

diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh
index 098ae75925..88120da55c 100644
--- a/lily/include/source-file.hh
+++ b/lily/include/source-file.hh
@@ -9,14 +9,14 @@
 #ifndef SOURCE_FILE_HH
 #define SOURCE_FILE_HH
 
-#include "std-string.hh"
+#include "flower-proto.hh"
+#include "std-vector.hh"
+#include "lily-proto.hh"
+#include "smobs.hh"
 
 #include <iostream>
 using namespace std;
 
-#include "protected-scm.hh"
-#include "parray.hh"
-
 /**
    class for reading and mapping a file.
 
@@ -27,57 +27,43 @@ using namespace std;
 
 class Source_file
 {
-public:
-  Source_file (std::string fn);
-  Source_file (std::string, std::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 *c_str () const;
-  virtual std::string quote_input (char const *pos_str0) 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;
-  std::string name_string () const;
-  std::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_; }
-  std::string get_string (int n);
-  void set_pos (char const *pos_str0);
 public:
   Slice line_slice (char const *pos_str0) const;
-  std::string line_string (char const *pos_str0) const;
+  string line_string (char const *pos_str0) const;
   void get_counts (char const *pos_str0, int *, int *, int *) const;
-
-  /*
-    JUNKME.
-
-    This thing doubles as a file-storage/file-iterator object.
-  */
-  char const *pos_str0_;
-
+  
   SCM get_port () const;
-  std::string name_;
-
-private:
-  Link_array<char> newline_locations_;
-  istream *istream_;
-  char *contents_str0_;
-  int length_;
-  void load_stdin ();
-  void init_port ();
+  string name_;
 
-  Protected_scm str_port_;
+protected:
+  int line_offset_;
 };
 
-char *gulp_file (std::string fn, int *len);
+vector<char> gulp_file (string fn, int desired);
 
 #endif /* SOURCE_FILE_HH */