/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--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
DECLARE_SMOBS (Lily_lexer);
private:
- int lookup_keyword (string);
- int scan_bare_word (string);
- int scan_escaped_word (string);
- int scan_shorthand (string);
+ int lookup_keyword (const string&);
+ int scan_bare_word (const string&);
+ int scan_escaped_word (const string&);
+ int scan_shorthand (const string&);
int scan_scm_id (SCM);
int identifier_type (SCM);
char escaped_char (char) const;
Keyword_table *keytable_;
SCM scopes_;
SCM start_module_;
- int hidden_state_;
Input override_input_;
- SCM eval_scm (SCM, char extra_token = 0);
+ SCM eval_scm (SCM, Input, char extra_token = 0);
public:
- SCM eval_scm_token (SCM sval) { return eval_scm (sval, '#'); }
+ SCM eval_scm_token (SCM sval, Input w)
+ {
+ w.step_forward ();
+ return eval_scm (sval, w, '#');
+ }
SCM extra_tokens_;
SCM *lexval_;
Input *lexloc_;
void start_main_input ();
- virtual void new_input (string s, Sources *);
- virtual void new_input (string s, string d, Sources *);
+ virtual void new_input (const string &s, Sources *);
+ virtual void new_input (const string &s, string d, Sources *);
bool top_input () { return include_stack_.size () < 2; }
SCM keyword_list () const;
- SCM lookup_identifier (string s);
+ SCM lookup_identifier (const string &s);
SCM lookup_identifier_symbol (SCM s);
- void push_extra_token (int token_type, SCM scm = SCM_UNSPECIFIED);
+ void push_extra_token (Input const &where,
+ int token_type, SCM scm = SCM_UNSPECIFIED);
+ int pop_extra_token ();
void push_chord_state (SCM alist);
void push_figuredbass_state ();
void push_lyric_state ();