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 bd5b82159bcc03c2993cd3db8e5ff2fe5f586444..b98bc843ba01ed824e567a584e79a7656ba7ba89 100644 (file)
--- a/lily/include/my-lily-parser.hh
+++ b/lily/include/my-lily-parser.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -30,45 +30,48 @@
 class My_lily_parser 
 {
 public:
-  My_lily_parser (Sources * sources_l);
-  ~My_lily_parser();
+  My_lily_parser (Input_file_results * sources);
+  ~My_lily_parser ();
 
-  void do_init_file();
-  void parse_file ( String init_str, String file_str);
-  void set_version_check (bool ignore);
+  void do_init_file ();
+  void parse_file (String init, String file, String out_name);
 
 public:
   Duration default_duration_;
+  String output_basename_;
+  
+  Scheme_hash_table *default_header_;
 
-  Scope *default_header_p_;
-
-  int fatal_error_i_;
-  Sources * source_l_;
-  int error_level_i_;
+  int fatal_error_;
+  Input_file_results * input_file_;
+  int error_level_;
 
-  My_lily_lexer * lexer_p_;
+  My_lily_lexer * lexer_;
   bool ignore_version_b_;
-  
-  Input here_input() const;
-  void remember_spot();
-  Input pop_spot();
+
+  SCM last_beam_start_;
+  void beam_check (SCM); 
+
+  Input here_input () const;
+  void push_spot ();
+  Input pop_spot ();
     
-  void do_yyparse();
+  void do_yyparse ();
   void parser_error (String);
 
   void set_yydebug (bool);
 
 
-  DECLARE_SCHEME_CALLBACK(paper_description, ());
+  DECLARE_SCHEME_CALLBACK (paper_description, ());
 private:
 
-  Array<Input> define_spot_array_;
+  Array<Input> define_spots_;
 
-  char const* here_ch_C() const;
+  char const* here_str0 () const;
 
-  Simultaneous_music * get_chord (Pitch tonic, Array<Pitch>* add_arr_p,
-                                 Array<Pitch>* sub_arr_p, Pitch* inversion_p,
-                                 Pitch* bass_p, Duration d);
+  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 *);