X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flily-parser.hh;h=ed4673de78e6a3be16ac8f1a1a2f82aabc0c6af2;hb=9afca041a3068199609d98f580ffe2a175b90b0f;hp=55ee32a171931d02eefb001485b8ad135cc23ba2;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git

diff --git a/lily/include/lily-parser.hh b/lily/include/lily-parser.hh
index 55ee32a171..ed4673de78 100644
--- 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef LILY_PARSER_HH
@@ -11,7 +11,6 @@
 
 #include "duration.hh"
 #include "input.hh"
-#include "parray.hh"
 #include "pitch.hh"
 
 /**
@@ -22,16 +21,16 @@
 */
 class Lily_parser
 {
-  DECLARE_SMOBS (Lily_parser,);
+  DECLARE_SMOBS (Lily_parser);
   friend int yyparse (void *);
 
-  std::vector<Input> define_spots_;
+  vector<Input> define_spots_;
 
   char const *here_str0 () const;
   Simultaneous_music *get_chord (Pitch tonic,
-				 std::vector<Pitch> *adds, std::vector<Pitch> *subs,
+				 vector<Pitch> *adds, vector<Pitch> *subs,
 				 Pitch *inversion, Pitch *bass, Duration d);
-  void set_chord_tremolo (int type_i);
+  void set_chord_tremolo (int type);
   void set_last_duration (Duration const *);
   void set_last_pitch (Pitch const *);
 
@@ -39,7 +38,7 @@ public:
   Lily_lexer *lexer_;
   Sources *sources_;
   Duration default_duration_;
-  std::string output_basename_;
+  string output_basename_;
 
   int fatal_error_;
   int error_level_;
@@ -50,13 +49,16 @@ public:
 
   DECLARE_SCHEME_CALLBACK (layout_description, ());
 
+  void clear ();
   void do_init_file ();
   void do_yyparse ();
-  void parse_file (std::string init, std::string name, std::string out_name);
-  void parse_string (std::string ly_code);
-  void parser_error (std::string);
-  void parser_error (Input const &, std::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);
+
+  SCM make_scope () const; 
 };
 
 DECLARE_UNSMOB (Lily_parser, lily_parser);