/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2012 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
{"drums", DRUMS},
{"figuremode", FIGUREMODE},
{"figures", FIGURES},
- {"grobdescriptions", GROBDESCRIPTIONS},
{"header", HEADER},
{"layout", LAYOUT},
{"lyricmode", LYRICMODE},
error_level_ = 0;
is_main_input_ = false;
start_module_ = SCM_EOL;
- chord_repetition_ = Chord_repetition ();
extra_tokens_ = SCM_EOL;
smobify_self ();
add_scope (ly_make_module (false));
- push_note_state (scm_c_make_hash_table (0));
+ push_note_state (SCM_EOL);
chordmodifier_tab_ = scm_make_vector (scm_from_int (1), SCM_EOL);
}
chordmodifier_tab_ = src.chordmodifier_tab_;
pitchname_tab_stack_ = src.pitchname_tab_stack_;
sources_ = src.sources_;
+ scopes_ = src.scopes_;
start_module_ = SCM_EOL;
- chord_repetition_ = src.chord_repetition_;
- error_level_ = src.error_level_;
+ error_level_ = 0;
is_main_input_ = src.is_main_input_;
- scopes_ = SCM_EOL;
extra_tokens_ = SCM_EOL;
smobify_self ();
- SCM scopes = SCM_EOL;
- SCM *tail = &scopes;
- for (SCM s = src.scopes_; scm_is_pair (s); s = scm_cdr (s))
- {
- SCM newmod = ly_make_module (false);
- ly_module_copy (newmod, scm_car (s));
- *tail = scm_cons (newmod, SCM_EOL);
- tail = SCM_CDRLOC (*tail);
- }
-
- scopes_ = scopes;
- push_note_state (scm_c_make_hash_table (0));
+ push_note_state (SCM_EOL);
}
Lily_lexer::~Lily_lexer ()
SCM
Lily_lexer::mark_smob (SCM s)
{
- ASSERT_LIVE_IS_ALLOWED ();
+ ASSERT_LIVE_IS_ALLOWED (s);
Lily_lexer *lexer = (Lily_lexer *) SCM_CELL_WORD_1 (s);