X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finput-smob.cc;h=4d446ab6c014ff5ea320d3d03d91e6420ba2a1d3;hb=5f93324355c37c35b21cccfb63ad865416b58882;hp=e3bc5d275d8f90907351184820cf01091c4cf971;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git diff --git a/lily/input-smob.cc b/lily/input-smob.cc index e3bc5d275d..4d446ab6c0 100644 --- a/lily/input-smob.cc +++ b/lily/input-smob.cc @@ -1,13 +1,24 @@ /* - input-smob.cc -- implement Input smob + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2000--2012 Han-Wen Nienhuys - (c) 2000--2006 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 + 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. -#include "input-smob.hh" + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ +#include "input.hh" +#include "source-file.hh" #include "std-string.hh" #include "ly-smobs.icc" @@ -17,9 +28,14 @@ Input dummy_input_global; static long input_tag; -static -SCM mark_smob (SCM) +static SCM +mark_smob (SCM s) { + Input *sc = (Input *) SCM_CELL_WORD_1 (s); + + if (Source_file *sf = sc->get_source_file ()) + return sf->self_scm (); + return SCM_EOL; } @@ -38,6 +54,19 @@ free_smob (SCM s) return 0; } +static SCM +equal_smob (SCM sa, SCM sb) +{ + Input *a = (Input *) SCM_CELL_WORD_1 (sa); + Input *b = (Input *) SCM_CELL_WORD_1 (sb); + if (a->get_source_file () == b->get_source_file () + && a->start () == b->start () + && a->end () == b->end ()) + return SCM_BOOL_T; + else + return SCM_BOOL_F; +} + static void start_input_smobs () { @@ -45,7 +74,7 @@ start_input_smobs () scm_set_smob_mark (input_tag, mark_smob); scm_set_smob_free (input_tag, free_smob); scm_set_smob_print (input_tag, print_smob); - scm_set_smob_equalp (input_tag, 0); + scm_set_smob_equalp (input_tag, equal_smob); } SCM