*/
#include "book.hh"
+
+#include "file-name.hh"
#include "file-path.hh"
#include "lily-version.hh"
#include "ly-module.hh"
-#include "ly-smobs.icc"
#include "main.hh"
#include "my-lily-lexer.hh"
#include "my-lily-parser.hh"
-#include "paper-def.hh"
-#include "parray.hh"
+#include "output-def.hh"
+#include "paper-book.hh"
#include "parser.hh"
-#include "scm-hash.hh"
#include "score.hh"
#include "source.hh"
-#include "string.hh"
#include "warn.hh"
+#include "ly-smobs.icc"
+
+
My_lily_parser::My_lily_parser (Sources *sources)
{
book_count_ = 0;
default_duration_ = Duration (2,0);
error_level_ = 0;
last_beam_start_ = SCM_EOL;
- header_ = SCM_EOL;
- header_ = ly_make_anonymous_module ();
smobify_self ();
}
+My_lily_parser::My_lily_parser (My_lily_parser const &src)
+{
+ book_count_ = src.book_count_;
+ score_count_ = src.score_count_;
+ lexer_ = 0;
+ sources_ = src.sources_;
+ default_duration_ = src.default_duration_;
+ error_level_ = src.error_level_;
+ last_beam_start_ = src.last_beam_start_;
+
+ smobify_self ();
+ lexer_ = new My_lily_lexer (*src.lexer_);
+}
+
My_lily_parser::~My_lily_parser ()
{
- delete lexer_;
+ // FIXME: Memleak: del lexer
}
IMPLEMENT_SMOBS (My_lily_parser);
My_lily_parser::mark_smob (SCM s)
{
My_lily_parser *parser = (My_lily_parser*) ly_cdr (s);
- return parser->header_;
+ return SCM_EOL;
}
int
}
error_level_ = error_level_ | lexer_->error_level_;
+ delete lexer_;
+ lexer_ = 0;
}
void
My_lily_parser::parse_string (String ly_code)
{
- lexer_ = new My_lily_lexer (sources_);
+ My_lily_lexer *parent = lexer_;
+ lexer_ = (parent == 0 ? new My_lily_lexer (sources_)
+ : new My_lily_lexer (*parent));
+
lexer_->main_input_name_ = "<string>";
lexer_->main_input_b_ = true;
}
error_level_ = error_level_ | lexer_->error_level_;
+
+ if (parent != 0)
+ {
+ parent->keytable_ = lexer_->keytable_;
+ parent->encoding_ = lexer_->encoding_;
+ parent->chordmodifier_tab_ = lexer_->chordmodifier_tab_;
+ parent->pitchname_tab_stack_ = lexer_->pitchname_tab_stack_;
+ parent->sources_ = lexer_->sources_;
+ parent->scopes_ = lexer_->scopes_;
+ parent->error_level_ = lexer_->error_level_;
+ parent->main_input_b_ = lexer_->main_input_b_;
+ }
}
void
error_level_ = 1;
}
-
-
Input
My_lily_parser::pop_spot ()
{
Parsing looks ahead , so we really want the previous location of the
lexer, not lexer_->here_input ().
*/
+
/*
Actually, that gets very icky when there are white space, because
the line-numbers are all wrong. Let's try the character before
- the current token. That gets the right result for
- note/duration stuff, but doesn't mess up for errors in the 1st token of the line.
-
+ the current token. That gets the right result for note/duration
+ stuff, but doesn't mess up for errors in the 1st token of the
+ line.
*/
Input hi (lexer_->here_input ());
*/
bool store_locations_global_b;
-/*
- no ! suffix since it doesn't modify 1st argument.
- */
+/* 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),
"Set the options for Point-and-click source specials output. The\n"
"argument is a symbol. Possible options are @code{none} (no source specials),\n"
"@code{line} and @code{line-column}")
{
- /*
- UGH.
- */
+ /* UGH. */
SCM val = SCM_BOOL_F;
if (ly_symbol2scm ("line-column") == what)
- val = scm_c_eval_string ("line-column-location");
+ val = ly_scheme_function ("line-column-location");
else if (what == ly_symbol2scm ("line"))
- val = scm_c_eval_string ("line-location");
+ val = ly_scheme_function ("line-location");
- scm_module_define (global_lily_module, ly_symbol2scm ("point-and-click"), val);
+ scm_module_define (global_lily_module, ly_symbol2scm ("point-and-click"),
+ val);
store_locations_global_b = ly_c_procedure_p (val);
return SCM_UNSPECIFIED;
}
-
-/* Distill full input file name from command argument. PATH describes
- file name with added default extension, ".ly" if none. "-" is
- STDIN. */
-Path
-distill_inname (String str)
-{
- Path p = split_path (str);
- if (str.is_empty () || str == "-")
- p.base = "-";
- else
- {
- String orig_ext = p.ext;
- char const *extensions[] = {"ly", "", 0};
- for (int i = 0; extensions[i]; i++)
- {
- p.ext = orig_ext;
- if (*extensions[i] && !p.ext.is_empty ())
- p.ext += ".";
- p.ext += extensions[i];
- if (!global_path.find (p.to_string ()).is_empty ())
- break;
- }
- /* Reshuffle extension */
- p = split_path (p.to_string ());
- }
- return p;
-}
-
LY_DEFINE (ly_parse_file, "ly:parse-file",
1, 0, 0,
(SCM name),
{
SCM_ASSERT_TYPE (ly_c_string_p (name), name, SCM_ARG1, __FUNCTION__, "string");
char const *file = SCM_STRING_CHARS (name);
+ char const *extensions[] = {"ly", "", 0};
+ String file_name = global_path.find (file, extensions);
- String infile (file);
- Path inpath = distill_inname (infile);
-
- /* By default, use base name of input file for output file name */
- Path outpath = inpath;
- if (inpath.to_string () != "-")
- outpath.ext = output_format_global;
-
- /* By default, write output to cwd; do not copy directory part
- of input file name */
- outpath.root = "";
- outpath.dir = "";
-
+ /* 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);
+ out_file_name.ext_ = "";
+ out_file_name.root_ = "";
+ out_file_name.dir_ = "";
+
if (!output_name_global.is_empty ())
- outpath = split_path (output_name_global);
+ out_file_name = File_name (output_name_global);
String init;
if (!init_name_global.is_empty ())
init = init_name_global;
else
init = "init.ly";
-
- String in_file = inpath.to_string ();
- String out_file = outpath.to_string ();
+ String out_file = out_file_name.to_string ();
if (init.length () && global_path.find (init).is_empty ())
{
warning (_f ("can't find init file: `%s'", init));
- warning (_f ("(search path: `%s')", global_path.to_string ().to_str0 ()));
+ warning (_f ("(search path: `%s')",
+ global_path.to_string ().to_str0 ()));
exit (2);
}
- if ((in_file != "-") && global_path.find (in_file).is_empty ())
+ if ((file_name != "-") && global_path.find (file_name).is_empty ())
{
- warning (_f ("can't find file: `%s'", in_file));
- scm_throw (ly_symbol2scm ("ly-file-failed"), scm_list_1 (scm_makfrom0str (in_file.to_str0 ())));
+ 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 ())));
}
else
{
Sources sources;
sources.set_path (&global_path);
- progress_indication (_f ("Now processing `%s'", in_file.to_str0 ()));
+ progress_indication (_f ("Now processing `%s'", file_name.to_str0 ()));
progress_indication ("\n");
My_lily_parser *parser = new My_lily_parser (&sources);
- parser->parse_file (init, in_file, out_file);
+ scm_module_define (global_lily_module, ly_symbol2scm ("parser"),
+ parser->self_scm ());
+ parser->parse_file (init, file_name, out_file);
bool error = parser->error_level_;
parser = 0;
if (error)
/* TODO: pass renamed input file too. */
scm_throw (ly_symbol2scm ("ly-file-failed"),
- scm_list_1 (scm_makfrom0str (in_file.to_str0 ())));
+ scm_list_1 (scm_makfrom0str (file_name.to_str0 ())));
}
return SCM_UNSPECIFIED;
}
Sources sources;
sources.set_path (&global_path);
My_lily_parser *parser = new My_lily_parser (&sources);
+ scm_module_define (global_lily_module, ly_symbol2scm ("parser"),
+ parser->self_scm ());
parser->parse_string (ly_scm2string (ly_code));
parser = 0;
return SCM_UNSPECIFIED;
}
-static Music_output_def*
+LY_DEFINE (ly_clone_parser, "ly:clone-parser",
+ 1, 0, 0,
+ (SCM parser_smob),
+ "Return a clone of PARSER_SMOB.")
+{
+ My_lily_parser *parser = unsmob_my_lily_parser (parser_smob);
+ My_lily_parser *clone = new My_lily_parser (*parser);
+ return scm_gc_unprotect_object (clone->self_scm ());
+}
+
+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.")
+{
+ My_lily_parser *parser = unsmob_my_lily_parser (parser_smob);
+ SCM_ASSERT_TYPE (ly_c_symbol_p (symbol), symbol, SCM_ARG2, __FUNCTION__, "symbol");
+ SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG2, __FUNCTION__, "parser");
+
+
+ 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 '().")
+{
+ My_lily_parser *parser = unsmob_my_lily_parser (parser_smob);
+
+ SCM_ASSERT_TYPE (ly_c_symbol_p (symbol), symbol, SCM_ARG2, __FUNCTION__, "symbol");
+ SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG2, __FUNCTION__, "parser");
+
+ SCM val= parser->lexer_->lookup_identifier (ly_scm2string (scm_symbol_to_string (symbol)));
+ if (val != SCM_UNDEFINED)
+ return val;
+ else
+ return SCM_EOL;
+}
+
+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.")
+{
+
+ My_lily_parser *parser = unsmob_my_lily_parser (parser_smob);
+
+ SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG1, __FUNCTION__, "parser");
+ SCM_ASSERT_TYPE (ly_c_string_p (ly_code), ly_code, SCM_ARG2, __FUNCTION__, "string");
+
+ parser->parse_string (ly_scm2string (ly_code));
+
+ return SCM_UNSPECIFIED;
+}
+
+Output_def*
get_paper (My_lily_parser *parser)
{
SCM id = parser->lexer_->lookup_identifier ("$defaultpaper");
- Music_output_def *paper = unsmob_music_output_def (id);
- return paper ? paper->clone () : new Paper_def;
+ Output_def *paper = unsmob_output_def (id);
+ paper = paper ? paper->clone () : new Output_def;
+ paper->set_variable (ly_symbol2scm ("is-paper"), SCM_BOOL_T);
+
+ paper->parent_ =unsmob_output_def (parser->lexer_->lookup_identifier ("$defaultbookpaper"));
+ return paper;
+}
+
+
+Output_def*
+get_midi (My_lily_parser *parser)
+{
+ SCM id = parser->lexer_->lookup_identifier ("$defaultmidi");
+ Output_def *paper = unsmob_output_def (id);
+ paper = paper ? paper->clone () : new Output_def;
+ paper->set_variable (ly_symbol2scm ("is-midi"), SCM_BOOL_T);
+ return paper;
}
+
+Output_def*
+get_bookpaper (My_lily_parser *parser)
+{
+ SCM id = parser->lexer_->lookup_identifier ("$defaultbookpaper");
+ Output_def *paper = unsmob_output_def (id);
+
+ paper = paper ? dynamic_cast<Output_def*> (paper->clone ()) : new Output_def;
+ paper->set_variable (ly_symbol2scm ("is-bookpaper"), SCM_BOOL_T);
+ return paper;
+}
+
+
+/*
+ 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.")
{
-#if 0
- SCM_ASSERT_TYPE (ly_c_parser_p (parser), music, SCM_ARG1, __FUNCTION__, "parser");
- SCM_ASSERT_TYPE (ly_c_music_p (music), music, SCM_ARG1, __FUNCTION__, "music");
-#endif
My_lily_parser *parser = unsmob_my_lily_parser (parser_smob);
Score *score = unsmob_score (score_smob);
- SCM header = is_module (score->header_) ? score->header_
- : parser->header_.to_SCM ();
+ 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");
- Path outname = split_path (parser->output_basename_);
+ File_name outname (parser->output_basename_);
int *c = &parser->book_count_;
if (*c)
- outname.base += "-" + to_string (*c);
+ outname.base_ += "-" + to_string (*c);
(*c)++;
SCM os = scm_makfrom0str (outname.to_string ().to_str0 ());
+ SCM bookpaper = get_bookpaper (parser)->self_scm ();
for (int i = 0; i < score->defs_.size (); i++)
- default_rendering (score->music_, score->defs_[i]->self_scm (), header,
- os);
+ default_rendering (score->music_, score->defs_[i]->self_scm (),
+ bookpaper,
+ header, os);
if (score->defs_.is_empty ())
{
- Music_output_def *paper = get_paper (parser);
- default_rendering (score->music_, paper->self_scm (), header, os);
+ Output_def *paper = get_paper (parser);
+ default_rendering (score->music_, paper->self_scm (),
+ get_bookpaper (parser)->self_scm (),
+ header, os);
scm_gc_unprotect_object (paper->self_scm ());
}
return SCM_UNDEFINED;
(SCM parser_smob, SCM book_smob),
"Print book.")
{
-#if 0
- SCM_ASSERT_TYPE (ly_c_parser_p (parser_smob), parser_smob, SCM_ARG1, __FUNCTION__, "parser_smob");
- SCM_ASSERT_TYPE (ly_c_music_p (book_smob), book_smob, SCM_ARG1, __FUNCTION__, "book_smob");
-#endif
My_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 ("$defaultbookpaper"));
+
+ 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->bookpaper_ = bp;
- SCM header = parser->header_;
- Path outname = split_path (parser->output_basename_);
+ File_name outname (parser->output_basename_);
int *c = &parser->book_count_;
if (*c)
- outname.base += "-" + to_string (*c);
+ outname.base_ += "-" + to_string (*c);
(*c)++;
- Music_output_def *paper = get_paper (parser);
- book->process (outname.to_string (), paper, header);
+
+ Output_def *paper = get_paper (parser);
+
+ Paper_book* pb = book->process (outname.to_string (), paper);
+
+ pb->output (outname.to_string ());
+
scm_gc_unprotect_object (paper->self_scm ());
+ scm_gc_unprotect_object (pb->self_scm ());
+
return SCM_UNDEFINED;
}
projects / lilypond.git / blobdiff