* lily/include/my-lily-parser.hh: rename My_lily -> Lily

[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 80c706d1ebad804b287b5bf73240059e30fc5c47..b3c32f6f5273938ae9a1221e63c3f0d3320541ee 100644 (file)
--- a/lily/include/my-lily-lexer.hh
+++ b/lily/include/my-lily-lexer.hh
@@ -1,13 +1,13 @@
 /*
-  lexer.hh -- declare My_lily_lexer
+  lexer.hh -- declare Lily_lexer
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#ifndef LEXER_HH
-#define LEXER_HH
+#ifndef MY_LILY_LEXER_HH
+#define MY_LILY_LEXER_HH
 
 #include "includable-lexer.hh"
 
@@ -18,34 +18,51 @@
 #include "string.hh"
 #include "duration.hh"
 #include "pitch.hh"
-#include "protected-scm.hh"
+#include "smobs.hh"
 
 bool busy_parsing ();
 void kill_lexer ();
 void set_lexer ();
 
-/// lexer for LilyPond
-class My_lily_lexer : public Includable_lexer 
+/*
+  TODO: this has a lot of SCM objects. Smobify me.
+ */
+class Lily_lexer : public Includable_lexer 
 {
-  Protected_scm scopes_;
+  DECLARE_SMOBS(Lily_lexer,);
+public:
+  SCM scopes_;
+  SCM encoding_;
+  
+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;
+
 public:
   String main_input_name_;
-  void * lexval;
+  void *lexval;
   bool main_input_b_;
+  
+  Sources *sources_; 
+
+  /* Scheme hash tables with (oct name acc)  values, and symbol keys.  */
+  SCM chordmodifier_tab_;
+  SCM pitchname_tab_stack_;
 
-  /*
-    Scheme hash tables with (oct name acc)  values, and symbol keys
-   */
-  Protected_scm chordmodifier_tab_;
-  Protected_scm pitchname_tab_stack_;
-  Keyword_table * keytable_;
-  int errorlevel_;
+  Keyword_table *keytable_;
+  int error_level_;
+  Input last_input_;
+
+  Lily_lexer (Sources*);
+  Lily_lexer (Lily_lexer const&);
+  ~Lily_lexer ();
 
-  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;
@@ -56,25 +73,22 @@ public:
   void start_main_input ();
 
   SCM lookup_identifier (String s);
-  void push_note_state (SCM tab);
+  SCM lookup_identifier_symbol (SCM s);
   void push_chord_state (SCM tab);
-  void push_markup_state ();
   void push_figuredbass_state ();
   void push_lyric_state ();
+  void push_initial_state ();
+  void push_markup_state ();
+  void push_note_state (SCM tab);
   void pop_state ();
   void LexerError (char const *);
+  void set_encoding (String);
+  SCM encoding () 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;
+  bool is_note_state () const;
+  bool is_chord_state () const;
+  bool is_lyric_state () const;
+  bool is_figure_state () const;
 };
 
-#endif
+#endif /* MY_LILY_LEXER_HH */