Merge with master

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

diff --git a/lily/include/parse-scm.hh b/lily/include/parse-scm.hh
index 9a33271b4ec39db75fe7208fb48021b26e7db280..2939bc2f5c228702476732a828343257e8c586c9 100644 (file)
--- a/lily/include/parse-scm.hh
+++ b/lily/include/parse-scm.hh
@@ -1,20 +1,30 @@
+/*
+  lily-guile.hh encapsulate guile
 
-#ifndef PARSE_SCM
-#define PARSE_SCM
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
+#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_;
 };
 
 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);
 
-#endif
+#endif /* PARSE_SCM_HH */