Imported Upstream version 2.16.0

[lilypond.git] / lily / includable-lexer.cc

diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc
index 4c6766c7fd0369752b33bc9a8f7b1bc463ced7c4..806eb1512f198254a50fe9e1c83d11c54b3b88ce 100644 (file)
--- 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 <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -37,14 +37,14 @@ using namespace std;
 #endif
 
 #ifndef YY_START
-#define YY_START                               \
+#define YY_START                                \
   ((yy_start - 1) / 2)
 #define YYSTATE YY_START
 #endif
 
 /* Flex >= 2.5.29 has include stack; but we don't use that yet.  */
 #if !HAVE_FLEXLEXER_YY_CURRENT_BUFFER
-#define yy_current_buffer                                              \
+#define yy_current_buffer                                               \
   (yy_buffer_stack != 0 ? yy_buffer_stack[yy_buffer_stack_top] : 0)
 #endif
 
@@ -71,7 +71,7 @@ Includable_lexer::new_input (string name, Sources *sources)
       string msg = _f ("cannot find file: `%s'", name);
       msg += "\n";
       msg += _f ("(search path: `%s')",
-                (current_dir.length () ? (current_dir + PATHSEP) : "") + sources->path_->to_string ().c_str ());
+                 (current_dir.length () ? (current_dir + PATHSEP) : "") + sources->path_->to_string ().c_str ());
       LexerError (msg.c_str ());
       return;
     }
@@ -81,13 +81,8 @@ Includable_lexer::new_input (string name, Sources *sources)
   if (yy_current_buffer)
     state_stack_.push_back (yy_current_buffer);
 
-  if (be_verbose_global)
-    {
-      string spaces = "";
-      for (size_t i = 0; i < state_stack_.size (); i++)
-       spaces += " ";
-      progress_indication (string ("\n") + spaces + string ("[") + file->name_string ());
-    }
+  debug_output (string (state_stack_.size (), ' ') // indentation!
+                + string ("[") + file->name_string ());
 
   include_stack_.push_back (file);
 
@@ -109,24 +104,13 @@ Includable_lexer::new_input (string name, string data, Sources *sources)
   if (yy_current_buffer)
     state_stack_.push_back (yy_current_buffer);
 
-  if (be_verbose_global)
-    {
-      string spaces = "";
-      for (size_t i = 0; i < state_stack_.size (); i++)
-       spaces += " ";
-      progress_indication (string ("\n") + spaces + string ("[") + name);
-    }
+  debug_output (string (state_stack_.size (), ' ') // indentation!
+                + string ("[") + name);
   include_stack_.push_back (file);
 
   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.  */
@@ -135,8 +119,7 @@ Includable_lexer::close_input ()
 {
   include_stack_.pop_back ();
   char_count_stack_.pop_back ();
-  if (be_verbose_global)
-    progress_indication ("]");
+  debug_output ("]", false);
   yy_delete_buffer (yy_current_buffer);
 #if HAVE_FLEXLEXER_YY_CURRENT_BUFFER
   yy_current_buffer = 0;