X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-parser.cc;h=d2499d4c4134c1453cc0a9b1a8618282df26da33;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=feae02f6455845b05d98a31118aee80d953b0ee9;hpb=50852b5c92c9e8edd5aac12aa3ac4247974bc196;p=lilypond.git

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index feae02f645..d2499d4c41 100644
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -1,79 +1,94 @@
 /*
-  lily-parser.cc -- implement Lily_parser
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
+
+  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 <http://www.gnu.org/licenses/>.
 */
 
 #include "lily-parser.hh"
-#include "text-metrics.hh"
+
 #include "book.hh"
-#include "lilypond-key.hh"
+#include "file-name.hh"
+#include "file-path.hh"
+#include "international.hh"
+#include "lily-lexer.hh"
 #include "lily-version.hh"
+#include "ly-module.hh"
 #include "main.hh"
-#include "lily-lexer.hh"
 #include "output-def.hh"
 #include "paper-book.hh"
 #include "parser.hh"
 #include "score.hh"
-#include "file-name.hh"
-#include "file-path.hh"
-#include "source.hh"
+#include "source-file.hh"
+#include "sources.hh"
 #include "warn.hh"
+#include "program-option.hh"
+
 
 Lily_parser::Lily_parser (Sources *sources)
 {
   lexer_ = 0;
   sources_ = sources;
   default_duration_ = Duration (2, 0);
+  default_tremolo_type_ = 8;
   error_level_ = 0;
+  closures_ = SCM_EOL;
 
   smobify_self ();
 
-  lexer_ = new Lily_lexer (sources_);
+  lexer_ = new Lily_lexer (sources_, this);
   lexer_->unprotect ();
 }
 
-Lily_parser::Lily_parser (Lily_parser const &src)
+Lily_parser::Lily_parser (Lily_parser const &src, SCM closures, SCM location)
+  : Smob<Lily_parser> ()
 {
   lexer_ = 0;
   sources_ = src.sources_;
   default_duration_ = src.default_duration_;
-  error_level_ = src.error_level_;
+  default_tremolo_type_ = src.default_tremolo_type_;
+  error_level_ = 0;
+  output_basename_ = src.output_basename_;
+  closures_ = closures;
 
   smobify_self ();
   if (src.lexer_)
-    lexer_ = new Lily_lexer (*src.lexer_);
-
-  lexer_->unprotect ();
+    {
+      lexer_ = new Lily_lexer (*src.lexer_, this, location);
+      lexer_->unprotect ();
+    }
 }
 
 Lily_parser::~Lily_parser ()
 {
 }
 
-#include "ly-smobs.icc"
-
-IMPLEMENT_SMOBS (Lily_parser);
-IMPLEMENT_TYPE_P (Lily_parser, "ly:lily-parser?");
-IMPLEMENT_DEFAULT_EQUAL_P (Lily_parser);
-
 SCM
-Lily_parser::mark_smob (SCM s)
+Lily_parser::mark_smob () const
 {
-  Lily_parser *parser = (Lily_parser *) SCM_CELL_WORD_1 (s);
-  return (parser->lexer_) ? parser->lexer_->self_scm () : SCM_EOL;
+  scm_gc_mark (closures_);
+  return (lexer_) ? lexer_->self_scm () : SCM_EOL;
 }
 
 int
