X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmy-lily-parser.cc;h=bca0f455928f07cf33a9812e0840f085cd656c5e;hb=d519250e6ba979578b1bc9406dcd70576f5652d5;hp=f935f0f7780db69404034d2988509a1e462e4e2b;hpb=a517dce054511941847288622f7840ff9d2bd353;p=lilypond.git

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index f935f0f778..bca0f45592 100644
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -3,61 +3,149 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
        Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "my-lily-parser.hh"
-#include "my-lily-lexer.hh"
-#include "warn.hh"
+#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 "output-def.hh"
+#include "parray.hh"
 #include "parser.hh"
-#include "input-file-results.hh"
 #include "scm-hash.hh"
+#include "score.hh"
+#include "source.hh"
+#include "string.hh"
+#include "warn.hh"
 
-My_lily_parser::My_lily_parser (Input_file_results * source)
+My_lily_parser::My_lily_parser (Sources *sources)
 {
-  input_file_ = source;
+  book_count_ = 0;
+  score_count_ = 0;
   lexer_ = 0;
+  sources_ = sources;
   default_duration_ = Duration (2,0);
   error_level_ = 0;
   last_beam_start_ = SCM_EOL;
+  header_ = SCM_EOL;
+
+  header_ = ly_make_anonymous_module (false);
+  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_;
+  header_ = src.header_;
 
-  default_header_ =0;
+  smobify_self ();
+  lexer_ = new My_lily_lexer (*src.lexer_);
 }
 
 My_lily_parser::~My_lily_parser ()
 {
-  delete lexer_;
-  if (default_header_)
-    scm_gc_unprotect_object (default_header_->self_scm());
+  // FIXME: Memleak: del lexer
 }
 
+IMPLEMENT_SMOBS (My_lily_parser);
+IMPLEMENT_TYPE_P (My_lily_parser, "ly:my-lily-parser?");
+IMPLEMENT_DEFAULT_EQUAL_P (My_lily_parser);
 
-void
-My_lily_parser::parse_file (String init, String s)
+SCM
+My_lily_parser::mark_smob (SCM s)
 {
-  lexer_ = new My_lily_lexer;
+  My_lily_parser *parser = (My_lily_parser*) ly_cdr (s);
+  return parser->header_;
+}
 
