X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fincludable-lexer.hh;h=bfc3d81718904244e7b4638735f9105bb905fdfd;hb=38d60f8d090d915c34f5d4e6361bf86e75858f0d;hp=5f03e978548579351b15ebb57f1eeb6ff43dd014;hpb=31568c504806f35aac420a394c9eab07abd9faa7;p=lilypond.git diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh index 5f03e97854..bfc3d81718 100644 --- a/lily/include/includable-lexer.hh +++ b/lily/include/includable-lexer.hh @@ -1,9 +1,20 @@ /* - includable-lexer.hh -- declare Includable_lexer + This file is part of LilyPond, the GNU music typesetter. - source file of the LilyPond music typesetter + Copyright (C) 1997--2015 Han-Wen Nienhuys - (c) 1997--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. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #ifndef INCLUDABLE_LEXER_HH @@ -29,21 +40,22 @@ class Includable_lexer : public yyFlexLexer protected: bool close_input (); - vector include_stack_; + vector include_stack_; vector char_count_stack_; public: - bool allow_includes_b_; Includable_lexer (); ~Includable_lexer (); + string main_input_name_; /// store dependencies for Makefile stuff. vector file_name_strings_; Source_file *get_source_file () const; - void new_input (string s, Sources *); - void new_input (string name, string data, Sources *); + virtual void new_input (const string &s, Sources *); + + void new_input (const string &name, string data, Sources *); char const *here_str0 () const; };