Merge remote-tracking branch 'origin/stable/2.16' into translation

[lilypond.git] / lily / include / lily-lexer.hh

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index a10d89cee31465a6f7bffd3acfecd627f96e4abc..caa3b4b44b5987f5c094b74a8ad96606a8c4b7d7 100644 (file)
--- a/lily/include/lily-lexer.hh
+++ b/lily/include/lily-lexer.hh
@@ -43,15 +43,16 @@ private:
   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_;
+  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_;
   Input *lexloc_;
@@ -91,12 +92,12 @@ public:
   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_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 *);