/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2005--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
1, 0, 0, (SCM parser_smob),
"Return the lexer for @var{parser-smob}.")
{
- Lily_parser *parser = unsmob_lily_parser (parser_smob);
+ Lily_parser *parser = Lily_parser::unsmob (parser_smob);
return parser->lexer_->self_scm ();
}
LY_DEFINE (ly_parser_clone, "ly:parser-clone",
- 1, 1, 0, (SCM parser_smob, SCM closures),
+ 1, 2, 0, (SCM parser_smob, SCM closures, SCM location),
"Return a clone of @var{parser-smob}. An association list"
" of port positions to closures can be specified in @var{closures}"
" in order to have @code{$} and @code{#} interpreted in their original"
- " lexical environment.")
+ " lexical environment. If @var{location} is a valid location,"
+ " it becomes the source of all music expressions inside.")
{
LY_ASSERT_SMOB (Lily_parser, parser_smob, 1);
- Lily_parser *parser = unsmob_lily_parser (parser_smob);
+ Lily_parser *parser = Lily_parser::unsmob (parser_smob);
if (SCM_UNBNDP (closures))
closures = SCM_EOL;
else
LY_ASSERT_TYPE (ly_is_list, closures, 2);
- Lily_parser *clone = new Lily_parser (*parser, closures);
+ Lily_parser *clone = new Lily_parser (*parser, closures, location);
return clone->unprotect ();
}
{
LY_ASSERT_SMOB (Lily_parser, parser_smob, 1);
- Lily_parser *parser = unsmob_lily_parser (parser_smob);
+ Lily_parser *parser = Lily_parser::unsmob (parser_smob);
LY_ASSERT_TYPE (ly_is_symbol, symbol, 2);
{
LY_ASSERT_SMOB (Lily_parser, parser_smob, 1);
- Lily_parser *parser = unsmob_lily_parser (parser_smob);
+ Lily_parser *parser = Lily_parser::unsmob (parser_smob);
LY_ASSERT_TYPE (ly_is_symbol, symbol, 2);
" Upon failure, throw @code{ly-file-failed} key.")
{
LY_ASSERT_SMOB (Lily_parser, parser_smob, 1);
- Lily_parser *parser = unsmob_lily_parser (parser_smob);
+ Lily_parser *parser = Lily_parser::unsmob (parser_smob);
LY_ASSERT_TYPE (scm_is_string, ly_code, 2);
if (!parser->lexer_->is_clean ())
" @var{filename} and @var{line} are optional source indicators.")
{
LY_ASSERT_SMOB (Lily_parser, parser_smob, 1);
- Lily_parser *parser = unsmob_lily_parser (parser_smob);
+ Lily_parser *parser = Lily_parser::unsmob (parser_smob);
LY_ASSERT_TYPE (scm_is_string, ly_code, 2);
string fn;
if (SCM_UNBNDP (filename) || !scm_is_string (filename))
" Scheme expressions (@code{$} instead of @code{#}).")
{
LY_ASSERT_SMOB (Lily_parser, parser_smob, 1);
- Lily_parser *parser = unsmob_lily_parser (parser_smob);
+ Lily_parser *parser = Lily_parser::unsmob (parser_smob);
LY_ASSERT_TYPE (scm_is_string, ly_code, 2);
parser->include_string (ly_scm2string (ly_code));
" if the current mode is notes.")
{
LY_ASSERT_SMOB (Lily_parser, parser, 1);
- Lily_parser *p = unsmob_lily_parser (parser);
+ Lily_parser *p = Lily_parser::unsmob (parser);
if (p->lexer_->is_note_state ())
{
p->lexer_->pop_state ();
- p->lexer_->push_note_state (alist_to_hashq (names));
+ p->lexer_->push_note_state (names);
}
return SCM_UNSPECIFIED;
"Return the base name of the output file.")
{
LY_ASSERT_SMOB (Lily_parser, parser, 1);
- Lily_parser *p = unsmob_lily_parser (parser);
+ Lily_parser *p = Lily_parser::unsmob (parser);
return ly_string2scm (p->output_basename_);
}
"Display an error message and make the parser fail.")
{
LY_ASSERT_SMOB (Lily_parser, parser, 1);
- Lily_parser *p = unsmob_lily_parser (parser);
+ Lily_parser *p = Lily_parser::unsmob (parser);
LY_ASSERT_TYPE (scm_is_string, msg, 2);
string s = ly_scm2string (msg);
- Input *i = unsmob_input (input);
+ Input *i = Input::unsmob (input);
if (i)
p->parser_error (*i, s);
else
"Clear the error flag for the parser.")
{
LY_ASSERT_SMOB (Lily_parser, parser, 1);
- Lily_parser *p = unsmob_lily_parser (parser);
+ Lily_parser *p = Lily_parser::unsmob (parser);
p->error_level_ = 0;
p->lexer_->error_level_ = 0;
"Does @var{parser} have an error flag?")
{
LY_ASSERT_SMOB (Lily_parser, parser, 1);
- Lily_parser *p = unsmob_lily_parser (parser);
+ Lily_parser *p = Lily_parser::unsmob (parser);
return scm_from_bool (p->error_level_ || p->lexer_->error_level_);
}