X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsource-file.hh;h=26bf6dbdb4810acb0df6b07a5f7a28bbf25d407e;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=18363da1d8f91978128d8fcfbf0d6323890297b6;hpb=1f274c5493bf80bc93d42ccf4e519f010bc8c7f6;p=lilypond.git

diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh
index 18363da1d8..26bf6dbdb4 100644
--- a/lily/include/source-file.hh
+++ b/lily/include/source-file.hh
@@ -1,77 +1,79 @@
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1999--2014 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 <iostream>
+#include "std-vector.hh"
+#include "lily-proto.hh"
+#include "smobs.hh"
 
-#include "flower-proto.hh"
-#include "string.hh"
-#include "interval.hh"
-#include "protected-scm.hh"
-#include "parray.hh"
+#include <iostream>
+using namespace std;
 
 /**
-  class for reading and mapping a file. 
+   class for reading and mapping a file.
 
-  duplicates a lot of Data_file and Text_stream.
-  should look at including Data_file's functionality:
-  get_line (), get_word () here.
+   duplicates a lot of Data_file and Text_stream.
+   should look at including Data_file's functionality:
+   get_line (), get_word () here.
 */
 
 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 (const string &fn);
+  Source_file (const string&, const string&);
 
-  char const* to_str0 () const;
-  virtual String error_string (char const* pos_str0 ) const;
-  std::istream * get_istream ();
-  bool in_b (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);
+  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;
+
 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_;
+  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 *, int *) const;
+
+  SCM get_port () const;
+  string name_;
+
+protected:
+  int line_offset_;
 };
 
-char * gulp_file (String fn, int *len);
+vector<char> gulp_file (const string &fn, int desired);
 
-#endif // SOURCE_FILE_HH //
+#endif /* SOURCE_FILE_HH */