X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fincludable-lexer.cc;h=8567ec91718c470e0e24741902d85911dff391b3;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=15d52a3ae9b50368536bf60a38fc967053d23bad;hpb=f875ef39c544bd3499dae5360e9e24f69933575f;p=lilypond.git diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc index 15d52a3ae9..8567ec9171 100644 --- a/lily/includable-lexer.cc +++ b/lily/includable-lexer.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 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 @@ -59,7 +59,7 @@ Includable_lexer::Includable_lexer () /** Set the new input file to NAME, remember old file. */ void -Includable_lexer::new_input (string name, Sources *sources) +Includable_lexer::new_input (const string &name, Sources *sources) { string current_dir = dir_name (main_input_name_); if (relative_includes) @@ -94,7 +94,7 @@ Includable_lexer::new_input (string name, Sources *sources) } void -Includable_lexer::new_input (string name, string data, Sources *sources) +Includable_lexer::new_input (const string &name, string data, Sources *sources) { Source_file *file = new Source_file (name, data); sources->add (file); @@ -111,12 +111,6 @@ Includable_lexer::new_input (string name, string data, Sources *sources) yy_switch_to_buffer (yy_create_buffer (file->get_istream (), YY_BUF_SIZE)); } -void -Includable_lexer::add_string_include (string data) -{ - pending_string_includes_.push_back (data); -} - /** pop the inputstack. conceptually this is a destructor, but it does not destruct the Source_file that Includable_lexer::new_input creates. */