X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-parser-scheme.cc;h=2f9a910ccf917518ca40707403f74122f3e034ec;hb=cc33039b84da82a8fe41503b4434db30ac9bf4ab;hp=45c61898f23277fd453d3cfcca69c2107823a951;hpb=92918346012f79ef9109ef0c391947af2d3165ca;p=lilypond.git diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc index 45c61898f2..2f9a910ccf 100644 --- a/lily/lily-parser-scheme.cc +++ b/lily/lily-parser-scheme.cc @@ -1,9 +1,20 @@ /* - lily-parser-scheme.cc -- implement Lily_parser bindings + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2005--2010 Han-Wen Nienhuys - (c) 2005--2007 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include @@ -21,22 +32,12 @@ #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_FIRST_TYPE(scm_is_string, name); + LY_ASSERT_TYPE (scm_is_string, name, 1); string file = ly_scm2string (name); char const *extensions[] = {"ly", "", 0}; @@ -47,41 +48,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 +84,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 +94,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 +129,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; } @@ -160,7 +152,7 @@ LY_DEFINE (ly_parser_clone, "ly:parser-clone", 1, 0, 0, (SCM parser_smob), "Return a clone of @var{parser-smob}.") { - LY_ASSERT_FIRST_SMOB (Lily_parser, 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); @@ -171,26 +163,26 @@ 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_FIRST_SMOB (Lily_parser, parser_smob); + + LY_ASSERT_SMOB (Lily_parser, parser_smob, 1); Lily_parser *parser = unsmob_lily_parser (parser_smob); - LY_ASSERT_TYPE (ly_is_symbol, 2); - + 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_FIRST_SMOB (Lily_parser, parser_smob); + LY_ASSERT_SMOB (Lily_parser, parser_smob, 1); Lily_parser *parser = unsmob_lily_parser (parser_smob); - - LY_ASSERT_TYPE (ly_is_symbol, 2); + + 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) @@ -201,25 +193,43 @@ 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); + LY_ASSERT_TYPE (scm_is_string, ly_code, 2); + + if (!parser->lexer_->is_clean ()) + parser->parser_error (_ ("ly:parser-parse-string is only valid with a new parser." + " Use ly:parser-include-string instead.")); + else + parser->parse_string (ly_scm2string (ly_code)); + + return SCM_UNSPECIFIED; +} + +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}.") { - LY_ASSERT_FIRST_SMOB (Lily_parser, parser_smob); - Lily_parser *parser = unsmob_lily_parser (parser_smob); - LY_ASSERT_TYPE(scm_is_string, 2); + 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)); + parser->include_string (ly_scm2string (ly_code)); 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.") + "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_FIRST_SMOB (Lily_parser, parser); + LY_ASSERT_SMOB (Lily_parser, parser, 1); Lily_parser *p = unsmob_lily_parser (parser); if (p->lexer_->is_note_state ()) @@ -231,11 +241,37 @@ LY_DEFINE (ly_parser_set_note_names, "ly:parser-set-note-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.") { - LY_ASSERT_FIRST_SMOB (Lily_parser, parser); + LY_ASSERT_SMOB (Lily_parser, parser, 1); Lily_parser *p = unsmob_lily_parser (parser); return ly_string2scm (p->output_basename_); @@ -243,14 +279,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_FIRST_SMOB (Lily_parser, parser); + LY_ASSERT_SMOB (Lily_parser, parser, 1); Lily_parser *p = unsmob_lily_parser (parser); - - LY_ASSERT_TYPE(scm_is_string, 2); + + 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); @@ -264,13 +300,13 @@ LY_DEFINE (ly_parser_clear_error, "ly:parser-clear-error", 1, 0, 0, (SCM parser), "Clear the error flag for the parser.") { - LY_ASSERT_FIRST_SMOB (Lily_parser, 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; } @@ -278,7 +314,7 @@ 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_FIRST_SMOB (Lily_parser, parser); + 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_);