X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Fsource-file.hh;h=223725f462f310b4204627fecf8a4d63457f1156;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=76942ba6b168f54d2e1b46b31d4693a02147cba4;hpb=5c6c8edb1c4997bd3db10d3fd1d79bca2abe3d7e;p=lilypond.git

diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh
index 76942ba6b1..223725f462 100644
--- a/lily/include/source-file.hh
+++ b/lily/include/source-file.hh
@@ -1,15 +1,25 @@
 /*
-  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--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1999--2006 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 "flower-proto.hh"
 #include "std-vector.hh"
 #include "lily-proto.hh"
 #include "smobs.hh"
@@ -25,9 +35,15 @@ using namespace std;
    get_line (), get_word () here.
 */
 
-class Source_file
+class Source_file : public Smob<Source_file>
 {
-  vector<char*> newline_locations_;
+public:
+  int print_smob (SCM, scm_print_state *);
+  SCM mark_smob ();
+  static const char type_p_name_[];
+  virtual ~Source_file ();
+private:
+  vector<char const *> newline_locations_;
   istream *istream_;
   vector<char> characters_;
   SCM str_port_;
@@ -35,11 +51,10 @@ class Source_file
   void load_stdin ();
   void init_port ();
   void init ();
-  
-  DECLARE_SMOBS(Source_file, bla);
+
 public:
-  Source_file (string fn);
-  Source_file (string, string);
+  Source_file (const string &fn);
+  Source_file (const string&, const string&);
 
   char const *c_str () const;
   virtual string quote_input (char const *pos_str0) const;
@@ -51,11 +66,10 @@ public:
   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;
-  
+  void get_counts (char const *pos_str0, int *, int *, int *, int *) const;
+
   SCM get_port () const;
   string name_;
 
@@ -63,7 +77,6 @@ protected:
   int line_offset_;
 };
 
-vector<char> gulp_file (string fn, int desired);
+vector<char> gulp_file (const string &fn, int desired);
 
 #endif /* SOURCE_FILE_HH */
-