-Lily_parser::print_smob (SCM s, SCM port, scm_print_state*)
+Lily_parser::print_smob (SCM port, scm_print_state *) const
 {
   scm_puts ("#<Lily_parser ", port);
-  Lily_parser *parser = (Lily_parser *) SCM_CELL_WORD_1 (s);
-  if (parser->lexer_)
-    scm_display (parser->lexer_->self_scm (), port);
+  if (lexer_)
+    scm_display (lexer_->self_scm (), port);
   else
     scm_puts ("(no lexer yet)", port);
   scm_puts (" >", port);
@@ -82,109 +97,120 @@ Lily_parser::print_smob (SCM s, SCM port, scm_print_state*)
 
 /* Process one .ly file, or book.  */
 void
-Lily_parser::parse_file (String init, String name, String out_name)
+Lily_parser::parse_file (const string &init, const string &name, const string &out_name)
 {
-  if (output_backend_global == "tex")
-    try_load_text_metrics (out_name);
-
-  // TODO: use $parser 
-  lexer_->set_identifier (ly_symbol2scm ("parser"),
-			  self_scm ());
   output_basename_ = out_name;
 
   lexer_->main_input_name_ = name;
 
   message (_ ("Parsing..."));
-  //  progress_indication ("\n");
 
   set_yydebug (0);
 
   lexer_->new_input (init, sources_);
 
   File_name f (name);
-  String s = global_path.find (f.base_ + ".twy");
+  string s = global_path.find (f.base_ + ".twy");
   s = gulp_file_to_string (s, false, -1);
-  scm_eval_string (scm_makfrom0str (s.to_str0 ()));
+  scm_eval_string (ly_string2scm (s));
 
   /* Read .ly IN_FILE, lex, parse, write \score blocks from IN_FILE to
      OUT_FILE (unless IN_FILE redefines output file name).  */
 
   SCM mod = lexer_->set_current_scope ();
-  do_yyparse ();
+  do
+    {
+      do_yyparse ();
+    }
+  while (!lexer_->is_clean ());
 
-  /*
-    Don't mix cyclic pointers with weak tables.
-  */
-  lexer_->set_identifier (ly_symbol2scm ("parser"),
-			  SCM_EOL);
   ly_reexport_module (scm_current_module ());
 
   scm_set_current_module (mod);
 
-  if (!define_spots_.is_empty ())
-    {
-      define_spots_.top ().warning (_ ("braces don't match"));
-      error_level_ = 1;
-    }
-
   error_level_ = error_level_ | lexer_->error_level_;
-  lexer_ = 0;
+  clear ();
 }
 
 void
-Lily_parser::parse_string (String ly_code)
+Lily_parser::parse_string (const string &ly_code)
 {
-  // TODO: use $parser 
-  lexer_->set_identifier (ly_symbol2scm ("parser"),
-			  self_scm ());
-
   lexer_->main_input_name_ = "<string>";
-  lexer_->is_main_input_ = true;
-
-  set_yydebug (0);
   lexer_->new_input (lexer_->main_input_name_, ly_code, sources_);
 
   SCM mod = lexer_->set_current_scope ();
+
   do_yyparse ();
+
   scm_set_current_module (mod);
 
-  if (!define_spots_.is_empty ())
+  error_level_ = error_level_ | lexer_->error_level_;
+}
+
+SCM
+Lily_parser::parse_string_expression (const string &ly_code, const string &filename,
+                                      int line)
+{
+  lexer_->main_input_name_ = filename;
+  lexer_->new_input (lexer_->main_input_name_, ly_code, sources_);
+  if (line)
     {
-      if (define_spots_.is_empty ()
-	  && !error_level_)
-	programming_error ("define_spots_ don't match, but error_level_ not set.");
+      lexer_->get_source_file ()->set_line (0, line);
     }
+  SCM mod = lexer_->set_current_scope ();
+
+  lexer_->push_extra_token (Input (), EMBEDDED_LILY);
+  SCM result = do_yyparse ();
+
+  scm_set_current_module (mod);
 
   error_level_ = error_level_ | lexer_->error_level_;
+  return result;
+}
+
+void
+Lily_parser::include_string (const string &ly_code)
+{
+  lexer_->new_input ("<included string>", ly_code, sources_);
 }
 
-char const *
-Lily_parser::here_str0 () const
+void
+Lily_parser::clear ()
 {
-  return lexer_->here_str0 ();
+  if (lexer_)
+    {
+      while (lexer_->has_scope ())
+        lexer_->remove_scope ();
+    }
+
+  lexer_ = 0;
 }
 
 void
-Lily_parser::parser_error (String s)
+Lily_parser::parser_error (const string &s)
 {
-  lexer_->here_input ().error (_ (s.to_str0 ()));
+  lexer_->here_input ().non_fatal_error (_ (s.c_str ()));
   error_level_ = 1;
 }
 
 void
-Lily_parser::parser_error (Input const &i, String s)
+Lily_parser::parser_error (Input const &i, const string &s)
 {
-  i.error (s);
+  i.non_fatal_error (s);
   error_level_ = 1;
 }
 
-/****************************************************************/
+const char * const Lily_parser::type_p_name_ = "ly:lily-parser?";
+
+/****************************************************************
+  OUTPUT-DEF
+ ****************************************************************/
 
 Output_def *
 get_layout (Lily_parser *parser)
 {
   SCM id = parser->lexer_->lookup_identifier ("$defaultlayout");
-  Output_def *layout = unsmob_output_def (id);
+  Output_def *layout = unsmob<Output_def> (id);
   layout = layout ? layout->clone () : new Output_def;
   layout->set_variable (ly_symbol2scm ("is-layout"), SCM_BOOL_T);
 
@@ -195,35 +221,79 @@ Output_def *
 get_midi (Lily_parser *parser)
 {
   SCM id = parser->lexer_->lookup_identifier ("$defaultmidi");
-  Output_def *layout = unsmob_output_def (id);
+  Output_def *layout = unsmob<Output_def> (id);
   layout = layout ? layout->clone () : new Output_def;
   layout->set_variable (ly_symbol2scm ("is-midi"), SCM_BOOL_T);
   return layout;
 }
 
+/* Return a copy of the top of $papers stack, or $defaultpaper if the
+ * stack is empty */
 Output_def *
 get_paper (Lily_parser *parser)
 {
-  SCM id = parser->lexer_->lookup_identifier ("$defaultpaper");
-  Output_def *layout = unsmob_output_def (id);
+  SCM papers = parser->lexer_->lookup_identifier ("$papers");
+  Output_def *layout = (SCM_UNBNDP (papers) || scm_is_null (papers))
+                       ? 0 : unsmob<Output_def> (scm_car (papers));
+  SCM default_paper = parser->lexer_->lookup_identifier ("$defaultpaper");
+  layout = layout ? layout : unsmob<Output_def> (default_paper);
 
   layout = layout ? dynamic_cast<Output_def *> (layout->clone ()) : new Output_def;
   layout->set_variable (ly_symbol2scm ("is-paper"), SCM_BOOL_T);
   return layout;
 }
 
+/* Initialize (reset) the $papers stack */
+void
+init_papers (Lily_parser *parser)
+{
+  parser->lexer_->set_identifier (ly_symbol2scm ("$papers"), SCM_EOL);
+}
+
+/* Push a paper on top of $papers stack */
+void
+push_paper (Lily_parser *parser, Output_def *paper)
+{
+  parser->lexer_->set_identifier (ly_symbol2scm ("$papers"),
+                                  scm_cons (paper->self_scm (),
+                                            parser->lexer_->lookup_identifier ("$papers")));
+}
+
+/* Pop a paper from $papers stack */
+void
+pop_paper (Lily_parser *parser)
+{
+  if (scm_is_pair (parser->lexer_->lookup_identifier ("$papers")))
+    parser->lexer_->set_identifier (ly_symbol2scm ("$papers"),
+                                    scm_cdr (parser->lexer_->lookup_identifier ("$papers")));
+}
+
+/* Change the paper on top of $papers stack */
+void
+set_paper (Lily_parser *parser, Output_def *paper)
+{
+  scm_set_car_x (parser->lexer_->lookup_identifier ("$papers"), paper->self_scm ());
+}
+
 SCM
 get_header (Lily_parser *parser)
 {
   SCM id = parser->lexer_->lookup_identifier ("$defaultheader");
   if (!ly_is_module (id))
-    id = ly_make_anonymous_module (be_safe_global);
+    id = parser->make_scope ();
   else
     {
-      SCM nid = ly_make_anonymous_module (false);
-      ly_module_copy(nid,id);
+      SCM nid = parser->make_scope ();
+      ly_module_copy (nid, id);
       id = nid;
     }
-  
+
   return id;
 }
+
+SCM
+Lily_parser::make_scope () const
+{
+  SCM module = ly_make_module (be_safe_global);
+  return module;
+}