X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsource-file.hh;h=05fd73359fe4db7b47145602f97249f874fecf58;hb=8d796a54fbfc350c56f04088cb0c009ee0287256;hp=dd88a2c65ae2255263dcf8c467bc7ec58120fed3;hpb=8347f6f06cd4c56d7a2d2ec482647afaaade1267;p=lilypond.git

diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh
index dd88a2c65a..05fd73359f 100644
--- a/lily/include/source-file.hh
+++ b/lily/include/source-file.hh
@@ -12,7 +12,7 @@
 #include "flower-proto.hh"
 #include "std-vector.hh"
 #include "lily-proto.hh"
-#include "protected-scm.hh"
+#include "smobs.hh"
 
 #include <iostream>
 using namespace std;
@@ -27,58 +27,44 @@ using namespace std;
 
 class Source_file
 {
+  vector<char*> newline_locations_;
+  istream *istream_;
+  vector<char> characters_;
+  SCM str_port_;
+
+  char const *contents_str0 () const;
+  void load_stdin ();
+  void init_port ();
+  void init ();
+  
+  DECLARE_SMOBS(Source_file, bla);
 public:
   Source_file (string fn);
   Source_file (string, string);
 
-  virtual ~Source_file ();
-
   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;
+  void set_line (char const *pos_str0, int i);
   string name_string () const;
   string file_line_column_string (char const *str0) const;
 
-  // return start + n
-  char const *seek_str0 (int n);
-
-  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;
   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;
   string name_;
 
-private:
-  vector<char*> newline_locations_;
-  istream *istream_;
-  char *contents_str0_;
-  vector<char> chs_;
-  int length_;
-  void load_stdin ();
-  void init_port ();
-
-  Protected_scm str_port_;
+protected:
+  int line_offset_;
 };
 
-char *gulp_file (string fn, int *len);
+vector<char> gulp_file (string fn, int desired);
 
 #endif /* SOURCE_FILE_HH */