* flower/include/std-string.hh:

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

diff --git a/lily/include/lily-parser.hh b/lily/include/lily-parser.hh
index f71e0c3ed57dc985e23f43013ecf5c91cd8a9e0c..c460ffcd09d870df96ec2b16b31a30b61dcfd136 100644 (file)
--- a/lily/include/lily-parser.hh
+++ b/lily/include/lily-parser.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef LILY_PARSER_HH
@@ -11,7 +11,7 @@
 
 #include "duration.hh"
 #include "input.hh"
-#include "parray.hh"
+#include "std-vector.hh"
 #include "pitch.hh"
 
 /**
@@ -25,11 +25,11 @@ class 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,10 +39,7 @@ public:
   Lily_lexer *lexer_;
   Sources *sources_;
   Duration default_duration_;
-  String output_basename_;
-
-  int score_count_;
-  int book_count_;
+  string output_basename_;
 
   int fatal_error_;
   int error_level_;
@@ -55,10 +52,10 @@ public:
 
   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);
 };
 
@@ -75,5 +72,6 @@ SCM ly_parser_scorify (SCM, SCM);
 Output_def *get_layout (Lily_parser *parser);
 Output_def *get_midi (Lily_parser *parser);
 Output_def *get_paper (Lily_parser *parser);
+SCM get_header (Lily_parser *parser);
 
 #endif /* LILY_PARSER_HH */