smobify_self ();
- lexer_ = new Lily_lexer (sources_);
+ lexer_ = new Lily_lexer (sources_, this);
lexer_->unprotect ();
}
smobify_self ();
if (src.lexer_)
- lexer_ = new Lily_lexer (*src.lexer_);
-
+ {
+ lexer_ = new Lily_lexer (*src.lexer_, this);
+ }
+
lexer_->unprotect ();
}
/* Process one .ly file, or book. */
void
-Lily_parser::parse_file (std::string init, std::string name, std::string out_name)
+Lily_parser::parse_file (string init, string name, string out_name)
{
if (output_backend_global == "tex")
try_load_text_metrics (out_name);
lexer_->main_input_name_ = name;
message (_ ("Parsing..."));
- // progress_indication ("\n");
set_yydebug (0);
lexer_->new_input (init, sources_);
File_name f (name);
- std::string s = global_path.find (f.base_ + ".twy");
+ string s = global_path.find (f.base_ + ".twy");
s = gulp_file_to_string (s, false, -1);
scm_eval_string (scm_makfrom0str (s.c_str ()));
scm_set_current_module (mod);
- if (!define_spots_.is_empty ())
+ if (!define_spots_.empty ())
{
- define_spots_.top ().warning (_ ("braces don't match"));
+ define_spots_.back ().warning (_ ("braces don't match"));
error_level_ = 1;
}
error_level_ = error_level_ | lexer_->error_level_;
- lexer_ = 0;
+ clear ();
}
void
-Lily_parser::parse_string (std::string ly_code)
+Lily_parser::parse_string (string ly_code)
{
// TODO: use $parser
lexer_->set_identifier (ly_symbol2scm ("parser"),
lexer_->main_input_name_ = "<string>";
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_.empty ())
{
- if (define_spots_.is_empty ()
+ if (define_spots_.empty ()
&& !error_level_)
programming_error ("define_spots_ don't match, but error_level_ not set.");
}
error_level_ = error_level_ | lexer_->error_level_;
}
+void
+Lily_parser::clear ()
+{
+ if (lexer_)
+ {
+ while (lexer_->has_scope ())
+ lexer_->remove_scope ();
+ }
+
+ lexer_ = 0;
+}
+
char const *
Lily_parser::here_str0 () const
{
}
void
-Lily_parser::parser_error (std::string s)
+Lily_parser::parser_error (string s)
{
lexer_->here_input ().error (_ (s.c_str ()));
error_level_ = 1;
}
void
-Lily_parser::parser_error (Input const &i, std::string s)
+Lily_parser::parser_error (Input const &i, string s)
{
i.error (s);
error_level_ = 1;