X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fincludable-lexer.hh;h=c9595f923b84e44d7ef2ee48293b45f6dba93354;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=a7ca04ca24cffff02a12349047444a6dccc447c9;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh index a7ca04ca24..c9595f923b 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--2011 Han-Wen Nienhuys + Copyright (C) 1997--2012 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,9 +40,8 @@ class Includable_lexer : public yyFlexLexer protected: bool close_input (); - vector include_stack_; + vector include_stack_; vector char_count_stack_; - vector pending_string_includes_; public: @@ -55,10 +54,9 @@ public: Source_file *get_source_file () const; virtual void new_input (string s, Sources *); - + void new_input (string name, string data, Sources *); - void add_string_include (string data); - + char const *here_str0 () const; };