X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsource-file.hh;h=223725f462f310b4204627fecf8a4d63457f1156;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=0210418c6531029e45e396d892a42bb0780fbd35;hpb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;p=lilypond.git

diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh
index 0210418c65..223725f462 100644
--- a/lily/include/source-file.hh
+++ b/lily/include/source-file.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1999--2015 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
@@ -35,8 +35,14 @@ using namespace std;
    get_line (), get_word () here.
 */
 
-class Source_file
+class Source_file : public Smob<Source_file>
 {
+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_;
@@ -46,10 +52,9 @@ class Source_file
   void init_port ();
   void init ();
 
-  DECLARE_SMOBS (Source_file);
 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;
@@ -61,7 +66,6 @@ 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 *, int *) const;
@@ -73,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 */
-