* Another grand 2003 update.

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

diff --git a/lily/include/my-lily-lexer.hh b/lily/include/my-lily-lexer.hh
index 5b5d17c008f2f5ff4dcfa579ea76576fbd0e9828..f416eecfa9c8dbe90e980dd70a674bc24b765ad8 100644 (file)
--- a/lily/include/my-lily-lexer.hh
+++ b/lily/include/my-lily-lexer.hh
@@ -3,65 +3,79 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef LEXER_HH
 #define LEXER_HH
 
-#include <FlexLexer.h>
+#include "includable-lexer.hh"
 
+#include "input.hh"
 #include "dictionary.hh"
 #include "lily-proto.hh"
-#include "lily-proto.hh"
-#include "fproto.hh"
+#include "flower-proto.hh"
 #include "array.hh"
 #include "string.hh"
-#include "includable-lexer.hh"
 #include "duration.hh"
-#include "musical-pitch.hh"
-
-bool busy_parsing();
-void kill_lexer();
-void set_lexer();
+#include "pitch.hh"
+#include "protected-scm.hh"
 
+bool busy_parsing ();
+void kill_lexer ();
+void set_lexer ();
 
-/// lexer for Mudela
-class My_lily_lexer : public Includable_lexer {
-  int lookup_keyword (String);
-  int scan_bare_word (String);
-  int scan_escaped_word (String);
-
-  char escaped_char(char) const;
+/// lexer for Lilypond
+class My_lily_lexer : public Includable_lexer 
+{
+  Protected_scm scopes_;
 public:
-  String main_input_str_;
-  void * lexval_l;
-  Scope * toplevel_scope_p_;
-  
-  Notename_table *note_tab_p_;
-  Array<Scope*> scope_l_arr_;
-  Keyword_table * keytable_p_;
-  int errorlevel_i_;
+  String main_input_string_;
+  void * lexval;
+  bool main_input_b_;
+
+  /*
+    Scheme hash tables with (oct name acc)  values, and symbol keys
+   */
+  Protected_scm chordmodifier_tab_;
+  Protected_scm pitchname_tab_;
+  Keyword_table * keytable_;
+  int errorlevel_;
 
-  /* *************** */
+  My_lily_lexer ();
+  ~My_lily_lexer ();
+  int yylex ();
 
+  Input last_input_;
+  void prepare_for_next_token ();
+  int try_special_identifiers (SCM* ,SCM);
+  Input here_input () const;
+  
+  void add_scope (SCM);
+  SCM remove_scope ();
+  
   void start_main_input ();
-  void set_notename_table(Notename_table*tab_p);
-  bool notename_b(String) const;
-  Identifier*lookup_identifier (String s);
-  Musical_pitch lookup_pitch (String s);
-  void push_note_state();
-  void push_lyric_state();
-  void pop_state();
+
+  SCM lookup_identifier (String s);
+  void push_note_state ();
+  void push_markup_state ();
+  void push_figuredbass_state ();
+  void push_chord_state ();
+  void push_lyric_state ();
+  void pop_state ();
   void LexerError (char const *);
-  My_lily_lexer();
-  void set_identifier (String str, Identifier* i, bool unique_b = true);
-  ~My_lily_lexer();
-  int yylex();
-  void print_declarations (bool init_b) const;
-  void add_notename (String, Musical_pitch);
-  bool note_state_b() const;
-  bool lyric_state_b() const;
+  void set_identifier (SCM name_string, SCM);
+  bool note_state_b () const;
+  bool chord_state_b () const;
+  bool lyric_state_b () const;
+  bool figure_state_b () const;
+private:
+  int lookup_keyword (String);
+  int scan_bare_word (String);
+  SCM scan_markup_word (String);
+  int scan_escaped_word (String);
+  int identifier_type (SCM);
+  char escaped_char (char) const;
 };
 
 #endif