X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fparse-scm.hh;h=f6bff19a65ca526c300d38e5a15546c69ef6f6a9;hb=4b33e5b532de8c54c6461b9b6b4b509f8e3561f5;hp=79ef343ebf1f014230e06368e3f895074645b8c8;hpb=d3b59ed445baf28ffd933df4620d5bc143f862ec;p=lilypond.git diff --git a/lily/include/parse-scm.hh b/lily/include/parse-scm.hh index 79ef343ebf..f6bff19a65 100644 --- a/lily/include/parse-scm.hh +++ b/lily/include/parse-scm.hh @@ -3,8 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2004 Han-Wen Nienhuys - + (c) 2004--2009 Han-Wen Nienhuys */ #ifndef PARSE_SCM_HH @@ -14,17 +13,26 @@ #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_; 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 *, bool); -SCM ly_parse_scm (char const *, int *, Input, bool); +SCM ly_parse_scm (char const *, int *, Input, bool, Lily_parser *); #endif /* PARSE_SCM_HH */