X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fincludable-lexer.cc;h=b4ee0f2821db88992d8eaa9e22994912dd884366;hb=b638d530ac5a32a832646cdd2b680ce52d0764f0;hp=2634c1a1db50caabee4228816573911ef72c4420;hpb=bb36bac02a64770871780231ecc709cb18b20932;p=lilypond.git diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc index 2634c1a1db..b4ee0f2821 100644 --- a/lily/includable-lexer.cc +++ b/lily/includable-lexer.cc @@ -14,6 +14,7 @@ #include "source-file.hh" #include "source.hh" #include "debug.hh" +#include "main.hh" #ifndef YY_BUF_SIZE #define YY_BUF_SIZE 16384 @@ -44,7 +45,7 @@ Includable_lexer::new_input (String s, Sources * global_sources) Source_file * sl = global_sources->get_file_l (s); if (!sl) { - String msg = _f ("Can't find file: `%s'", s); + String msg = _f ("can't find file: `%s'", s); msg += "\n"; msg += _f ("(search path: `%s')", global_sources->path_C_->str ().ch_C()); msg += "\n"; @@ -57,7 +58,9 @@ Includable_lexer::new_input (String s, Sources * global_sources) char_count_stack_.push (0); if (yy_current_buffer) state_stack_.push (yy_current_buffer); - progress_indication (String ("[") + s); + + if (verbose_global_b) + progress_indication (String ("[") + s); include_stack_.push (sl); @@ -81,7 +84,9 @@ Includable_lexer::new_input (String name, String data, Sources* sources) char_count_stack_.push (0); if (yy_current_buffer) state_stack_.push (yy_current_buffer); - progress_indication (String ("[") + name); + + if (verbose_global_b) + progress_indication (String ("[") + name); include_stack_.push (file); yy_switch_to_buffer (yy_create_buffer (file->istream_l (), YY_BUF_SIZE)); @@ -94,7 +99,8 @@ Includable_lexer::close_input () { include_stack_.pop (); char_count_stack_.pop (); - progress_indication ("]"); + if (verbose_global_b) + progress_indication ("]"); yy_delete_buffer (yy_current_buffer); yy_current_buffer = 0; if (state_stack_.empty ())