release: 1.5.29

[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 6b659ad7d98fcc0a27f09eba22fd2d1a6dc71bba..9868a3f68614b9a613ebc6963e3a83e9463447a9 100644 (file)
--- a/lily/include/my-lily-lexer.hh
+++ b/lily/include/my-lily-lexer.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef LEXER_HH
@@ -11,52 +11,67 @@
 
 #include <FlexLexer.h>
 
+#include "dictionary.hh"
 #include "lily-proto.hh"
-#include "lily-proto.hh"
-#include "fproto.hh"
-#include "varray.hh"
+#include "flower-proto.hh"
+#include "array.hh"
 #include "string.hh"
 #include "includable-lexer.hh"
 #include "duration.hh"
+#include "pitch.hh"
+#include "protected-scm.hh"
 
-bool busy_parsing();
-void kill_lexer();
-void set_lexer();
-
+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);
-
-  bool post_quotes_b_;
-  char escaped_char(char) const;
+/// lexer for Lilypond
+class My_lily_lexer : public Includable_lexer 
+{
 public:
+  String main_input_str_;
   void * lexval_l;
-    
-  Notename_table  *note_tab_p_;
-  Dictionary<Identifier*> *identifier_p_dict_p_;
+  Scheme_hash_table * toplevel_variable_tab_;
+  Scope * scope_p_;
+  
+  bool main_input_b_;
+
+  /*
+    Scheme hash tables with (oct name acc)  values, and symbol keys
+   */
+  Protected_scm chordmodifier_tab_;
+  Protected_scm pitchname_tab_;
+  
+  Link_array<Scope> scope_l_arr_;
   Keyword_table * keytable_p_;
   int errorlevel_i_;
 
-  /* *************** */
+  My_lily_lexer ();
+  ~My_lily_lexer ();
+  int yylex ();
 
-  void clear_notenames();
-  Identifier*lookup_identifier (String s);
-  Melodic_req* lookup_melodic_req_l (String s);
-  void push_note_state();
-  void push_lyric_state();
-  void pop_state();
+  Input here_input () const;
+
+  void start_main_input ();
+
+  SCM lookup_identifier (String s);
+  void push_note_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,Identifier*i);
-  ~My_lily_lexer();
-  int yylex();
-  void print_declarations (bool init_b) const;
-  void add_notename (String, Melodic_req*);
-  bool note_state_b() const;
-  bool lyric_state_b() const;
+  void set_identifier (String str, 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);
+  int scan_escaped_word (String);
+
+  char escaped_char (char) const;
 };
 
 #endif