/*
- includable-lexer.cc -- implement Includable_lexer
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the LilyPond music typesetter
+ Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
#include "includable-lexer.hh"
#include <sstream>
+using namespace std;
#include "config.hh"
+
+#include "file-name.hh"
#include "file-path.hh"
+#include "international.hh"
+#include "main.hh"
#include "source-file.hh"
-#include "source.hh"
+#include "sources.hh"
#include "warn.hh"
-#include "main.hh"
#ifndef YY_BUF_SIZE
#define YY_BUF_SIZE 16384
(yy_buffer_stack != 0 ? yy_buffer_stack[yy_buffer_stack_top] : 0)
#endif
+extern bool relative_includes;
+
Includable_lexer::Includable_lexer ()
{
#if HAVE_FLEXLEXER_YY_CURRENT_BUFFER
yy_current_buffer = 0;
#endif
- allow_includes_b_ = true;
}
/** Set the new input file to NAME, remember old file. */
void
-Includable_lexer::new_input (String name, Sources *sources)
+Includable_lexer::new_input (string name, Sources *sources)
{
- if (!allow_includes_b_)
- {
- LexerError (_ ("include files are not allowed in safe mode").to_str0 ());
- return;
- }
+ string current_dir = dir_name (main_input_name_);
+ if (relative_includes)
+ current_dir = include_stack_.size () ? dir_name (include_stack_.back ()->name_string ()) : "";
- Source_file *file = sources->get_file (name);
+ Source_file *file = sources->get_file (name, current_dir);
if (!file)
{
- String msg = _f ("can't find file: `%s'", name);
+ string msg = _f ("cannot find file: `%s'", name);
msg += "\n";
msg += _f ("(search path: `%s')",
- sources->path_->to_string ().to_str0 ());
- msg += "\n";
- LexerError (msg.to_str0 ());
+ (current_dir.length () ? (current_dir + PATHSEP) : "") + sources->path_->to_string ().c_str ());
+ LexerError (msg.c_str ());
return;
}
- file_name_strings_.push (file->name_string ());
+ file_name_strings_.push_back (file->name_string ());
- char_count_stack_.push (0);
+ char_count_stack_.push_back (0);
if (yy_current_buffer)
- state_stack_.push (yy_current_buffer);
+ state_stack_.push_back (yy_current_buffer);
if (be_verbose_global)
- progress_indication (String ("[") + name);
+ {
+ string spaces = "";
+ for (size_t i = 0; i < state_stack_.size (); i++)
+ spaces += " ";
+ progress_indication (string ("\n") + spaces + string ("[") + file->name_string ());
+ }
- include_stack_.push (file);
+ include_stack_.push_back (file);
/* Ugh. We'd want to create a buffer from the bytes directly.
}
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);
sources->add (file);
- file_name_strings_.push (name);
+ file_name_strings_.push_back (name);
- char_count_stack_.push (0);
+ char_count_stack_.push_back (0);
if (yy_current_buffer)
- state_stack_.push (yy_current_buffer);
+ state_stack_.push_back (yy_current_buffer);
if (be_verbose_global)
- progress_indication (String ("[") + name);
- include_stack_.push (file);
+ {
+ string spaces = "";
+ for (size_t i = 0; i < state_stack_.size (); i++)
+ spaces += " ";
+ progress_indication (string ("\n") + spaces + 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. */
bool
Includable_lexer::close_input ()
{
- include_stack_.pop ();
- char_count_stack_.pop ();
+ include_stack_.pop_back ();
+ char_count_stack_.pop_back ();
if (be_verbose_global)
progress_indication ("]");
yy_delete_buffer (yy_current_buffer);
#if HAVE_FLEXLEXER_YY_CURRENT_BUFFER
yy_current_buffer = 0;
#endif
- if (state_stack_.is_empty ())
+ if (state_stack_.empty ())
{
#if HAVE_FLEXLEXER_YY_CURRENT_BUFFER
yy_current_buffer = 0;
#endif
return false;
}
- yy_switch_to_buffer (state_stack_.pop ());
+ yy_switch_to_buffer (state_stack_.back ());
+ state_stack_.pop_back ();
return true;
}
char const *
Includable_lexer::here_str0 () const
{
- if (include_stack_.is_empty ())
+ if (include_stack_.empty ())
return 0;
- return include_stack_.top ()->to_str0 () + char_count_stack_.top ();
+ return include_stack_.back ()->c_str () + char_count_stack_.back ();
}
Includable_lexer::~Includable_lexer ()
{
- while (!include_stack_.is_empty ())
- {
- close_input ();
- }
+ while (!include_stack_.empty ())
+ close_input ();
}
Source_file *
Includable_lexer::get_source_file () const
{
- if (include_stack_.is_empty ())
+ if (include_stack_.empty ())
return 0;
- else
- return include_stack_.top ();
+ return include_stack_.back ();
}
projects / lilypond.git / blobdiff