release: 1.5.8

[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 7832bb3c07ccf1385ad0a1df713f9d2e52c0cf46..b82571b20c04a99df03cb7b34deaba784b0d3a65 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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -16,7 +16,7 @@
 #include "lily-proto.hh"
 #include "lily-proto.hh"
 #include "duration.hh"
-#include "musical-pitch.hh"
+#include "pitch.hh"
 #include "string.hh"
 #include "array.hh"
 #include "input.hh"
@@ -31,9 +31,9 @@ class My_lily_parser
 {
 public:
   My_lily_parser (Sources * sources_l);
-  ~My_lily_parser();
+  ~My_lily_parser ();
 
-  void do_init_file();
+  void do_init_file ();
   void parse_file ( String init_str, String file_str);
   void set_version_check (bool ignore);
 
@@ -49,30 +49,30 @@ public:
   My_lily_lexer * lexer_p_;
   bool ignore_version_b_;
   
-  Input here_input() const;
-  void remember_spot();
-  Input pop_spot();
+  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_;
 
-  char const* here_ch_C() const;
+  char const* here_ch_C () const;
 
-  Simultaneous_music * get_chord (Musical_pitch tonic, Array<Musical_pitch>* add_arr_p,
-                                 Array<Musical_pitch>* sub_arr_p, Musical_pitch* inversion_p,
-                                 Musical_pitch* bass_p, Duration d);
+  Simultaneous_music * get_chord (Pitch tonic, Array<Pitch>* add_arr_p,
+                                 Array<Pitch>* sub_arr_p, Pitch* inversion_p,
+                                 Pitch* bass_p, Duration d);
   
   void set_chord_tremolo (int type_i);
   void set_last_duration (Duration const *);
-  void set_last_pitch (Musical_pitch const *);
+  void set_last_pitch (Pitch const *);
   friend int yyparse (void*);
 };