source file of the GNU LilyPond music typesetter
- (c) 1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
{
delete lexer_;
if (default_header_)
- scm_gc_unprotect_object (default_header_->self_scm());
+ scm_gc_unprotect_object (default_header_->self_scm ());
}
-
+/* Process one .ly file, or book. */
void
-My_lily_parser::parse_file (String init, String s)
+My_lily_parser::parse_file (String init, String in_file, String out_file)
{
lexer_ = new My_lily_lexer;
-
- lexer_->main_input_string_ = s;
+ output_basename_ = out_file;
+
+ lexer_->main_input_name_ = in_file;
progress_indication (_ ("Parsing..."));
set_yydebug (0);
lexer_->new_input (init, &input_file_->sources_);
+
+ /* Read .ly IN_FILE, lex, parse, write \score blocks from IN_FILE to
+ OUT_FILE (unless IN_FILE redefines output file name). */
do_yyparse ();
progress_indication ("\n");
- if (!define_spots_.empty ())
+ if (!define_spots_.is_empty ())
{
define_spots_.top ().warning (_ ("Braces don't match"));
error_level_ = 1;
{
/*
Parsing looks ahead , so we really want the previous location of the
- lexer, not lexer_->here_input().
+ lexer, not lexer_->here_input ().
*/
/*
Actually, that gets very icky when there are white space, because
}
#include "paper-def.hh"
-#include "translator-def.hh"
+#include "context-def.hh"
My_lily_parser * current_parser;
SCM l = SCM_EOL;
for (SCM s = al ; gh_pair_p (s); s = ly_cdr (s))
{
- Translator_def * td = unsmob_translator_def (ly_cdar (s));
+ Context_def * td = unsmob_context_def (ly_cdar (s));
l = gh_cons (gh_cons (ly_caar (s), td->to_alist ()), l);
}
return l;