X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Flily-parser-scheme.cc;h=f58f2ea0fad9a773b2c6da8f7979b4f35b54cba8;hb=e25438ded286dd6b48604e7c88ea1d81de3b1b27;hp=6e628d8ae89dabdf451f848444eb2addca1954f3;hpb=c3ff1c6cd20e15e9036ee7120012e05b1d62a46d;p=lilypond.git diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc index 6e628d8ae8..f58f2ea0fa 100644 --- a/lily/lily-parser-scheme.cc +++ b/lily/lily-parser-scheme.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2005--2007 Han-Wen Nienhuys + (c) 2005--2009 Han-Wen Nienhuys */ #include @@ -21,20 +21,10 @@ #include "sources.hh" #include "warn.hh" -/* Do not append `!' suffix, since 1st argument is not modified. */ -LY_DEFINE (ly_set_point_and_click, "ly:set-point-and-click", - 1, 0, 0, (SCM what), - "Deprecated.") -{ - (void) what; - warning (_f ("deprecated function called: %s", "ly:set-point-and-click")); - return SCM_UNSPECIFIED; -} - LY_DEFINE (ly_parse_file, "ly:parse-file", 1, 0, 0, (SCM name), - "Parse a single @code{.ly} file. " - "Upon failure, throw @code{ly-file-failed} key.") + "Parse a single @code{.ly} file." + " Upon failure, throw @code{ly-file-failed} key.") { LY_ASSERT_TYPE (scm_is_string, name, 1); string file = ly_scm2string (name); @@ -47,41 +37,33 @@ LY_DEFINE (ly_parse_file, "ly:parse-file", file name. */ File_name out_file_name (file_name); - global_path.append (out_file_name.dir_); - out_file_name.ext_ = ""; out_file_name.root_ = ""; - out_file_name.dir_ = ""; + if (ly_get_option (ly_symbol2scm ("gui")) != SCM_BOOL_T + && ly_get_option (ly_symbol2scm ("strip-output-dir")) == SCM_BOOL_T) { + out_file_name.dir_ = ""; + } /* When running from gui, generate output in .ly source directory. */ - if (output_name_global.empty () - && ly_get_option (ly_symbol2scm ("gui")) == SCM_BOOL_T) + string output_name = output_name_global; + if (!output_name.empty ()) { - File_name f (file); - f.base_ = ""; - f.ext_ = ""; - output_name_global = f.to_string (); - } - - if (!output_name_global.empty ()) - { - /* Interpret --output=DIR to mean --output=DIR/BASE. */ string dir; - if (is_dir (output_name_global)) + if (is_dir (output_name)) { - dir = output_name_global; - output_name_global = ""; + dir = output_name; + output_name = ""; } else { - File_name out (output_name_global); + File_name out (output_name); if (is_dir (out.dir_part ())) { dir = out.dir_part (); out_file_name = out.file_part (); } - } + } if (dir != "" && dir != "." && dir != get_working_directory ()) { @@ -91,7 +73,7 @@ LY_DEFINE (ly_parse_file, "ly:parse-file", chdir (dir.c_str ()); } else - out_file_name = File_name (output_name_global); + out_file_name = File_name (output_name); } string init; @@ -101,7 +83,6 @@ LY_DEFINE (ly_parse_file, "ly:parse-file", init = "init.ly"; string out_file = out_file_name.to_string (); - if (init.length () && global_path.find (init).empty ()) { warning (_f ("cannot find init file: `%s'", init)); @@ -137,13 +118,13 @@ LY_DEFINE (ly_parse_file, "ly:parse-file", } /* - outside the if-else to ensure cleanup fo Sources object, + 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 (ly_string2scm (file_name))); - + return SCM_UNSPECIFIED; } @@ -171,25 +152,25 @@ LY_DEFINE (ly_parser_define_x, "ly:parser-define!", 3, 0, 0, (SCM parser_smob, SCM symbol, SCM val), "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); 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. " - "Undefined is '().") + "Look up @var{symbol} in @var{parser-smob}'s module." + " Return @code{'()} if not defined.") { LY_ASSERT_SMOB (Lily_parser, parser_smob, 1); 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))); @@ -201,11 +182,11 @@ 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 @code{ly-code} with @code{parser-smob}." - "Upon failure, throw @code{ly-file-failed} key.") + "Parse the string @var{ly-code} with @var{parser-smob}." + " Upon failure, throw @code{ly-file-failed} key.") { LY_ASSERT_SMOB (Lily_parser, parser_smob, 1); - Lily_parser *parser = unsmob_lily_parser (parser_smob); + Lily_parser *parser = unsmob_lily_parser (parser_smob); LY_ASSERT_TYPE (scm_is_string, ly_code, 2); parser->parse_string (ly_scm2string (ly_code)); @@ -215,9 +196,9 @@ LY_DEFINE (ly_parser_parse_string, "ly:parser-parse-string", LY_DEFINE (ly_parser_set_note_names, "ly:parser-set-note-names", 2, 0, 0, (SCM parser, SCM names), - "Replace current note names in @var{parser}. " - "@var{names} is an alist of symbols. " - "This only has effect if the current mode is notes.") + "Replace current note names in @var{parser}." + " @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); @@ -243,14 +224,14 @@ LY_DEFINE (ly_parser_output_name, "ly:parser-output-name", 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") + "Display an error message and make the parser fail.") { LY_ASSERT_SMOB (Lily_parser, parser, 1); Lily_parser *p = unsmob_lily_parser (parser); - + LY_ASSERT_TYPE (scm_is_string, msg, 2); string s = ly_scm2string (msg); - + Input *i = unsmob_input (input); if (i) p->parser_error (*i, s); @@ -266,11 +247,11 @@ LY_DEFINE (ly_parser_clear_error, "ly:parser-clear-error", { 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; }