X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-parser-scheme.cc;h=6e628d8ae89dabdf451f848444eb2addca1954f3;hb=29ba94b31044c22fe426305e6daf541203c8c2e7;hp=a1cdfa3c035f9b5d7d26db9f3d81f7928f9930bd;hpb=7785ac382ed511ed535adf77adc3c07649fbc9b5;p=lilypond.git diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc index a1cdfa3c03..6e628d8ae8 100644 --- a/lily/lily-parser-scheme.cc +++ b/lily/lily-parser-scheme.cc @@ -3,22 +3,22 @@ source file of the GNU LilyPond music typesetter - (c) 2005--2006 Han-Wen Nienhuys + (c) 2005--2007 Han-Wen Nienhuys */ #include +#include "lily-parser.hh" + #include "file-name-map.hh" #include "file-name.hh" #include "file-path.hh" -#include "input.hh" #include "international.hh" #include "lily-lexer.hh" -#include "lily-parser.hh" #include "ly-module.hh" #include "main.hh" #include "program-option.hh" -#include "source.hh" +#include "sources.hh" #include "warn.hh" /* Do not append `!' suffix, since 1st argument is not modified. */ @@ -36,7 +36,7 @@ LY_DEFINE (ly_parse_file, "ly:parse-file", "Parse a single @code{.ly} file. " "Upon failure, throw @code{ly-file-failed} key.") { - SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string"); + LY_ASSERT_TYPE (scm_is_string, name, 1); string file = ly_scm2string (name); char const *extensions[] = {"ly", "", 0}; @@ -86,7 +86,7 @@ LY_DEFINE (ly_parse_file, "ly:parse-file", if (dir != "" && dir != "." && dir != get_working_directory ()) { global_path.prepend (get_working_directory ()); - message (_f ("Changing working directory to `%s'", + message (_f ("Changing working directory to: `%s'", dir.c_str ())); chdir (dir.c_str ()); } @@ -104,7 +104,7 @@ LY_DEFINE (ly_parse_file, "ly:parse-file", if (init.length () && global_path.find (init).empty ()) { - warning (_f ("can't find init file: `%s'", init)); + warning (_f ("cannot find init file: `%s'", init)); warning (_f ("(search path: `%s')", global_path.to_string ().c_str ())); exit (2); @@ -114,7 +114,7 @@ LY_DEFINE (ly_parse_file, "ly:parse-file", bool error = false; if ((file_name != "-") && file_name.empty ()) { - warning (_f ("can't find file: `%s'", file)); + warning (_f ("cannot find file: `%s'", file)); error = true; } else @@ -138,63 +138,59 @@ LY_DEFINE (ly_parse_file, "ly:parse-file", /* outside the if-else to ensure cleanup fo Sources object, - */ + */ if (error) /* TODO: pass renamed input file too. */ scm_throw (ly_symbol2scm ("ly-file-failed"), - scm_list_1 (scm_makfrom0str (file_name.c_str ()))); + scm_list_1 (ly_string2scm (file_name))); return SCM_UNSPECIFIED; } -LY_DEFINE (ly_parse_string, "ly:parse-string", - 1, 0, 0, (SCM ly_code), - "Parse the string LY_CODE. " - "Upon failure, throw @code{ly-file-failed} key.") -{ - SCM_ASSERT_TYPE (scm_is_string (ly_code), ly_code, SCM_ARG1, __FUNCTION__, "string"); - - Sources sources; - sources.set_path (&global_path); - Lily_parser *parser = new Lily_parser (&sources); - parser->parse_string (ly_scm2string (ly_code)); - parser->unprotect (); - parser = 0; - return SCM_UNSPECIFIED; +LY_DEFINE (ly_parser_lexer, "ly:parser-lexer", + 1, 0, 0, (SCM parser_smob), + "Return the lexer for @var{parser-smob}.") +{ + Lily_parser *parser = unsmob_lily_parser (parser_smob); + return parser->lexer_->self_scm (); } -LY_DEFINE (ly_clone_parser, "ly:clone-parser", +LY_DEFINE (ly_parser_clone, "ly:parser-clone", 1, 0, 0, (SCM parser_smob), - "Return a clone of PARSER_SMOB.") + "Return a clone of @var{parser-smob}.") { + LY_ASSERT_SMOB (Lily_parser, parser_smob, 1); Lily_parser *parser = unsmob_lily_parser (parser_smob); Lily_parser *clone = new Lily_parser (*parser); return clone->unprotect (); } -LY_DEFINE (ly_parser_define, "ly:parser-define!", +LY_DEFINE (ly_parser_define_x, "ly:parser-define!", 3, 0, 0, (SCM parser_smob, SCM symbol, SCM val), - "Bind SYMBOL to VAL in PARSER_SMOB's module.") + "Bind @var{symbol} to @var{val} in @var{parser-smob}'s module.") { + + LY_ASSERT_SMOB (Lily_parser, parser_smob, 1); Lily_parser *parser = unsmob_lily_parser (parser_smob); - SCM_ASSERT_TYPE (scm_is_symbol (symbol), symbol, SCM_ARG2, __FUNCTION__, "symbol"); - SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG2, __FUNCTION__, "parser"); + LY_ASSERT_TYPE (ly_is_symbol, symbol, 2); + parser->lexer_->set_identifier (scm_symbol_to_string (symbol), val); return SCM_UNSPECIFIED; } LY_DEFINE (ly_parser_lookup, "ly:parser-lookup", 2, 0, 0, (SCM parser_smob, SCM symbol), - "Lookup @var{symbol} in @var{parser_smob}'s module. " + "Lookup @var{symbol} in @var{parser-smob}'s module. " "Undefined is '().") { - Lily_parser *parser = unsmob_lily_parser (parser_smob); + LY_ASSERT_SMOB (Lily_parser, parser_smob, 1); - SCM_ASSERT_TYPE (scm_is_symbol (symbol), symbol, SCM_ARG2, __FUNCTION__, "symbol"); - SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG2, __FUNCTION__, "parser"); + Lily_parser *parser = unsmob_lily_parser (parser_smob); + + LY_ASSERT_TYPE (ly_is_symbol, symbol, 2); SCM val = parser->lexer_->lookup_identifier (ly_scm2string (scm_symbol_to_string (symbol))); if (val != SCM_UNDEFINED) @@ -205,13 +201,12 @@ LY_DEFINE (ly_parser_lookup, "ly:parser-lookup", LY_DEFINE (ly_parser_parse_string, "ly:parser-parse-string", 2, 0, 0, (SCM parser_smob, SCM ly_code), - "Parse the string LY_CODE with PARSER_SMOB." + "Parse the string @code{ly-code} with @code{parser-smob}." "Upon failure, throw @code{ly-file-failed} key.") { - Lily_parser *parser = unsmob_lily_parser (parser_smob); - - SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG1, __FUNCTION__, "parser"); - SCM_ASSERT_TYPE (scm_is_string (ly_code), ly_code, SCM_ARG2, __FUNCTION__, "string"); + LY_ASSERT_SMOB (Lily_parser, parser_smob, 1); + Lily_parser *parser = unsmob_lily_parser (parser_smob); + LY_ASSERT_TYPE (scm_is_string, ly_code, 2); parser->parse_string (ly_scm2string (ly_code)); @@ -224,8 +219,8 @@ LY_DEFINE (ly_parser_set_note_names, "ly:parser-set-note-names", "@var{names} is an alist of symbols. " "This only has effect if the current mode is notes.") { + LY_ASSERT_SMOB (Lily_parser, parser, 1); Lily_parser *p = unsmob_lily_parser (parser); - SCM_ASSERT_TYPE (p, parser, SCM_ARG1, __FUNCTION__, "Lilypond parser"); if (p->lexer_->is_note_state ()) { @@ -240,19 +235,20 @@ LY_DEFINE (ly_parser_output_name, "ly:parser-output-name", 1, 0, 0, (SCM parser), "Return the base name of the output file.") { + LY_ASSERT_SMOB (Lily_parser, parser, 1); Lily_parser *p = unsmob_lily_parser (parser); - SCM_ASSERT_TYPE (p, parser, SCM_ARG1, __FUNCTION__, "Lilypond parser"); - return scm_makfrom0str (p->output_basename_.c_str ()); + return ly_string2scm (p->output_basename_); } LY_DEFINE (ly_parser_error, "ly:parser-error", 2, 1, 0, (SCM parser, SCM msg, SCM input), "Display an error message, and make the parser fail") { + LY_ASSERT_SMOB (Lily_parser, parser, 1); Lily_parser *p = unsmob_lily_parser (parser); - SCM_ASSERT_TYPE (p, parser, SCM_ARG1, __FUNCTION__, "Lilypond parser"); - SCM_ASSERT_TYPE (scm_is_string (msg), msg, SCM_ARG2, __FUNCTION__, "string"); + + LY_ASSERT_TYPE (scm_is_string, msg, 2); string s = ly_scm2string (msg); Input *i = unsmob_input (input); @@ -263,3 +259,27 @@ LY_DEFINE (ly_parser_error, "ly:parser-error", return parser; } + +LY_DEFINE (ly_parser_clear_error, "ly:parser-clear-error", + 1, 0, 0, (SCM parser), + "Clear the error flag for the parser.") +{ + LY_ASSERT_SMOB (Lily_parser, parser, 1); + Lily_parser *p = unsmob_lily_parser (parser); + + + p->error_level_ = 0; + p->lexer_->error_level_ = 0; + + return SCM_UNSPECIFIED; +} + +LY_DEFINE (ly_parser_has_error_p, "ly:parser-has-error?", + 1, 0, 0, (SCM parser), + "Does @var{parser} have an error flag?") +{ + LY_ASSERT_SMOB (Lily_parser, parser, 1); + Lily_parser *p = unsmob_lily_parser (parser); + + return scm_from_bool (p->error_level_ || p->lexer_->error_level_); +}