Imported Upstream version 2.16.0

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

diff --git a/lily/include/lily-parser.hh b/lily/include/lily-parser.hh
index fe589404607d74a129befe444dad9b512d4dba85..2e065ff31d70dd3b38e204ade3088484699ad6b2 100644 (file)
--- a/lily/include/lily-parser.hh
+++ b/lily/include/lily-parser.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -33,14 +33,11 @@
 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,
-                                vector<Pitch> *adds, vector<Pitch> *subs,
-                                Pitch *inversion, Pitch *bass, Duration d);
+                                 vector<Pitch> *adds, vector<Pitch> *subs,
+                                 Pitch *inversion, Pitch *bass, Duration d);
   void set_chord_tremolo (int type);
   void set_last_duration (Duration const *);
   void set_last_pitch (Pitch const *);
@@ -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,11 +64,14 @@ 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; 
+  SCM make_scope () const;
 };
 
 DECLARE_UNSMOB (Lily_parser, lily_parser);