X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fincludable-lexer.hh;h=e349917aaf542786316dd3406c590910d30be417;hb=2558bbf111c416f0c7093f7f8a3129533310cf37;hp=9df81461dbf1a352c16d5f74b90529ddb401a089;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh index 9df81461db..e349917aaf 100644 --- a/lily/include/includable-lexer.hh +++ b/lily/include/includable-lexer.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2010 Han-Wen Nienhuys + Copyright (C) 1997--2014 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 @@ -40,7 +40,7 @@ class Includable_lexer : public yyFlexLexer protected: bool close_input (); - vector include_stack_; + vector include_stack_; vector char_count_stack_; public: @@ -53,10 +53,10 @@ public: vector file_name_strings_; Source_file *get_source_file () const; - virtual 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; };