X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsource-file.hh;h=223725f462f310b4204627fecf8a4d63457f1156;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=26bf6dbdb4810acb0df6b07a5f7a28bbf25d407e;hpb=82bc9ad690e201aaa55694f8b92261ae7338f56a;p=lilypond.git diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh index 26bf6dbdb4..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--2014 Jan Nieuwenhuizen + Copyright (C) 1999--2015 Jan Nieuwenhuizen 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 { +public: + int print_smob (SCM, scm_print_state *); + SCM mark_smob (); + static const char type_p_name_[]; + virtual ~Source_file (); +private: vector newline_locations_; istream *istream_; vector characters_; @@ -46,7 +52,6 @@ class Source_file void init_port (); void init (); - DECLARE_SMOBS (Source_file); public: Source_file (const string &fn); Source_file (const string&, const string&); @@ -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; @@ -76,4 +80,3 @@ protected: vector gulp_file (const string &fn, int desired); #endif /* SOURCE_FILE_HH */ -