X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-parser-scheme.cc;h=0da04c9296003f6df730bca8c54cc00d8361d368;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=ceefa6b0387626e2395fe190673ce714af237675;hpb=bb8a0a5387af94dd2702877256334b160575a730;p=lilypond.git diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc index ceefa6b038..0da04c9296 100644 --- a/lily/lily-parser-scheme.cc +++ b/lily/lily-parser-scheme.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2005--2011 Han-Wen Nienhuys + Copyright (C) 2005--2014 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 @@ -70,19 +70,18 @@ LY_DEFINE (ly_parse_file, "ly:parse-file", else { File_name out (output_name); - if (is_dir (out.dir_part ())) - { - dir = out.dir_part (); - out_file_name = out.file_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 ()); + message (_f ("Changing working directory to: `%s'", dir)); + // If we can't change to the output dir (not existing, wrong + // permissions), exit lilypond + if (chdir (dir.c_str ()) != 0) + error (_f ("unable to change directory to: `%s'", dir)); } else out_file_name = File_name (output_name); @@ -115,8 +114,7 @@ LY_DEFINE (ly_parse_file, "ly:parse-file", sources.set_path (&global_path); string mapped_fn = map_file_name (file_name); - message (_f ("Processing `%s'", mapped_fn.c_str ())); - progress_indication ("\n"); + basic_progress (_f ("Processing `%s'", mapped_fn.c_str ())); Lily_parser *parser = new Lily_parser (&sources); @@ -148,12 +146,20 @@ LY_DEFINE (ly_parser_lexer, "ly:parser-lexer", } LY_DEFINE (ly_parser_clone, "ly:parser-clone", - 1, 0, 0, (SCM parser_smob), - "Return a clone of @var{parser-smob}.") + 1, 2, 0, (SCM parser_smob, SCM closures, SCM location), + "Return a clone of @var{parser-smob}. An association list" + " of port positions to closures can be specified in @var{closures}" + " in order to have @code{$} and @code{#} interpreted in their original" + " lexical environment. If @var{location} is a valid location," + " it becomes the source of all music expressions inside.") { LY_ASSERT_SMOB (Lily_parser, parser_smob, 1); Lily_parser *parser = unsmob_lily_parser (parser_smob); - Lily_parser *clone = new Lily_parser (*parser); + if (SCM_UNBNDP (closures)) + closures = SCM_EOL; + else + LY_ASSERT_TYPE (ly_is_list, closures, 2); + Lily_parser *clone = new Lily_parser (*parser, closures, location); return clone->unprotect (); } @@ -183,7 +189,7 @@ LY_DEFINE (ly_parser_lookup, "ly:parser-lookup", LY_ASSERT_TYPE (ly_is_symbol, symbol, 2); - SCM val = parser->lexer_->lookup_identifier (ly_scm2string (scm_symbol_to_string (symbol))); + SCM val = parser->lexer_->lookup_identifier (ly_symbol2string (symbol)); if (val != SCM_UNDEFINED) return val; else @@ -208,10 +214,43 @@ LY_DEFINE (ly_parser_parse_string, "ly:parser-parse-string", return SCM_UNSPECIFIED; } +LY_DEFINE (ly_parse_string_expression, "ly:parse-string-expression", + 2, 2, 0, (SCM parser_smob, SCM ly_code, SCM filename, + SCM line), + "Parse the string @var{ly-code} with @var{parser-smob}." + " Return the contained music expression." + " @var{filename} and @var{line} are optional source indicators.") +{ + 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); + string fn; + if (SCM_UNBNDP (filename) || !scm_is_string (filename)) + fn = ""; + else + fn = ly_scm2string (filename); + int ln; + if (SCM_UNBNDP (line) || !scm_is_integer (line)) + ln = 0; + else + ln = scm_to_int (line); + + if (!parser->lexer_->is_clean ()) + { + parser->parser_error (_ ("ly:parse-string-expression is only valid with a new parser." + " Use ly:parser-include-string instead.")); + return SCM_UNSPECIFIED; + } + + return parser->parse_string_expression (ly_scm2string (ly_code), + fn, ln); +} + LY_DEFINE (ly_parser_include_string, "ly:parser-include-string", 2, 0, 0, (SCM parser_smob, SCM ly_code), "Include the string @var{ly-code} into the input stream" - " for @var{parser-smob}.") + " for @var{parser-smob}. Can only be used in immediate" + " Scheme expressions (@code{$} instead of @code{#}).") { LY_ASSERT_SMOB (Lily_parser, parser_smob, 1); Lily_parser *parser = unsmob_lily_parser (parser_smob); @@ -234,38 +273,12 @@ LY_DEFINE (ly_parser_set_note_names, "ly:parser-set-note-names", if (p->lexer_->is_note_state ()) { p->lexer_->pop_state (); - p->lexer_->push_note_state (alist_to_hashq (names)); + p->lexer_->push_note_state (names); } return SCM_UNSPECIFIED; } -LY_DEFINE (ly_parser_set_repetition_symbol, "ly:parser-set-repetition-symbol", - 2, 0, 0, (SCM parser, SCM sym), - "Replace the current repetition symbol in @var{parser}." - " @var{sym} is the new repetition symbol.") -{ - LY_ASSERT_SMOB (Lily_parser, parser, 1); - Lily_parser *p = unsmob_lily_parser (parser); - - p->lexer_->chord_repetition_.repetition_symbol_ = sym; - - return SCM_UNSPECIFIED; -} - -LY_DEFINE (ly_parser_set_repetition_function, "ly:parser-set-repetition-function", - 2, 0, 0, (SCM parser, SCM fun), - "Replace the current repetition function in @var{parser}." - " @var{fun} is the new repetition function.") -{ - LY_ASSERT_SMOB (Lily_parser, parser, 1); - Lily_parser *p = unsmob_lily_parser (parser); - - p->lexer_->chord_repetition_.repetition_function_ = fun; - - return SCM_UNSPECIFIED; -} - LY_DEFINE (ly_parser_output_name, "ly:parser-output-name", 1, 0, 0, (SCM parser), "Return the base name of the output file.")