X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Finput.hh;h=b33b5067308f4b6f568c2dd1dc335c5de608b23a;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=a11f8f8c1b25f787bd632aaa41bc7388eea3340f;hpb=00216e16c717470ae53dbbfd1d52850d1b102e29;p=lilypond.git diff --git a/lily/include/input.hh b/lily/include/input.hh index a11f8f8c1b..b33b506730 100644 --- a/lily/include/input.hh +++ b/lily/include/input.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2012 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,16 +21,21 @@ #define INPUT_HH #include "lily-proto.hh" +#include "smobs.hh" /** Base class for anything that records its poisition in the parse file. */ -class Input +class Input : public Simple_smob { char const *start_; char const *end_; Source_file *source_file_; public: + static const char type_p_name_[]; + int print_smob (SCM, scm_print_state *); + static SCM equal_p (SCM, SCM); + SCM mark_smob (); Source_file *get_source_file () const; char const *start () const; char const *end () const; @@ -66,11 +71,6 @@ protected: string message_string (const string &msg) const; }; -#include "smobs.hh" - -SCM make_input (Input spot); -Input *unsmob_input (SCM); - extern Input dummy_input_global; #endif // INPUT_HH