X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-parser-scheme.cc;h=c3ac4afa3c9a98e53a1ca1441e7fb6b2777567c5;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=6d615ea915c5e8db9444cc545e94a488926ee439;hpb=7556e96abb66c88ae653c96898bcad2c3f18b645;p=lilypond.git diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc index 6d615ea915..8aedecbb0f 100644 --- a/lily/lily-parser-scheme.cc +++ b/lily/lily-parser-scheme.cc @@ -1,183 +1,195 @@ /* - 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--2015 Han-Wen Nienhuys - (c) 2005--2006 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 +#include "lily-parser.hh" + #include "file-name-map.hh" #include "file-name.hh" #include "file-path.hh" +#include "international.hh" #include "lily-lexer.hh" -#include "lily-parser.hh" #include "ly-module.hh" #include "main.hh" #include "program-option.hh" -#include "source.hh" +#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.") + 1, 0, 0, (SCM name), + "Parse a single @code{.ly} 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); + LY_ASSERT_TYPE (scm_is_string, name, 1); + 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 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_ = ""; - - /* When running from gui, generate output in .ly source directory. */ - if (output_name_global.empty () - && ly_get_option (ly_symbol2scm ("gui")) == SCM_BOOL_T) + if (ly_get_option (ly_symbol2scm ("gui")) != SCM_BOOL_T + && ly_get_option (ly_symbol2scm ("strip-output-dir")) == SCM_BOOL_T) { - File_name f (file); - f.base_ = ""; - f.ext_ = ""; - output_name_global = f.to_string (); + out_file_name.dir_ = ""; } - if (!output_name_global.empty ()) + /* When running from gui, generate output in .ly source directory. */ + string output_name = output_name_global; + if (!output_name.empty ()) { /* Interpret --output=DIR to mean --output=DIR/BASE. */ - if (is_dir (output_name_global)) - { - char cwd[PATH_MAX]; - getcwd (cwd, PATH_MAX); - - if (output_name_global != cwd) - { - global_path.prepend (cwd); - message (_f ("Changing working directory to `%s'", - output_name_global.c_str ())); - chdir (output_name_global.c_str ()); - } - output_name_global = ""; - } + string dir; + if (is_dir (output_name)) + { + dir = output_name; + output_name = ""; + } + else + { + File_name out (output_name); + 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)); + // 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_global); + out_file_name = File_name (output_name); } - String init; + 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).empty ()) { - warning (_f ("can't find init file: `%s'", init)); + warning (_f ("cannot find init file: `%s'", init)); warning (_f ("(search path: `%s')", - global_path.to_string ().c_str ())); + global_path.to_string ().c_str ())); exit (2); } - if ((file_name != "-") && global_path.find (file_name).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.c_str ()))); + warning (_f ("cannot 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.c_str ())); - progress_indication ("\n"); + string mapped_fn = map_file_name (file_name); + basic_progress (_f ("Processing `%s'", mapped_fn.c_str ())); Lily_parser *parser = new Lily_parser (&sources); parser->parse_file (init, file_name, out_file); - bool error = parser->error_level_; + error = parser->error_level_; + + parser->clear (); 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.c_str ()))); } + + /* + 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; } -LY_DEFINE (ly_parse_string, "ly:parse-string", - 1, 0, 0, (SCM ly_code), - "Parse the string LY_CODE. " - "Upon failure, throw @code{ly-file-failed} key.") +LY_DEFINE (ly_parser_lexer, "ly:parser-lexer", + 1, 0, 0, (SCM parser_smob), + "Return the lexer for @var{parser-smob}.") { - SCM_ASSERT_TYPE (scm_is_string (ly_code), ly_code, SCM_ARG1, __FUNCTION__, "string"); - - Sources sources; - sources.set_path (&global_path); - Lily_parser *parser = new Lily_parser (&sources); - parser->parse_string (ly_scm2string (ly_code)); - parser->unprotect (); - parser = 0; - - return SCM_UNSPECIFIED; + Lily_parser *parser = Lily_parser::unsmob (parser_smob); + return parser->lexer_->self_scm (); } -LY_DEFINE (ly_clone_parser, "ly:clone-parser", - 1, 0, 0, (SCM parser_smob), - "Return a clone of PARSER_SMOB.") +LY_DEFINE (ly_parser_clone, "ly:parser-clone", + 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.") { - Lily_parser *parser = unsmob_lily_parser (parser_smob); - Lily_parser *clone = new Lily_parser (*parser); + LY_ASSERT_SMOB (Lily_parser, parser_smob, 1); + Lily_parser *parser = Lily_parser::unsmob (parser_smob); + 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 (); } -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.") +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.") { - 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"); + + LY_ASSERT_SMOB (Lily_parser, parser_smob, 1); + Lily_parser *parser = Lily_parser::unsmob (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 '().") + 2, 0, 0, (SCM parser_smob, SCM symbol), + "Look up @var{symbol} in @var{parser-smob}'s module." + " Return @code{'()} if not defined.") { - Lily_parser *parser = unsmob_lily_parser (parser_smob); + LY_ASSERT_SMOB (Lily_parser, parser_smob, 1); + + Lily_parser *parser = Lily_parser::unsmob (parser_smob); - SCM_ASSERT_TYPE (scm_is_symbol (symbol), symbol, SCM_ARG2, __FUNCTION__, "symbol"); - SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG2, __FUNCTION__, "parser"); + 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 @@ -185,46 +197,136 @@ 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 LY_CODE with PARSER_SMOB." - "Upon failure, throw @code{ly-file-failed} key.") + 2, 0, 0, (SCM parser_smob, SCM ly_code), + "Parse the string @var{ly-code} with @var{parser-smob}." + " Upon failure, throw @code{ly-file-failed} key.") { - Lily_parser *parser = unsmob_lily_parser (parser_smob); + LY_ASSERT_SMOB (Lily_parser, parser_smob, 1); + Lily_parser *parser = Lily_parser::unsmob (parser_smob); + LY_ASSERT_TYPE (scm_is_string, ly_code, 2); - SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG1, __FUNCTION__, "parser"); - SCM_ASSERT_TYPE (scm_is_string (ly_code), ly_code, SCM_ARG2, __FUNCTION__, "string"); + 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)); - parser->parse_string (ly_scm2string (ly_code)); + 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 = Lily_parser::unsmob (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}. Can only be used in immediate" + " Scheme expressions (@code{$} instead of @code{#}).") +{ + LY_ASSERT_SMOB (Lily_parser, parser_smob, 1); + Lily_parser *parser = Lily_parser::unsmob (parser_smob); + LY_ASSERT_TYPE (scm_is_string, ly_code, 2); + + 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.") + 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_lily_parser (parser); - SCM_ASSERT_TYPE (p, parser, SCM_ARG1, __FUNCTION__, "Lilypond parser"); + LY_ASSERT_SMOB (Lily_parser, parser, 1); + Lily_parser *p = Lily_parser::unsmob (parser); 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_output_name, "ly:parser-output-name", - 1, 0, 0, (SCM parser), - "Return the base name of the output file.") + 1, 0, 0, (SCM parser), + "Return the base name of the output file.") { - Lily_parser *p = unsmob_lily_parser (parser); - SCM_ASSERT_TYPE (p, parser, SCM_ARG1, __FUNCTION__, "Lilypond parser"); + LY_ASSERT_SMOB (Lily_parser, parser, 1); + Lily_parser *p = Lily_parser::unsmob (parser); - return scm_makfrom0str (p->output_basename_.c_str ()); + return ly_string2scm (p->output_basename_); } +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.") +{ + LY_ASSERT_SMOB (Lily_parser, parser, 1); + Lily_parser *p = Lily_parser::unsmob (parser); + + LY_ASSERT_TYPE (scm_is_string, msg, 2); + string s = ly_scm2string (msg); + Input *i = Input::unsmob (input); + if (i) + p->parser_error (*i, s); + else + p->parser_error (s); + + return parser; +} + +LY_DEFINE (ly_parser_clear_error, "ly:parser-clear-error", + 1, 0, 0, (SCM parser), + "Clear the error flag for the parser.") +{ + LY_ASSERT_SMOB (Lily_parser, parser, 1); + Lily_parser *p = Lily_parser::unsmob (parser); + + p->error_level_ = 0; + p->lexer_->error_level_ = 0; + + return SCM_UNSPECIFIED; +} + +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_SMOB (Lily_parser, parser, 1); + Lily_parser *p = Lily_parser::unsmob (parser); + + return scm_from_bool (p->error_level_ || p->lexer_->error_level_); +}