source file of the GNU LilyPond music typesetter
- (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "lily-parser.hh"
#include "book.hh"
#include "lilypond-key.hh"
#include "lily-version.hh"
-#include "ly-module.hh"
#include "main.hh"
#include "lily-lexer.hh"
#include "output-def.hh"
#include "source.hh"
#include "warn.hh"
+#include "ly-smobs.icc"
+
Lily_parser::Lily_parser (Sources *sources)
{
- book_count_ = 0;
- score_count_ = 0;
lexer_ = 0;
sources_ = sources;
default_duration_ = Duration (2, 0);
error_level_ = 0;
- last_beam_start_ = SCM_EOL;
smobify_self ();
+
+ lexer_ = new Lily_lexer (sources_);
+ lexer_->unprotect ();
}
Lily_parser::Lily_parser (Lily_parser const &src)
{
- book_count_ = src.book_count_;
- score_count_ = src.score_count_;
lexer_ = 0;
sources_ = src.sources_;
default_duration_ = src.default_duration_;
error_level_ = src.error_level_;
- last_beam_start_ = src.last_beam_start_;
+ output_basename_ = src.output_basename_;
smobify_self ();
if (src.lexer_)
lexer_ = new Lily_lexer (*src.lexer_);
- scm_gc_unprotect_object (lexer_->self_scm ());
+ lexer_->unprotect ();
}
Lily_parser::~Lily_parser ()
{
}
-#include "ly-smobs.icc"
-
-IMPLEMENT_SMOBS (Lily_parser);
-IMPLEMENT_TYPE_P (Lily_parser, "ly:lily-parser?");
-IMPLEMENT_DEFAULT_EQUAL_P (Lily_parser);
SCM
Lily_parser::mark_smob (SCM s)
{
- Lily_parser *parser = (Lily_parser*) SCM_CELL_WORD_1 (s);
+ Lily_parser *parser = (Lily_parser *) SCM_CELL_WORD_1 (s);
return (parser->lexer_) ? parser->lexer_->self_scm () : SCM_EOL;
}
int
Lily_parser::print_smob (SCM s, SCM port, scm_print_state*)
{
- scm_puts ("#<my_lily_parser ", port);
- Lily_parser *parser = (Lily_parser*) SCM_CELL_WORD_1 (s);
- (void) parser;
+ scm_puts ("#<Lily_parser ", port);
+ Lily_parser *parser = (Lily_parser *) SCM_CELL_WORD_1 (s);
+ if (parser->lexer_)
+ scm_display (parser->lexer_->self_scm (), port);
+ else
+ scm_puts ("(no lexer yet)", port);
scm_puts (" >", port);
return 1;
}
-
/* Process one .ly file, or book. */
void
Lily_parser::parse_file (String init, String name, String out_name)
{
if (output_backend_global == "tex")
- {
- try_load_text_metrics (out_name);
- }
-
- lexer_ = new Lily_lexer (sources_);
- scm_gc_unprotect_object (lexer_->self_scm ());
+ try_load_text_metrics (out_name);
+
// TODO: use $parser
lexer_->set_identifier (ly_symbol2scm ("parser"),
self_scm ());
output_basename_ = out_name;
-
+
lexer_->main_input_name_ = name;
- progress_indication (_ ("Parsing..."));
- progress_indication ("\n");
+ message (_ ("Parsing..."));
+ // progress_indication ("\n");
set_yydebug (0);
File_name f (name);
String s = global_path.find (f.base_ + ".twy");
- s = gulp_file_to_string (s, false);
+ s = gulp_file_to_string (s, false, -1);
scm_eval_string (scm_makfrom0str (s.to_str0 ()));
/* Read .ly IN_FILE, lex, parse, write \score blocks from IN_FILE to
OUT_FILE (unless IN_FILE redefines output file name). */
+
+ SCM mod = lexer_->set_current_scope ();
do_yyparse ();
+ /*
+ Don't mix cyclic pointers with weak tables.
+ */
+ lexer_->set_identifier (ly_symbol2scm ("parser"),
+ SCM_EOL);
+ ly_reexport_module (scm_current_module ());
+
+ scm_set_current_module (mod);
+
if (!define_spots_.is_empty ())
{
- define_spots_.top ().warning (_ ("Braces don't match"));
+ define_spots_.top ().warning (_ ("braces don't match"));
error_level_ = 1;
}
void
Lily_parser::parse_string (String ly_code)
{
- Lily_lexer * parent = lexer_;
- lexer_ = (parent == 0 ? new Lily_lexer (sources_)
- : new Lily_lexer (*parent));
- scm_gc_unprotect_object (lexer_->self_scm ());
-
-
- SCM oldmod = scm_current_module ();
- scm_set_current_module (scm_car (lexer_->scopes_));
-
// TODO: use $parser
lexer_->set_identifier (ly_symbol2scm ("parser"),
self_scm ());
-
+
lexer_->main_input_name_ = "<string>";
- lexer_->main_input_b_ = true;
+ lexer_->is_main_input_ = true;
set_yydebug (0);
lexer_->new_input (lexer_->main_input_name_, ly_code, sources_);
+
+ SCM mod = lexer_->set_current_scope ();
do_yyparse ();
-
+ scm_set_current_module (mod);
+
if (!define_spots_.is_empty ())
{
- if (define_spots_.is_empty()
- && !error_level_ )
- programming_error ("Braces don't match, but error_level_ not set.");
+ if (define_spots_.is_empty ()
+ && !error_level_)
+ programming_error ("define_spots_ don't match, but error_level_ not set.");
}
error_level_ = error_level_ | lexer_->error_level_;
-
- scm_set_current_module (oldmod);
- lexer_ = 0;
-}
-
-void
-Lily_parser::push_spot ()
-{
- define_spots_.push (here_input ());
}
char const *
void
Lily_parser::parser_error (String s)
{
- here_input ().error (s);
+ lexer_->here_input ().error (_ (s.to_str0 ()));
error_level_ = 1;
}
-Input
-Lily_parser::pop_spot ()
+void
+Lily_parser::parser_error (Input const &i, String s)
{
- return define_spots_.pop ();
+ i.error (s);
+ error_level_ = 1;
}
-Input
-Lily_parser::here_input () const
-{
- /*
- Parsing looks ahead , so we really want the previous location of the
- lexer, not lexer_->here_input ().
- */
-
- /*
- Actually, that gets very icky when there are white space, because
- the line-numbers are all wrong. Let's try the character before
- the current token. That gets the right result for note/duration
- stuff, but doesn't mess up for errors in the 1st token of the
- line.
- */
- Input hi (lexer_->here_input ());
- char const * bla = hi.defined_str0_;
- if (hi.line_number () > 1
- || hi.column_number () > 1)
- bla --;
-
- return Input (hi.source_file_, bla);
-}
+IMPLEMENT_SMOBS (Lily_parser);
+IMPLEMENT_TYPE_P (Lily_parser, "ly:lily-parser?");
+IMPLEMENT_DEFAULT_EQUAL_P (Lily_parser);
-/****************************************************************/
+/****************************************************************
+ OUTPUT-DEF
+ ****************************************************************/
-Output_def*
+Output_def *
get_layout (Lily_parser *parser)
{
SCM id = parser->lexer_->lookup_identifier ("$defaultlayout");
return layout;
}
-
-Output_def*
+Output_def *
get_midi (Lily_parser *parser)
{
SCM id = parser->lexer_->lookup_identifier ("$defaultmidi");
return layout;
}
-
-Output_def*
+Output_def *
get_paper (Lily_parser *parser)
{
SCM id = parser->lexer_->lookup_identifier ("$defaultpaper");
Output_def *layout = unsmob_output_def (id);
- layout = layout ? dynamic_cast<Output_def*> (layout->clone ()) : new Output_def;
+ layout = layout ? dynamic_cast<Output_def *> (layout->clone ()) : new Output_def;
layout->set_variable (ly_symbol2scm ("is-paper"), SCM_BOOL_T);
return layout;
}
+SCM
+get_header (Lily_parser *parser)
+{
+ SCM id = parser->lexer_->lookup_identifier ("$defaultheader");
+ if (!ly_is_module (id))
+ id = ly_make_anonymous_module (be_safe_global);
+ else
+ {
+ SCM nid = ly_make_anonymous_module (false);
+ ly_module_copy(nid,id);
+ id = nid;
+ }
+
+ return id;
+}