X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsource-file.hh;h=62426aa9993e93dd2349227805d22f59337fec63;hb=7f5363be4d24bb512d9c25dcd8c975ed87e4c923;hp=7668c41efee86d22cadc6b1a7d17484cec97a003;hpb=4ecdbd7d70ca7441be4dddd15ac01cc255bc2a35;p=lilypond.git

diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh
index 7668c41efe..62426aa999 100644
--- a/lily/include/source-file.hh
+++ b/lily/include/source-file.hh
@@ -1,21 +1,32 @@
 /*
-  source-file.hh -- declare Source_file
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2010 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1999--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef SOURCE_FILE_HH
 #define SOURCE_FILE_HH
 
+#include "std-vector.hh"
+#include "lily-proto.hh"
+#include "smobs.hh"
+
 #include <iostream>
 using namespace std;
 
-#include "string.hh"
-#include "protected-scm.hh"
-#include "parray.hh"
-
 /**
    class for reading and mapping a file.
 
@@ -26,57 +37,43 @@ using namespace std;
 
 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 quote_input (char const *pos_str0) const;
+  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);
-
-  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);
+  void set_line (char const *pos_str0, int i);
+  string name_string () const;
+  string file_line_column_string (char const *str0) const;
+
 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_;
-
+  string line_string (char const *pos_str0) const;
+  void get_counts (char const *pos_str0, int *, int *, int *, int *) const;
+  
   SCM get_port () const;
-  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 (String fn, int *len);
+vector<char> gulp_file (string fn, int desired);
 
 #endif /* SOURCE_FILE_HH */