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

diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh
index 33b4051c4c..88120da55c 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,12 +27,20 @@ using namespace std;
 
 class Source_file
 {
+  vector<char const*> newline_locations_;
+  istream *istream_;
+  vector<char> characters_;
+  SCM str_port_;
+
+  void load_stdin ();
+  void init_port ();
+  void init ();
+  
+  DECLARE_SMOBS (Source_file);
 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 ();
@@ -43,46 +51,19 @@ public:
   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_;
 
 protected:
   int line_offset_;
-
-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_;
 };
 
-char *gulp_file (string fn, int *len);
+vector<char> gulp_file (string fn, int desired);
 
 #endif /* SOURCE_FILE_HH */