X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fparse-scm.hh;fp=lily%2Finclude%2Fparse-scm.hh;h=047399a3222dfa73379642e805e3e1cbf0d01119;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=0322502e16fbcc4acd1ac88f6066794ca246c3d8;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git diff --git a/lily/include/parse-scm.hh b/lily/include/parse-scm.hh index 0322502e16..047399a322 100644 --- a/lily/include/parse-scm.hh +++ b/lily/include/parse-scm.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2004--2011 Han-Wen Nienhuys + Copyright (C) 2004--2012 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,18 +32,24 @@ struct Parse_start int nchars; Input start_location_; bool safe_; + SCM (*func_) (Parse_start *ps); + SCM form_; Lily_parser *parser_; - Parse_start() { + Parse_start () + { str = 0; nchars = 0; safe_ = false; parser_ = 0; - } + form_ = SCM_UNDEFINED; + func_ = 0; + } }; SCM catch_protected_parse_body (void *); SCM protected_ly_parse_scm (Parse_start *, bool); SCM ly_parse_scm (char const *, int *, Input, bool, Lily_parser *); +SCM ly_eval_scm (SCM, Input, bool, Lily_parser *); #endif /* PARSE_SCM_HH */