``slikken kreng''

[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 b0482d7458a45adce9ba35191c641a3bfb7f8e11..8d514f7b7d77b36b276675bf9e1fec534fb5ac29 100644 (file)
--- a/lily/include/my-lily-parser.hh
+++ b/lily/include/my-lily-parser.hh
@@ -30,23 +30,23 @@
 class My_lily_parser 
 {
 public:
-  My_lily_parser (Sources * sources_l);
+  My_lily_parser (Sources * sources);
   ~My_lily_parser ();
 
   void do_init_file ();
-  void parse_file ( String init_str, String file_str);
+  void parse_file ( String init_string, String file_string);
   void set_version_check (bool ignore);
 
 public:
   Duration default_duration_;
 
-  Scheme_hash_table *default_header_p_;
+  Scheme_hash_table *default_header_;
 
-  int fatal_error_i_;
-  Sources * source_l_;
-  int error_level_i_;
+  int fatal_error_;
+  Sources * source_;
+  int error_level_;
 
-  My_lily_lexer * lexer_p_;
+  My_lily_lexer * lexer_;
   bool ignore_version_b_;
 
   SCM last_beam_start_;
@@ -65,13 +65,13 @@ public:
   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 *);