/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
LilyPond is free software: you can redistribute it and/or modify
#include "paper-book.hh"
#include "parser.hh"
#include "score.hh"
+#include "source-file.hh"
#include "sources.hh"
#include "warn.hh"
#include "program-option.hh"
sources_ = sources;
default_duration_ = Duration (2, 0);
error_level_ = 0;
+ closures_ = SCM_EOL;
smobify_self ();
lexer_->unprotect ();
}
-Lily_parser::Lily_parser (Lily_parser const &src)
+Lily_parser::Lily_parser (Lily_parser const &src, SCM closures)
{
lexer_ = 0;
sources_ = src.sources_;
default_duration_ = src.default_duration_;
- error_level_ = src.error_level_;
+ error_level_ = 0;
output_basename_ = src.output_basename_;
+ closures_ = closures;
smobify_self ();
if (src.lexer_)
{
lexer_ = new Lily_lexer (*src.lexer_, this);
}
-
+
lexer_->unprotect ();
}
{
}
-
SCM
Lily_parser::mark_smob (SCM s)
{
Lily_parser *parser = (Lily_parser *) SCM_CELL_WORD_1 (s);
+ scm_gc_mark (parser->closures_);
return (parser->lexer_) ? parser->lexer_->self_scm () : SCM_EOL;
}
int
-Lily_parser::print_smob (SCM s, SCM port, scm_print_state*)
+Lily_parser::print_smob (SCM s, SCM port, scm_print_state *)
{
scm_puts ("#<Lily_parser ", port);
Lily_parser *parser = (Lily_parser *) SCM_CELL_WORD_1 (s);
void
Lily_parser::parse_file (string init, string name, string out_name)
{
- // TODO: use $parser
+ // TODO: use $parser
lexer_->set_identifier (ly_symbol2scm ("parser"), self_scm ());
output_basename_ = out_name;
Don't mix cyclic pointers with weak tables.
*/
lexer_->set_identifier (ly_symbol2scm ("parser"),
- SCM_EOL);
+ SCM_EOL);
ly_reexport_module (scm_current_module ());
scm_set_current_module (mod);
- if (!define_spots_.empty ())
- {
- define_spots_.back ().warning (_ ("braces do not match"));
- error_level_ = 1;
- }
-
error_level_ = error_level_ | lexer_->error_level_;
clear ();
}
void
Lily_parser::parse_string (string ly_code)
{
- // TODO: use $parser
+ // TODO: use $parser
lexer_->set_identifier (ly_symbol2scm ("parser"),
- self_scm ());
+ self_scm ());
lexer_->main_input_name_ = "<string>";
- lexer_->is_main_input_ = true;
+ lexer_->is_main_input_ = true;
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_.empty ())
+ error_level_ = error_level_ | lexer_->error_level_;
+}
+
+SCM
+Lily_parser::parse_string_expression (string ly_code, string filename,
+ int line)
+{
+ // TODO: use $parser
+ lexer_->set_identifier (ly_symbol2scm ("parser"),
+ self_scm ());
+
+ lexer_->main_input_name_ = filename;
+ lexer_->is_main_input_ = true;
+ lexer_->new_input (lexer_->main_input_name_, ly_code, sources_);
+ if (line)
{
- if (define_spots_.empty ()
- && !error_level_)
- programming_error ("define_spots_ don't match, but error_level_ not set.");
+ lexer_->get_source_file ()->set_line (0, line);
}
+ SCM mod = lexer_->set_current_scope ();
+ lexer_->push_extra_token (EMBEDDED_LILY);
+ do_yyparse ();
+ SCM result = lexer_->lookup_identifier_symbol (ly_symbol2scm ("parseStringResult"));
+ // parseStringResult is set in the grammar rule for embedded_lilypond
+
+ scm_set_current_module (mod);
error_level_ = error_level_ | lexer_->error_level_;
+ return result;
+}
+
+void
+Lily_parser::include_string (string ly_code)
+{
+ lexer_->new_input ("<included string>", ly_code, sources_);
}
void
if (lexer_)
{
while (lexer_->has_scope ())
- lexer_->remove_scope ();
+ lexer_->remove_scope ();
}
- lexer_ = 0;
+ lexer_ = 0;
}
char const *
error_level_ = 1;
}
-
-
IMPLEMENT_SMOBS (Lily_parser);
IMPLEMENT_TYPE_P (Lily_parser, "ly:lily-parser?");
IMPLEMENT_DEFAULT_EQUAL_P (Lily_parser);
-
/****************************************************************
- OUTPUT-DEF
+ OUTPUT-DEF
****************************************************************/
Output_def *
Output_def *layout = unsmob_output_def (id);
layout = layout ? layout->clone () : new Output_def;
layout->set_variable (ly_symbol2scm ("is-layout"), SCM_BOOL_T);
-
+
return layout;
}
get_paper (Lily_parser *parser)
{
SCM papers = parser->lexer_->lookup_identifier ("$papers");
- Output_def *layout = ((papers == SCM_UNDEFINED) || scm_is_null (papers)) ?
- 0 : unsmob_output_def (scm_car (papers));
+ Output_def *layout = ((papers == SCM_UNDEFINED) || scm_is_null (papers))
+ ? 0 : unsmob_output_def (scm_car (papers));
SCM default_paper = parser->lexer_->lookup_identifier ("$defaultpaper");
layout = layout ? layout : unsmob_output_def (default_paper);
void
pop_paper (Lily_parser *parser)
{
- if (! scm_is_null (parser->lexer_->lookup_identifier ("$papers")))
+ if (scm_is_pair (parser->lexer_->lookup_identifier ("$papers")))
parser->lexer_->set_identifier (ly_symbol2scm ("$papers"),
scm_cdr (parser->lexer_->lookup_identifier ("$papers")));
}
ly_module_copy (nid, id);
id = nid;
}
-
+
return id;
}
-SCM
+SCM
Lily_parser::make_scope () const
{
- SCM module = ly_make_anonymous_module (be_safe_global);
- return module;
+ SCM module = ly_make_module (be_safe_global);
+ return module;
}