X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-parser-scheme.cc;h=83c3826dbdf7bf625f4becc951695b18e19a2d01;hb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;hp=d77dcb3bc35edeeb8bf7dbc693cda802d674ed10;hpb=57be7394ffa2e7d7ba6d60548dba563f3409d472;p=lilypond.git diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc index d77dcb3bc3..83c3826dbd 100644 --- a/lily/lily-parser-scheme.cc +++ b/lily/lily-parser-scheme.cc @@ -3,23 +3,22 @@ source file of the GNU LilyPond music typesetter - (c) 2005 Han-Wen Nienhuys + (c) 2005--2006 Han-Wen Nienhuys */ +#include + +#include "file-name-map.hh" #include "file-name.hh" #include "file-path.hh" -#include "main.hh" -#include "lily-parser.hh" -#include "warn.hh" -#include "source.hh" +#include "international.hh" #include "lily-lexer.hh" -#include "score.hh" -#include "lilypond-key.hh" +#include "lily-parser.hh" #include "ly-module.hh" -#include "output-def.hh" -#include "book.hh" -#include "paper-book.hh" -#include "file-name-map.hh" +#include "main.hh" +#include "program-option.hh" +#include "source.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", @@ -37,10 +36,10 @@ LY_DEFINE (ly_parse_file, "ly:parse-file", "Upon failure, throw @code{ly-file-failed} key.") { SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string"); - char const *file = scm_i_string_chars (name); + string file = ly_scm2string (name); char const *extensions[] = {"ly", "", 0}; - String file_name = global_path.find (file, extensions); + string file_name = global_path.find (file, extensions); /* By default, use base name of input file for output file name, write output to cwd; do not use root and directory parts of input @@ -53,52 +52,97 @@ LY_DEFINE (ly_parse_file, "ly:parse-file", out_file_name.root_ = ""; out_file_name.dir_ = ""; - if (!output_name_global.is_empty ()) - out_file_name = File_name (output_name_global); + /* When running from gui, generate output in .ly source directory. */ + if (output_name_global.empty () + && ly_get_option (ly_symbol2scm ("gui")) == SCM_BOOL_T) + { + File_name f (file); + f.base_ = ""; + f.ext_ = ""; + output_name_global = f.to_string (); + } - String init; - if (!init_name_global.is_empty ()) + if (!output_name_global.empty ()) + { + + /* Interpret --output=DIR to mean --output=DIR/BASE. */ + string dir; + if (is_dir (output_name_global)) + { + dir = output_name_global; + output_name_global = ""; + } + else + { + File_name out (output_name_global); + if (is_dir (out.dir_part ())) + { + dir = out.dir_part (); + out_file_name = out.file_part (); + } + } + + if (dir != "" && dir != "." && dir != get_working_directory ()) + { + global_path.prepend (get_working_directory ()); + message (_f ("Changing working directory to `%s'", + dir.c_str ())); + chdir (dir.c_str ()); + } + else + out_file_name = File_name (output_name_global); + } + + string init; + if (!init_name_global.empty ()) init = init_name_global; else init = "init.ly"; - String out_file = out_file_name.to_string (); + string out_file = out_file_name.to_string (); - if (init.length () && global_path.find (init).is_empty ()) + if (init.length () && global_path.find (init).empty ()) { warning (_f ("can't find init file: `%s'", init)); warning (_f ("(search path: `%s')", - global_path.to_string ().to_str0 ())); + global_path.to_string ().c_str ())); exit (2); } - if ((file_name != "-") && global_path.find (file_name).is_empty ()) + + bool error = false; + if ((file_name != "-") && file_name.empty ()) { - warning (_f ("can't find file: `%s'", file_name)); - scm_throw (ly_symbol2scm ("ly-file-failed"), - scm_list_1 (scm_makfrom0str (file_name.to_str0 ()))); + warning (_f ("can't find file: `%s'", file)); + error = true; } else { Sources sources; sources.set_path (&global_path); - String mapped_fn = map_file_name (file_name); - message (_f ("Processing `%s'", mapped_fn.to_str0 ())); + string mapped_fn = map_file_name (file_name); + message (_f ("Processing `%s'", mapped_fn.c_str ())); progress_indication ("\n"); Lily_parser *parser = new Lily_parser (&sources); parser->parse_file (init, file_name, out_file); - bool error = parser->error_level_; - scm_gc_unprotect_object (parser->self_scm ()); - parser = 0; - if (error) - /* TODO: pass renamed input file too. */ - scm_throw (ly_symbol2scm ("ly-file-failed"), - scm_list_1 (scm_makfrom0str (file_name.to_str0 ()))); + error = parser->error_level_; + + parser->clear (); + parser->unprotect (); } + + /* + 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 ()))); + return SCM_UNSPECIFIED; } @@ -112,31 +156,36 @@ LY_DEFINE (ly_parse_string, "ly:parse-string", Sources sources; sources.set_path (&global_path); Lily_parser *parser = new Lily_parser (&sources); - scm_module_define (global_lily_module, ly_symbol2scm ("parser"), - parser->self_scm ()); parser->parse_string (ly_scm2string (ly_code)); - scm_gc_unprotect_object (parser->self_scm ()); + parser->unprotect (); parser = 0; return SCM_UNSPECIFIED; } -LY_DEFINE (ly_clone_parser, "ly:clone-parser", +LY_DEFINE (ly_parser_lexer, "ly:parser-lexer", + 1, 0, 0, (SCM parser_smob), + "Return the lexer for PARSER_SMOB.") +{ + Lily_parser *parser = unsmob_lily_parser (parser_smob); + return parser->lexer_->self_scm (); +} + +LY_DEFINE (ly_parser_clone, "ly:parser-clone", 1, 0, 0, (SCM parser_smob), "Return a clone of PARSER_SMOB.") { - Lily_parser *parser = unsmob_my_lily_parser (parser_smob); + Lily_parser *parser = unsmob_lily_parser (parser_smob); Lily_parser *clone = new Lily_parser (*parser); - /* FIXME: should copy scopes too. */ - return scm_gc_unprotect_object (clone->self_scm ()); + return clone->unprotect (); } -LY_DEFINE (ly_parser_define, "ly:parser-define", +LY_DEFINE (ly_parser_define, "ly:parser-define!", 3, 0, 0, (SCM parser_smob, SCM symbol, SCM val), "Bind SYMBOL to VAL in PARSER_SMOB's module.") { - Lily_parser *parser = unsmob_my_lily_parser (parser_smob); + 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"); @@ -149,7 +198,7 @@ LY_DEFINE (ly_parser_lookup, "ly:parser-lookup", "Lookup @var{symbol} in @var{parser_smob}'s module. " "Undefined is '().") { - Lily_parser *parser = unsmob_my_lily_parser (parser_smob); + 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"); @@ -166,7 +215,7 @@ LY_DEFINE (ly_parser_parse_string, "ly:parser-parse-string", "Parse the string LY_CODE with PARSER_SMOB." "Upon failure, throw @code{ly-file-failed} key.") { - Lily_parser *parser = unsmob_my_lily_parser (parser_smob); + 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"); @@ -176,59 +225,13 @@ LY_DEFINE (ly_parser_parse_string, "ly:parser-parse-string", return SCM_UNSPECIFIED; } -/* TODO: move this to Scheme? Why take the parser arg, and all the back - & forth between scm and c++? */ -LY_DEFINE (ly_parser_print_score, "ly:parser-print-score", - 2, 0, 0, - (SCM parser_smob, SCM score_smob), - "Print score, i.e., the classic way.") -{ - Lily_parser *parser = unsmob_my_lily_parser (parser_smob); - Score *score = unsmob_score (score_smob); - - Object_key *key = new Lilypond_general_key (0, score->user_key_, 0); - - if (score->error_found_) - return SCM_UNSPECIFIED; - - SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG1, __FUNCTION__, "parser"); - SCM_ASSERT_TYPE (score, score_smob, SCM_ARG2, __FUNCTION__, "score"); - - SCM header = ly_c_module_p (score->header_) ? score->header_ - : parser->lexer_->lookup_identifier ("$globalheader"); - - File_name outname (parser->output_basename_); - int *c = &parser->book_count_; - if (*c) - outname.base_ += "-" + to_string (*c); - (*c)++; - - SCM os = scm_makfrom0str (outname.to_string ().to_str0 ()); - SCM paper = get_paper (parser)->self_scm (); - for (int i = 0; i < score->defs_.size (); i++) - default_rendering (score->get_music (), score->defs_[i]->self_scm (), - paper, header, os, key->self_scm ()); - - if (score->defs_.is_empty ()) - { - Output_def *layout = get_layout (parser); - default_rendering (score->get_music (), layout->self_scm (), - get_paper (parser)->self_scm (), - header, os, key->self_scm ()); - scm_gc_unprotect_object (layout->self_scm ()); - } - - scm_gc_unprotect_object (key->self_scm ()); - return SCM_UNSPECIFIED; -} - 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.") { - Lily_parser *p = unsmob_my_lily_parser (parser); + Lily_parser *p = unsmob_lily_parser (parser); SCM_ASSERT_TYPE (p, parser, SCM_ARG1, __FUNCTION__, "Lilypond parser"); if (p->lexer_->is_note_state ()) @@ -240,36 +243,30 @@ LY_DEFINE (ly_parser_set_note_names, "ly:parser-set-note-names", return SCM_UNSPECIFIED; } -LY_DEFINE (ly_parser_print_book, "ly:parser-print-book", - 2, 0, 0, (SCM parser_smob, SCM book_smob), - "Print book.") +LY_DEFINE (ly_parser_output_name, "ly:parser-output-name", + 1, 0, 0, (SCM parser), + "Return the base name of the output file.") { - Lily_parser *parser = unsmob_my_lily_parser (parser_smob); - Book *book = unsmob_book (book_smob); - Output_def *bp = unsmob_output_def (parser->lexer_->lookup_identifier ("$defaultpaper")); - - SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG1, __FUNCTION__, "Lilypond parser"); - SCM_ASSERT_TYPE (book, book_smob, SCM_ARG2, __FUNCTION__, "Book"); - - /* ugh. changing argument.*/ - book->paper_ = bp; - - File_name outname (parser->output_basename_); - int *c = &parser->book_count_; - if (*c) - outname.base_ += "-" + to_string (*c); - (*c)++; + Lily_parser *p = unsmob_lily_parser (parser); + SCM_ASSERT_TYPE (p, parser, SCM_ARG1, __FUNCTION__, "Lilypond parser"); - Output_def *layout = get_layout (parser); - Paper_book *pb = book->process (outname.to_string (), layout); + return scm_makfrom0str (p->output_basename_.c_str ()); +} - if (pb) - { - pb->output (outname.to_string ()); - scm_gc_unprotect_object (pb->self_scm ()); - } +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") +{ + 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"); + string s = ly_scm2string (msg); + + Input *i = unsmob_input (input); + if (i) + p->parser_error (*i, s); + else + p->parser_error (s); - scm_gc_unprotect_object (layout->self_scm ()); - return SCM_UNSPECIFIED; + return parser; } -