SCM mark_smob () const;
static const char * const type_p_name_;
virtual ~Lily_lexer ();
+ int scan_word (SCM & output, SCM sym);
private:
int lookup_keyword (const string&);
int scan_bare_word (const string&);
}
int
-Lily_lexer::scan_bare_word (const string &str)
+Lily_lexer::scan_word (SCM & output, SCM sym)
{
- SCM sym = ly_symbol2scm (str.c_str ());
if ((YYSTATE == notes) || (YYSTATE == chords)) {
SCM handle = SCM_BOOL_F;
if (scm_is_pair (pitchname_tab_stack_))
handle = scm_hashq_get_handle (scm_cdar (pitchname_tab_stack_), sym);
if (scm_is_pair (handle)) {
- yylval = scm_cdr (handle);
+ output = scm_cdr (handle);
if (unsmob<Pitch> (yylval))
return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
else if (scm_is_symbol (yylval))
else if ((YYSTATE == chords)
&& scm_is_true (handle = scm_hashq_get_handle (chordmodifier_tab_, sym)))
{
- yylval = scm_cdr (handle);
+ output = scm_cdr (handle);
return CHORD_MODIFIER;
}
}
+ output = SCM_UNDEFINED;
+ return -1;
+}
+
+int
+Lily_lexer::scan_bare_word (const string &str)
+{
+ int state = scan_word (yylval, ly_symbol2scm (str.c_str ()));
+ if (state >= 0)
+ {
+ return state;
+ }
yylval = ly_string2scm (str);
return STRING;
}
{
if (unsmob<Music> (simple))
return simple;
- if (parser->lexer_->is_note_state ()) {
- if (scm_is_symbol (simple)) {
+
+ if (scm_is_symbol (simple))
+ {
+ SCM out = SCM_UNDEFINED;
+ switch (parser->lexer_->scan_word (out, simple))
+ {
+ case DRUM_PITCH:
+ {
Music *n = MY_MAKE_MUSIC ("NoteEvent", loc);
n->set_property ("duration", parser->default_duration_.smobbed_copy ());
- n->set_property ("drum-type", simple);
+ n->set_property ("drum-type", out);
return n->unprotect ();
}
+ case NOTENAME_PITCH:
+ case TONICNAME_PITCH:
+ // Take the parsed pitch
+ simple = out;
+ break;
+ // Don't scan CHORD_MODIFIER etc.
+ }
+ }
+
+ if (parser->lexer_->is_note_state ()) {
if (unsmob<Pitch> (simple)) {
Music *n = MY_MAKE_MUSIC ("NoteEvent", loc);
n->set_property ("duration", parser->default_duration_.smobbed_copy ());