-  lexer_->main_input_string_ = s;
+int
+My_lily_parser::print_smob (SCM s, SCM port, scm_print_state*)
+{
+  scm_puts ("#<my_lily_parser ", port);
+  My_lily_parser *parser = (My_lily_parser*) ly_cdr (s);
+  (void) parser;
+  scm_puts (" >", port);
+  return 1;
+}
+
+
+/* Process one .ly file, or book.  */
+void
+My_lily_parser::parse_file (String init, String name, String out_name)
+{
+  lexer_ = new My_lily_lexer (sources_);
+  output_basename_ = out_name;
+  
+  lexer_->main_input_name_ = name;
 
   progress_indication (_ ("Parsing..."));
+  progress_indication ("\n");
 
   set_yydebug (0);
-  lexer_->new_input (init, &input_file_->sources_);
+  lexer_->new_input (init, sources_);
+
+  /* Read .ly IN_FILE, lex, parse, write \score blocks from IN_FILE to
+     OUT_FILE (unless IN_FILE redefines output file name).  */
   do_yyparse ();
+  
+  if (!define_spots_.is_empty ())
+    {
+      define_spots_.top ().warning (_ ("Braces don't match"));
+      error_level_ = 1;
+    }
 
-  progress_indication ("\n");
+  error_level_ = error_level_ | lexer_->error_level_;
+  delete lexer_;
+  lexer_ = 0;
+}
+
+void
+My_lily_parser::parse_string (String ly_code)
+{
+  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;
+
+  set_yydebug (0);
+  lexer_->new_input (lexer_->main_input_name_, ly_code, sources_);
+  do_yyparse ();
   
-  if (!define_spots_.empty ())
+  if (!define_spots_.is_empty ())
     {
       define_spots_.top ().warning (_ ("Braces don't match"));
       error_level_ = 1;
     }
 
-  input_file_->inclusion_names_ = lexer_->filename_strings_;
+  error_level_ = error_level_ | lexer_->error_level_;
 
-  error_level_ = error_level_ | lexer_->errorlevel_; // ugh naming.
+  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
@@ -77,11 +165,8 @@ My_lily_parser::parser_error (String s)
 {
   here_input ().error (s);
   error_level_ = 1;
-  exit_status_global = 1;
 }
 
-
-
 Input
 My_lily_parser::pop_spot ()
 {
@@ -91,33 +176,305 @@ My_lily_parser::pop_spot ()
 Input
 My_lily_parser::here_input () const
 {
-  return  lexer_->here_input ();
+  /*
+    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.
+  */
+  Input hi (lexer_->here_input ());
+
+  char const * bla = hi.defined_str0_;
+  if (hi.line_number () > 1
+      || hi.column_number () > 1)
+    bla --;
+  
+  return Input (hi.source_file_, bla);
+}
+
+
+/****************************************************************/
+
+
+/*
+  junkme?
+ */
+bool store_locations_global_b;
+
+/* 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. */
+  SCM val = SCM_BOOL_F;
+  if (ly_symbol2scm ("line-column") == what)
+    val = ly_scheme_function ("line-column-location");
+  else if (what == ly_symbol2scm ("line"))
+    val = ly_scheme_function ("line-location");
+
+  scm_module_define (global_lily_module, ly_symbol2scm ("point-and-click"),
+		     val);
+  store_locations_global_b = ly_c_procedure_p (val);
+  return SCM_UNSPECIFIED;
 }
 
-// move me?
-#include "paper-def.hh"
-#include "translator-def.hh"
+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.")
+{
+  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);
+  
+  /* 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);
+  if (file_name != "-")
+    out_file_name.ext_ = output_format_global;
+  out_file_name.root_ = "";
+  out_file_name.dir_ = "";
 
-My_lily_parser * current_parser;
+  if (!output_name_global.is_empty ())
+    out_file_name = File_name (output_name_global);
+  
+  String init;
+  if (!init_name_global.is_empty ())
+    init = init_name_global;
+  else
+    init = "init.ly";
 
-MAKE_SCHEME_CALLBACK (My_lily_parser,paper_description, 0);
+  String out_file = out_file_name.to_string ();
 
-SCM
-My_lily_parser::paper_description ()
+  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 ()));
+      exit (2);
+    }
+
+  if ((file_name != "-") && global_path.find (file_name).is_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 ())));
+    }
+  else
+    {
+      Sources sources;
+      sources.set_path (&global_path);
+  
+      progress_indication (_f ("Now processing `%s'", file_name.to_str0 ()));
+      progress_indication ("\n");
+
+      My_lily_parser *parser = new My_lily_parser (&sources);
+      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 (file_name.to_str0 ())));
+    }
+  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.")
 {
-  My_lily_parser * me = current_parser;
+  SCM_ASSERT_TYPE (ly_c_string_p (ly_code), ly_code, SCM_ARG1, __FUNCTION__, "string");
+  
+  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;
+}
 
-  Music_output_def *id = unsmob_music_output_def (me->lexer_->lookup_identifier ("$defaultpaper"));
-  Paper_def *p = dynamic_cast<Paper_def*> (id->clone ());
+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 al = p->translator_tab_->to_alist ();
-  SCM l = SCM_EOL;
-  for (SCM s = al ; gh_pair_p (s); s = ly_cdr (s))
+  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");
+  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.")
+{
+  My_lily_parser *parser = unsmob_my_lily_parser (parser_smob);
+  Score *score = unsmob_score (score_smob);
+
+  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->header_.to_SCM ();
+  
+  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 bookpaper = get_bookpaper (parser)->self_scm ();
+  for (int i = 0; i < score->defs_.size (); i++)
+    default_rendering (score->music_, score->defs_[i]->self_scm (),
+		       bookpaper,
+		       header, os);
+
+  if (score->defs_.is_empty ())
     {
-      Translator_def * td = unsmob_translator_def (ly_cdar (s));
-      l = gh_cons (gh_cons (ly_caar (s), td->to_alist ()),  l);
+      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 l;  
+  return SCM_UNDEFINED;
 }
+
+LY_DEFINE (ly_parser_print_book, "ly:parser-print-book",
+	   2, 0, 0,
+	   (SCM parser_smob, SCM book_smob),
+	   "Print book.")
+{
+  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_;
+  File_name outname (parser->output_basename_);
+  int *c = &parser->book_count_;
+  if (*c)
+    outname.base_ += "-" + to_string (*c);
+  (*c)++;
 
+  Output_def *paper = get_paper (parser);
+
+  book->process (outname.to_string (), paper, header);
+
+  scm_gc_unprotect_object (paper->self_scm ());
+  return SCM_UNDEFINED;
+}