Release: bump version.

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

diff --git a/lily/include/lily-parser.hh b/lily/include/lily-parser.hh
index 0387e2efd71cfdec019c5c844072e7c0d2ba1ecd..0281da55fdeed6f1045eaa30920574c2af14e3e3 100644 (file)
--- a/lily/include/lily-parser.hh
+++ b/lily/include/lily-parser.hh
@@ -33,9 +33,6 @@
 class Lily_parser
 {
   DECLARE_SMOBS (Lily_parser);
-  friend int yyparse (void *);
-
-  vector<Input> define_spots_;
 
   char const *here_str0 () const;
   Simultaneous_music *get_chord (Pitch tonic,
@@ -50,13 +47,14 @@ public:
   Sources *sources_;
   Duration default_duration_;
   string output_basename_;
+  SCM closures_;
 
   int fatal_error_;
   int error_level_;
   bool ignore_version_b_;
 
   Lily_parser (Sources *sources);
-  Lily_parser (Lily_parser const &);
+  Lily_parser (Lily_parser const &, SCM closures = SCM_EOL);
 
   DECLARE_SCHEME_CALLBACK (layout_description, ());
 
@@ -66,8 +64,11 @@ public:
   void include_string (string ly_code);
   void parse_file (string init, string name, string out_name);
   void parse_string (string ly_code);
+  SCM parse_string_expression (string ly_code, string filename, int line);
   void parser_error (string);
   void parser_error (Input const &, string);
+  // The following is called as yyerror
+  static void parser_error (Input const *i, Lily_parser *parser, string s);
   void set_yydebug (bool);
 
   SCM make_scope () const;