* input/regression/newaddlyrics.ly: New file.

[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 ddb7038294af0564451a9820b73924d301a90458..58afacb25786ae5d6c93d8ad1b420381ef5d5b49 100644 (file)
--- a/lily/include/my-lily-parser.hh
+++ b/lily/include/my-lily-parser.hh
@@ -3,23 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
 #ifndef MY_LILY_PARSER_HH
 #define MY_LILY_PARSER_HH
 
-#include "lily-proto.hh"
-#include "string.hh"
-#include "parray.hh"
-#include "lily-proto.hh"
-#include "lily-proto.hh"
+#include "array.hh"
 #include "duration.hh"
+#include "input.hh"
+#include "parray.hh"
 #include "pitch.hh"
+#include "protected-scm.hh"
+#include "smobs.hh"
 #include "string.hh"
-#include "array.hh"
-#include "input.hh"
 
 /**
    State for the parser.  Do not ever add any variables to parse
@@ -29,54 +26,56 @@
 */
 class My_lily_parser 
 {
-public:
-  My_lily_parser (Sources * sources_l);
-  ~My_lily_parser ();
+  DECLARE_SMOBS (My_lily_parser, );
+  friend int yyparse (void*);
 
-  void do_init_file ();
-  void parse_file ( String init_str, String file_str);
-  void set_version_check (bool ignore);
+  Array<Input> define_spots_;
+
+  char const* here_str0 () const;
+  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 *);
+  void set_last_pitch (Pitch const *);
 
 public:
+  My_lily_lexer *lexer_;
+  Sources *sources_;
   Duration default_duration_;
-
-  Scope *default_header_p_;
-
-  int fatal_error_i_;
-  Sources * source_l_;
-  int error_level_i_;
-
-  My_lily_lexer * lexer_p_;
+  String output_basename_;
+  Protected_scm header_;
+  int score_count_;
+  int book_count_;
+  int fatal_error_;
+  int error_level_;
   bool ignore_version_b_;
-
   SCM last_beam_start_;
-  void beam_check (SCM); 
+
+  My_lily_parser (Sources *sources);
+
+  DECLARE_SCHEME_CALLBACK (paper_description, ());
   
   Input here_input () const;
-  void push_spot ();
   Input pop_spot ();
-    
+  void beam_check (SCM); 
+  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 push_spot ();
   void set_yydebug (bool);
+};
 
+DECLARE_UNSMOB (My_lily_parser, my_lily_parser);
 
-  DECLARE_SCHEME_CALLBACK (paper_description, ());
-private:
-
-  Array<Input> define_spot_array_;
-
-  char const* here_ch_C () 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);
-  
-  void set_chord_tremolo (int type_i);
-  void set_last_duration (Duration const *);
-  void set_last_pitch (Pitch const *);
-  friend int yyparse (void*);
-};
+SCM ly_parse_file (SCM);
+SCM ly_parse_string (SCM);
+// SCM ly_parser_add_book_and_score (SCM, SCM);
+SCM ly_parser_print_book (SCM, SCM);
+SCM ly_parser_print_score (SCM, SCM);
+SCM ly_parser_bookify (SCM, SCM);
+SCM ly_parser_scorify (SCM, SCM);
 
-#endif // MY_LILY_PARSER_HH
+#endif /* MY_LILY_PARSER_HH */