X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-parser.cc;h=d2499d4c4134c1453cc0a9b1a8618282df26da33;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=2cc3916ca681edf3155563f2d63e3d153beed30a;hpb=b7a0cffbf9d1069860368f289a5b50e9d1d90ba8;p=lilypond.git

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index 2cc3916ca6..d2499d4c41 100644
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.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
@@ -32,18 +32,20 @@
 #include "paper-book.hh"
 #include "parser.hh"
 #include "score.hh"
+#include "source-file.hh"
 #include "sources.hh"
 #include "warn.hh"
 #include "program-option.hh"
 
-#include "ly-smobs.icc"
 
 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 ();
 
@@ -51,42 +53,42 @@ Lily_parser::Lily_parser (Sources *sources)
   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_, this);
+      lexer_ = new Lily_lexer (*src.lexer_, this, location);
+      lexer_->unprotect ();
     }
-  
-  lexer_->unprotect ();
 }
 
 Lily_parser::~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);
@@ -95,10 +97,8 @@ 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)
 {
-  // TODO: use $parser 
-  lexer_->set_identifier (ly_symbol2scm ("parser"), self_scm ());
   output_basename_ = out_name;
 
   lexer_->main_input_name_ = name;
@@ -118,50 +118,60 @@ Lily_parser::parse_file (string init, string name, string out_name)
      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_.empty ())
-    {
-      define_spots_.back ().warning (_ ("braces do not match"));
-      error_level_ = 1;
-    }
-
   error_level_ = error_level_ | lexer_->error_level_;
   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; 
   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_.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_.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_);
 }
 
 void
@@ -170,51 +180,40 @@ Lily_parser::clear ()
   if (lexer_)
     {
       while (lexer_->has_scope ())
-	lexer_->remove_scope ();
+        lexer_->remove_scope ();
     }
 
-  lexer_ = 0;  
-}
-
-char const *
-Lily_parser::here_str0 () const
-{
-  return lexer_->here_str0 ();
+  lexer_ = 0;
 }
 
 void
-Lily_parser::parser_error (string s)
+Lily_parser::parser_error (const string &s)
 {
-  lexer_->here_input ().error (_ (s.c_str ()));
+  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;
 }
 
-
-
-IMPLEMENT_SMOBS (Lily_parser);
-IMPLEMENT_TYPE_P (Lily_parser, "ly:lily-parser?");
-IMPLEMENT_DEFAULT_EQUAL_P (Lily_parser);
-
+const char * const Lily_parser::type_p_name_ = "ly:lily-parser?";
 
 /****************************************************************
-  OUTPUT-DEF 
+  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);
-    
+
   return layout;
 }
 
@@ -222,7 +221,7 @@ 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;
@@ -234,10 +233,10 @@ Output_def *
 get_paper (Lily_parser *parser)
 {
   SCM papers = parser->lexer_->lookup_identifier ("$papers");
-  Output_def *layout = ((papers == SCM_UNDEFINED) || scm_is_null (papers)) ?
-    0 : unsmob_output_def (scm_car (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 ? 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);
@@ -264,7 +263,7 @@ push_paper (Lily_parser *parser, Output_def *paper)
 void
 pop_paper (Lily_parser *parser)
 {
-  if (! scm_is_null (parser->lexer_->lookup_identifier ("$papers")))
+  if (scm_is_pair (parser->lexer_->lookup_identifier ("$papers")))
     parser->lexer_->set_identifier (ly_symbol2scm ("$papers"),
                                     scm_cdr (parser->lexer_->lookup_identifier ("$papers")));
 }
@@ -288,13 +287,13 @@ get_header (Lily_parser *parser)
       ly_module_copy (nid, id);
       id = nid;
     }
-  
+
   return id;
 }
 
-SCM 
+SCM
 Lily_parser::make_scope () const
 {
-  SCM module = ly_make_anonymous_module (be_safe_global);
-  return module;    
+  SCM module = ly_make_module (be_safe_global);
+  return module;
 }