private:
int lookup_keyword (string);
int scan_bare_word (string);
- SCM scan_markup_word (string);
int scan_escaped_word (string);
+ int scan_shorthand (string);
int scan_scm_id (SCM);
int identifier_type (SCM);
char escaped_char (char) const;
- const char * YYText_utf8 ();
+ const char *YYText_utf8 ();
Lily_parser *parser_;
Keyword_table *keytable_;
SCM scopes_;
SCM start_module_;
int hidden_state_;
+ Input override_input_;
+ SCM eval_scm (SCM, char extra_token = 0);
public:
- SCM eval_scm (SCM);
+ SCM eval_scm_token (SCM sval) { return eval_scm (sval, '#'); }
SCM extra_tokens_;
- YYSTYPE *lexval_;
+ SCM *lexval_;
Input *lexloc_;
bool is_main_input_;
+ vsize main_input_level_;
Sources *sources_;
Input last_input_;
Lily_lexer (Sources *, Lily_parser *);
- Lily_lexer (Lily_lexer const &, Lily_parser *);
+ Lily_lexer (Lily_lexer const &, Lily_parser *, SCM);
int yylex ();
void add_lexed_char (int);
void prepare_for_next_token ();
int try_special_identifiers (SCM *, SCM);
Input here_input () const;
+ Input const &override_input (Input const &) const;
void add_scope (SCM);
SCM set_current_scope ();
SCM keyword_list () const;
SCM lookup_identifier (string s);
SCM lookup_identifier_symbol (SCM s);
- void push_extra_token (int token_type, SCM scm = SCM_UNDEFINED);
- void push_chord_state (SCM tab);
+ void push_extra_token (int token_type, SCM scm = SCM_UNSPECIFIED);
+ void push_chord_state (SCM alist);
void push_figuredbass_state ();
void push_lyric_state ();
void push_initial_state ();
void push_markup_state ();
- void push_note_state (SCM tab);
+ void push_note_state (SCM alist);
void pop_state ();
void LexerError (char const *);
void LexerWarning (char const *);