X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Flily-parser-scheme.cc;h=7603487665096a28753677ece6aaf5de9d4a121b;hb=aade5eaab9ddc9b948db6edbb0d43a6f4a691fda;hp=07ad5f7b7dd5a31f58b5d996f0292c2434976b06;hpb=9299ff9e805b237f22a462cc8c97a6b145c161c0;p=lilypond.git diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc index 07ad5f7b7d..7603487665 100644 --- a/lily/lily-parser-scheme.cc +++ b/lily/lily-parser-scheme.cc @@ -3,25 +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", @@ -42,7 +39,7 @@ LY_DEFINE (ly_parse_file, "ly:parse-file", char const *file = scm_i_string_chars (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 @@ -56,8 +53,8 @@ LY_DEFINE (ly_parse_file, "ly:parse-file", out_file_name.dir_ = ""; /* When running from gui, generate output in .ly source directory. */ - if (output_name_global.is_empty () - && scm_call_0 (ly_lily_module_constant ("running-from-gui?")) == SCM_BOOL_T) + if (output_name_global.empty () + && ly_get_option (ly_symbol2scm ("gui")) == SCM_BOOL_T) { File_name f (file); f.base_ = ""; @@ -65,7 +62,7 @@ LY_DEFINE (ly_parse_file, "ly:parse-file", output_name_global = f.to_string (); } - if (!output_name_global.is_empty ()) + if (!output_name_global.empty ()) { /* Interpret --output=DIR to mean --output=DIR/BASE. */ if (is_dir (output_name_global)) @@ -77,45 +74,44 @@ LY_DEFINE (ly_parse_file, "ly:parse-file", { global_path.prepend (cwd); message (_f ("Changing working directory to `%s'", - output_name_global.to_str0 ())); - chdir (output_name_global.to_str0 ()); - + output_name_global.c_str ())); + chdir (output_name_global.c_str ()); } output_name_global = ""; } - else + else out_file_name = File_name (output_name_global); } - String init; - if (!init_name_global.is_empty ()) + 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 ()) + if ((file_name != "-") && global_path.find (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 ()))); + scm_list_1 (scm_makfrom0str (file_name.c_str ()))); } 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); @@ -123,12 +119,12 @@ LY_DEFINE (ly_parse_file, "ly:parse-file", parser->parse_file (init, file_name, out_file); bool error = parser->error_level_; - scm_gc_unprotect_object (parser->self_scm ()); + parser->unprotect (); 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 ()))); + scm_list_1 (scm_makfrom0str (file_name.c_str ()))); } return SCM_UNSPECIFIED; } @@ -143,10 +139,8 @@ 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; @@ -156,18 +150,17 @@ LY_DEFINE (ly_clone_parser, "ly:clone-parser", 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"); @@ -180,7 +173,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"); @@ -197,7 +190,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"); @@ -207,63 +200,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 (), - paper, - header, os, key->self_scm ()); - - scm_gc_unprotect_object (layout->self_scm ()); - } - - scm_gc_unprotect_object (paper); - 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 ()) @@ -275,36 +218,14 @@ 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)++; - - Output_def *layout = get_layout (parser); - Paper_book *pb = book->process (outname.to_string (), layout); - - if (pb) - { - pb->output (outname.to_string ()); - scm_gc_unprotect_object (pb->self_scm ()); - } + Lily_parser *p = unsmob_lily_parser (parser); + SCM_ASSERT_TYPE (p, parser, SCM_ARG1, __FUNCTION__, "Lilypond parser"); - scm_gc_unprotect_object (layout->self_scm ()); - return SCM_UNSPECIFIED; + return scm_makfrom0str (p->output_basename_.c_str ()); } +