* Documentation/user/notation.itely (Bar lines): Added a note that

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

diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc
index 587eefbba1105b209c8e55114e581d04f0119ef1..ff48f271aa47f8e6340a908739cd43ed06f75508 100644 (file)
--- a/lily/includable-lexer.cc
+++ b/lily/includable-lexer.cc
@@ -7,7 +7,8 @@
 */
 
 #include <sstream>
-#include "config.h"
+
+#include "config.hh"
 
 #include "includable-lexer.hh"
 #include "file-path.hh"
@@ -27,69 +28,62 @@
 #endif
 
 /* Flex >= 2.5.29 has include stack; but we don't use that yet.  */
-#ifndef HAVE_FLEXLEXER_YY_CURRENT_BUFFER
+#if !HAVE_FLEXLEXER_YY_CURRENT_BUFFER
 #define yy_current_buffer \
   (yy_buffer_stack != 0 ? yy_buffer_stack[yy_buffer_stack_top] : 0)
 #endif
 
 Includable_lexer::Includable_lexer ()
 {
-#ifdef HAVE_FLEXLEXER_YY_CURRENT_BUFFER
+#if HAVE_FLEXLEXER_YY_CURRENT_BUFFER
   yy_current_buffer = 0;
 #endif
   allow_includes_b_ = true;
 }
 
-/** set the  new input to s, remember old file.
-*/
+/** Set the new input file to NAME, remember old file.  */
 void
-Includable_lexer::new_input (String s, Sources  * global_sources)
+Includable_lexer::new_input (String name, Sources *sources)
 {
   if (!allow_includes_b_)
     {
-      LexerError (_ ("include files are not allowed").to_str0 ());
+      LexerError (_ ("include files are not allowed in safe mode").to_str0 ());
       return;
     }
   
-  Source_file *sl = global_sources->get_file (s);
-  if (!sl)
+  Source_file *file = sources->get_file (name);
+  if (!file)
     {
-      String msg = _f ("can't find file: `%s'", s);
+      String msg = _f ("can't find file: `%s'", name);
       msg += "\n";
       msg += _f ("(search path: `%s')",
-                global_sources->path_->to_string ().to_str0 ());
+                sources->path_->to_string ().to_str0 ());
       msg += "\n";
       LexerError (msg.to_str0 ());
       return;
     }
-  filename_strings_.push (sl->name_string ());
+  filename_strings_.push (file->name_string ());
 
   char_count_stack_.push (0);
   if (yy_current_buffer)
     state_stack_.push (yy_current_buffer);
 
   if (verbose_global_b)
-    progress_indication (String ("[") + s);
+    progress_indication (String ("[") + name);
        
-  include_stack_.push (sl);
-
-  /*
-    ugh. We'd want to create a buffer from the bytes directly.
+  include_stack_.push (file);
 
-    Whoops. The size argument to yy_create_buffer is not the
-    filelength but a BUFFERSIZE. Maybe this is why reading stdin fucks up.
+  /* Ugh. We'd want to create a buffer from the bytes directly.
 
-  */
-  yy_switch_to_buffer (yy_create_buffer (sl->get_istream (), YY_BUF_SIZE));
+    Whoops.  The size argument to yy_create_buffer is not the
+    filelength but a BUFFERSIZE.  Maybe this is why reading stdin fucks up.  */
+  yy_switch_to_buffer (yy_create_buffer (file->get_istream (), YY_BUF_SIZE));
 }
 
-/*
-  Unused.
- */
 void
-Includable_lexer::new_input (String name, String data, Sources* sources)
+Includable_lexer::new_input (String name, String data, Sources *sources)
 {
-  Source_file* file = new Source_file (name, data);
+  Source_file *file = new Source_file (name, data);
   sources->add (file);
   filename_strings_.push (name);
 
@@ -115,12 +109,12 @@ Includable_lexer::close_input ()
   if (verbose_global_b)
     progress_indication ("]");
   yy_delete_buffer (yy_current_buffer);
-#ifdef HAVE_FLEXLEXER_YY_CURRENT_BUFFER  
+#if HAVE_FLEXLEXER_YY_CURRENT_BUFFER  
   yy_current_buffer = 0;
 #endif  
   if (state_stack_.is_empty ())
     {
-#ifdef HAVE_FLEXLEXER_YY_CURRENT_BUFFER  
+#if HAVE_FLEXLEXER_YY_CURRENT_BUFFER  
       yy_current_buffer = 0;
 #endif  
       return false;