grob.cc: rewrite O(n^2) algorithm in Grob::common_refpoint algorithm to O(n)

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

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index 72391a087748cdd676739a8ed2b3646547f077c7..2de3827443c5c0e63f6eeeb66d3af8666175bdc7 100644 (file)
--- a/lily/include/lily-lexer.hh
+++ b/lily/include/lily-lexer.hh
@@ -53,6 +53,7 @@ private:
   int scan_bare_word (string);
   SCM scan_markup_word (string);
   int scan_escaped_word (string);
+  int scan_scm_id (SCM);
   int identifier_type (SCM);
   char escaped_char (char) const;
 
@@ -62,7 +63,7 @@ private:
   SCM start_module_;
   int hidden_state_;
 public:
-  vector<int> extra_token_types_;
+  SCM extra_tokens_;
   void *lexval_;
   Input *lexloc_;
   bool is_main_input_;
@@ -101,7 +102,7 @@ public:
   SCM keyword_list () const;
   SCM lookup_identifier (string s);
   SCM lookup_identifier_symbol (SCM s);
-  void push_extra_token (int token_type);
+  void push_extra_token (int token_type, SCM scm = SCM_UNDEFINED);
   void push_chord_state (SCM tab);
   void push_figuredbass_state ();
   void push_lyric_state ();
@@ -110,6 +111,7 @@ public:
   void push_note_state (SCM tab);
   void pop_state ();
   void LexerError (char const *);
+  void LexerWarning (char const *);
   void set_identifier (SCM path, SCM val);
   int get_state () const;
   bool is_note_state () const;