Run grand-replace for 2010.

[lilypond.git] / lily / include / parse-scm.hh

diff --git a/lily/include/parse-scm.hh b/lily/include/parse-scm.hh
index 9a33271b4ec39db75fe7208fb48021b26e7db280..bca57f6885f5f474f286171b88fc098bcc90a7e9 100644 (file)
--- a/lily/include/parse-scm.hh
+++ b/lily/include/parse-scm.hh
@@ -1,20 +1,49 @@
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-#ifndef PARSE_SCM
-#define PARSE_SCM
+  Copyright (C) 2004--2010 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 PARSE_SCM_HH
+#define PARSE_SCM_HH
 
 #include "input.hh"
 #include "lily-guile.hh"
 
+extern bool parse_protect_global;
+extern bool parsed_objects_should_be_dead;
+
 struct Parse_start
 {
-  char const* str;
+  char const *str;
   int nchars;
-  Input start_location;
+  Input start_location_;
+  bool safe_;
+  Lily_parser *parser_;
+
+  Parse_start() {
+    str = 0;
+    nchars = 0;
+    safe_ = false;
+    parser_ = 0;
+  }     
 };
 
 SCM catch_protected_parse_body (void *);
-SCM protected_ly_parse_scm (Parse_start *);
-
-SCM ly_parse_scm (char const* s, int *, Input);
+SCM protected_ly_parse_scm (Parse_start *, bool);
+SCM ly_parse_scm (char const *, int *, Input, bool, Lily_parser *);
 
-#endif
+#endif /* PARSE_SCM_HH */