clean up Sources

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

diff --git a/lily/include/lily-parser.hh b/lily/include/lily-parser.hh
index a6a151beb6df4869629c00116e17a5fb597ef495..d4557e368826cfb7a195070c89303b794cf9e755 100644 (file)
--- a/lily/include/lily-parser.hh
+++ b/lily/include/lily-parser.hh
@@ -11,7 +11,7 @@
 
 #include "duration.hh"
 #include "input.hh"
-#include "parray.hh"
+#include "std-vector.hh"
 #include "pitch.hh"
 
 /**
@@ -22,14 +22,14 @@
 */
 class Lily_parser
 {
-  DECLARE_SMOBS (Lily_parser,);
+  DECLARE_SMOBS (Lily_parser);
   friend int yyparse (void *);
 
-  Array<Input> define_spots_;
+  vector<Input> define_spots_;
 
   char const *here_str0 () const;
   Simultaneous_music *get_chord (Pitch tonic,
-                                Array<Pitch> *adds, Array<Pitch> *subs,
+                                vector<Pitch> *adds, vector<Pitch> *subs,
                                 Pitch *inversion, Pitch *bass, Duration d);
   void set_chord_tremolo (int type_i);
   void set_last_duration (Duration const *);
@@ -39,7 +39,7 @@ public:
   Lily_lexer *lexer_;
   Sources *sources_;
   Duration default_duration_;
-  String output_basename_;
+  string output_basename_;
 
   int fatal_error_;
   int error_level_;
@@ -50,12 +50,13 @@ public:
 
   DECLARE_SCHEME_CALLBACK (layout_description, ());
 
+  void clear ();
   void do_init_file ();
   void do_yyparse ();
-  void parse_file (String init, String name, String out_name);
-  void parse_string (String ly_code);
-  void parser_error (String);
-  void parser_error (Input const &, String);
+  void parse_file (string init, string name, string out_name);
+  void parse_string (string ly_code);
+  void parser_error (string);
+  void parser_error (Input const &, string);
   void set_yydebug (bool);
 };