Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index d0a188ab69883d77fca0c278266a74ff67f9e4ac..994d185f6f36a9b9ff07239e4912443054a44bd4 100644 (file)
--- a/lily/include/lily-lexer.hh
+++ b/lily/include/lily-lexer.hh
@@ -21,7 +21,7 @@ void set_lexer ();
 
 class Lily_lexer : public Includable_lexer
 {
-  DECLARE_SMOBS (Lily_lexer,);
+  DECLARE_SMOBS (Lily_lexer);
 
 private:
   int lookup_keyword (string);
@@ -31,15 +31,18 @@ private:
   int identifier_type (SCM);
   char escaped_char (char) const;
 
+  Lily_parser *parser_;
   Keyword_table *keytable_;
   SCM scopes_;
   SCM start_module_;
+  int hidden_state_;
 public:
+  vector<int> extra_token_types_;
   string main_input_name_;
   void *lexval;
   Input *lexloc;
   bool is_main_input_;
-
+  
   Sources *sources_;
 
   /* Scheme hash tables with (oct name acc)  values, and symbol keys.  */
@@ -49,8 +52,8 @@ public:
   int error_level_;
   Input last_input_;
 
-  Lily_lexer (Sources *);
-  Lily_lexer (Lily_lexer const &);
+  Lily_lexer (Sources *, Lily_parser *);
+  Lily_lexer (Lily_lexer const &, Lily_parser *);
   int yylex ();
 
   void add_lexed_char (int);
@@ -61,12 +64,15 @@ public:
 
   void add_scope (SCM);
   SCM set_current_scope ();
+  bool has_scope () const;
   SCM remove_scope ();
 
   void start_main_input ();
 
+  SCM keyword_list () const;
   SCM lookup_identifier (string s);
   SCM lookup_identifier_symbol (SCM s);
+  void push_extra_token (int token_type);
   void push_chord_state (SCM tab);
   void push_figuredbass_state ();
   void push_lyric_state ();
@@ -76,6 +82,7 @@ public:
   void pop_state ();
   void LexerError (char const *);
   void set_identifier (SCM name_string, SCM);
+  int get_state () const;
   bool is_note_state () const;
   bool is_chord_state () const;
   bool is_lyric_state () const;