/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
LilyPond is free software: you can redistribute it and/or modify
{
lexer_ = new Lily_lexer (*src.lexer_, this);
}
-
+
lexer_->unprotect ();
}
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;
void
Lily_parser::parse_string (string ly_code)
{
- // TODO: use $parser
+ // TODO: use $parser
lexer_->set_identifier (ly_symbol2scm ("parser"),
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 ();
error_level_ = error_level_ | lexer_->error_level_;
}
+void
+Lily_parser::include_string (string ly_code)
+{
+ lexer_->add_string_include (ly_code);
+}
+
void
Lily_parser::clear ()
{
lexer_->remove_scope ();
}
- lexer_ = 0;
+ lexer_ = 0;
}
char const *
/****************************************************************
- 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;
}
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;
}