2003 -> 2004

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

diff --git a/lily/include/my-lily-parser.hh b/lily/include/my-lily-parser.hh
index 679c3811813fa998ab2e4c14e7ced06dc5753ecf..b98bc843ba01ed824e567a584e79a7656ba7ba89 100644 (file)
--- a/lily/include/my-lily-parser.hh
+++ b/lily/include/my-lily-parser.hh
@@ -1,65 +1,82 @@
 /*
-  my-lily-parser.hh -- declare 
+  my-lily-parser.hh -- declare My_lily_parser
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef MY_LILY_PARSER_HH
 #define MY_LILY_PARSER_HH
-#include "proto.hh"
-#include "duration.hh"
+
+#include "lily-proto.hh"
 #include "string.hh"
-#include "varray.hh"
+#include "parray.hh"
+#include "lily-proto.hh"
 #include "lily-proto.hh"
-#include "proto.hh"
 #include "duration.hh"
+#include "pitch.hh"
 #include "string.hh"
-#include "varray.hh"
+#include "array.hh"
+#include "input.hh"
+
+/**
+   State for the parser.  Do not ever add any variables to parse
+   musical content here.  We still have to remove default_duration_.
 
-class My_lily_parser {
+   TODO: interface is too complicated
+*/
+class My_lily_parser 
+{
 public:
-    friend int yyparse( void*);
-   
-    int default_octave_i_;
-    Duration default_duration_;
-    String textstyle_str_;
-    
-    bool last_duration_mode ;
-
-    Array<Request*> pre_reqs, post_reqs;
-    Array<const char *> define_spot_array_;
-    char const* defined_ch_C_;
-    int fatal_error_i_;
-    Sources * source_l_;
-    int error_level_i_;
-    bool init_parse_b_;
-    My_lily_lexer * lexer_p_;
- 
-    Moment plet_mom();
-    void add_requests( Voice_element*v);
-
-    Voice_element * get_note_element(Note_req * ,Duration *);
-    Voice_element* get_rest_element(String,Duration *);
-    Voice_element* get_word_element(Text_def*, Duration*);
-    void set_last_duration(Duration const *);
-    void set_duration_mode(String s);
-    char const* here_ch_C()const;
-    void remember_spot();
-    Paper_def*default_paper();
-    void do_yyparse();
-    void parser_error(String);
-
-    Request* get_parens_request(char c);
-    
-    void set_debug();
-    void set_yydebug(bool);
-    void print_declarations();
+  My_lily_parser (Input_file_results * sources);
+  ~My_lily_parser ();
+
+  void do_init_file ();
+  void parse_file (String init, String file, String out_name);
+
 public:
-    void parse_file ( String init_str, String file_str);
-    My_lily_parser(Sources * sources_l);
+  Duration default_duration_;
+  String output_basename_;
+  
+  Scheme_hash_table *default_header_;
+
+  int fatal_error_;
+  Input_file_results * input_file_;
+  int error_level_;
+
+  My_lily_lexer * lexer_;
+  bool ignore_version_b_;
+
+  SCM last_beam_start_;
+  void beam_check (SCM); 
+
+  Input here_input () const;
+  void push_spot ();
+  Input pop_spot ();
+    
+  void do_yyparse ();
+  void parser_error (String);
+
+  void set_yydebug (bool);
+
+
+  DECLARE_SCHEME_CALLBACK (paper_description, ());
+private:
+
+  Array<Input> define_spots_;
+
+  char const* here_str0 () const;
+
+  Simultaneous_music * get_chord (Pitch tonic, Array<Pitch>* adds,
+                                 Array<Pitch>* subs, Pitch* inversion,
+                                 Pitch* bass, Duration d);
+  
+  void set_chord_tremolo (int type_i);
+  void set_last_duration (Duration const *);
+  void set_last_pitch (Pitch const *);
+  friend int yyparse (void*);
 };
 
 #endif // MY_LILY_PARSER_HH