X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fparse-scm.hh;h=f6bff19a65ca526c300d38e5a15546c69ef6f6a9;hb=05286945fcf2083341d94fd18cf66393183ef276;hp=896559ea022f16172a01e1fe2a1ac38f64a70f11;hpb=a42c6862d08f8b65c4fe3a87d7b443302e7c2c58;p=lilypond.git diff --git a/lily/include/parse-scm.hh b/lily/include/parse-scm.hh index 896559ea02..f6bff19a65 100644 --- a/lily/include/parse-scm.hh +++ b/lily/include/parse-scm.hh @@ -1,22 +1,38 @@ +/* + lily-guile.hh encapsulate guile -#ifndef PARSE_SCM -#define PARSE_SCM + source file of the GNU LilyPond music typesetter + + (c) 2004--2009 Han-Wen Nienhuys +*/ + +#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_; + 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 */