Permit ly:parser-clone to receive an environment

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

diff --git a/lily/include/lily-parser.hh b/lily/include/lily-parser.hh
index c0943ccdbaba316907454897e0ecf307a2aee279..a98c760712cb6914f2a2c7b5ed36ddcbf3c272ec 100644 (file)
--- a/lily/include/lily-parser.hh
+++ b/lily/include/lily-parser.hh
@@ -1,9 +1,20 @@
 /*
-  lily-parser.hh -- declare Lily_parser
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2008 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef LILY_PARSER_HH
@@ -28,8 +39,8 @@ class Lily_parser
 
   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 *);
@@ -39,26 +50,29 @@ public:
   Sources *sources_;
   Duration default_duration_;
   string output_basename_;
+  SCM local_environment_;
 
   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 env = SCM_UNDEFINED);
 
   DECLARE_SCHEME_CALLBACK (layout_description, ());
 
   void clear ();
   void do_init_file ();
   void do_yyparse ();
+  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);
   void parser_error (string);
   void parser_error (Input const &, string);
   void set_yydebug (bool);
 
-  SCM make_scope () const; 
+  SCM make_scope () const;
 };
 
 DECLARE_UNSMOB (Lily_parser, lily_parser);