release: 1.2.7

[lilypond.git] / lily / my-lily-parser.cc

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index 6f1809ca7b22baae1c50d9f1ae44a235ad81b2f0..de8b7c66bd03ee99646ecb4ae7996f04073460bf 100644 (file)
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
        Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -27,9 +27,11 @@ My_lily_parser::My_lily_parser (Sources * source_l)
   first_b_ = true;
   source_l_ = source_l;
   lexer_p_ = 0;
+  abbrev_beam_type_i_ = 0;
   default_duration_.durlog_i_ = 2;
+  default_pitch_ = Musical_pitch (5*7, 0);
   error_level_i_ = 0;
-  extender_req = 0;
+
   fatal_error_i_ = 0;
   default_header_p_ =0;
 }
@@ -58,7 +60,7 @@ My_lily_parser::parse_file (String init, String s)
   *mlog << _ ("Parsing...");
 
   init_parse_b_ = false;
-  set_yydebug (!monitor->silent_b ("Parser") && check_debug);
+  set_yydebug (!lily_monitor->silent_b ("Parser") && check_debug);
   lexer_p_->new_input (init, source_l_);
   do_yyparse ();
 
@@ -69,6 +71,8 @@ My_lily_parser::parse_file (String init, String s)
     }
 
   inclusion_global_array = lexer_p_->filename_str_arr_;
+
+  error_level_i_ = error_level_i_ | lexer_p_->errorlevel_i_; // ugh naming.
 }
 
 void
@@ -93,15 +97,25 @@ My_lily_parser::parser_error (String s)
   exit_status_i_ = 1;
 }
 
-
-
 void
 My_lily_parser::set_last_duration (Duration const *d)
 {
   default_duration_ = *d;
 }
 
+void
+My_lily_parser::set_abbrev_beam (int type_i)
+{
+  abbrev_beam_type_i_ = type_i;
+}
+
+void
+My_lily_parser::set_last_pitch (Musical_pitch const* p)
+{
+  default_pitch_ = *p;
+}
 
+// junk me
 Simultaneous_music*
 My_lily_parser::get_word_element (String s, Duration * duration_p)
 {
@@ -118,7 +132,7 @@ My_lily_parser::get_word_element (String s, Duration * duration_p)
   return velt_p;
 }
 
-
+// junk me
 Simultaneous_music *
 My_lily_parser::get_rest_element (String s,  Duration * duration_p)
 {
@@ -146,6 +160,7 @@ My_lily_parser::get_rest_element (String s,  Duration * duration_p)
   return velt_p;
 }
 
+// junk me
 Simultaneous_music *
 My_lily_parser::get_chord (Musical_pitch tonic, Array<Musical_pitch>* add_arr_p, Array<Musical_pitch>* sub_arr_p, Musical_pitch* inversion_p, Duration d)
 {
@@ -170,104 +185,7 @@ My_lily_parser::get_chord (Musical_pitch tonic, Array<Musical_pitch>* add_arr_p,
   return v;
 }
 
-Simultaneous_music *
-My_lily_parser::get_note_element (Note_req *rq, Duration * duration_p)
-{
-  Simultaneous_music*v = new Request_chord;
-  v->set_spot (here_input ());
-
-  v->add_music (rq);
-
-  rq->duration_ = *duration_p;
-  rq->set_spot (here_input ());
-  delete duration_p ;
-  return v;
-}
-
-
-/*
-  UGH.
- */
-Array<Request*>*
-My_lily_parser::get_parens_request (int t)
-{
-  Array<Request*>& reqs = *new Array<Request*>;
-  switch (t)
-    {
-    case '~':
-      reqs.push (new Tie_req);
-      break;
-
-    case '[':
-    case ']':
-      {
-       reqs.push (new Beam_req);
-      }
-      break;
-
-    case '>':
-    case '!':
-    case '<':
-      reqs.push (new Span_dynamic_req);
-      break;
-
-    case ')':
-    case '(':
-      {
-       reqs.push (new Slur_req);
-      }
-      break;
-    default:
-      assert (false);
-      break;
-    }
-
-  switch (t)
-    {
-    case '<':
-    case '>':
-    case '(':
-    case '[':
-      dynamic_cast<Span_req*> (reqs[0])->spantype_ = START;
-      break;
-      
-    case '!':
-    case ')':
-    case ']':
-      dynamic_cast<Span_req*> (reqs[0])->spantype_ = STOP;
-      break;
-
-    default:
-      break;
-    }
-
-  for (int i = 0; i < reqs.size (); i++)
-    if (dynamic_cast<Span_dynamic_req*> (reqs[i]))
-      {
-       Span_dynamic_req* s_l= dynamic_cast<Span_dynamic_req*> (reqs[i]);
-       s_l->dynamic_dir_ = (t == '<') ? UP:DOWN;
-      }
-
-  // ugh? don't we do this in the parser too?
-  reqs[0]->set_spot (here_input());
-  return &reqs;
-}
-
-void
-My_lily_parser::add_requests (Simultaneous_music*v)
-{
-  for (int i = 0; i < pre_reqs.size(); i++)
-    {
-      v->add_music (pre_reqs[i]);
-    }
-  pre_reqs.clear();
-  for (int i = 0; i <post_reqs.size(); i++)
-    {
-      v->add_music (post_reqs[i]);
-    }
 
-  post_reqs.clear();
-}
 
 Input
 My_lily_parser::pop_spot()
@@ -278,8 +196,7 @@ My_lily_parser::pop_spot()
 Input
 My_lily_parser::here_input() const
 {
-  Source_file * f_l= lexer_p_->source_file_l();
-  return Input (f_l, here_ch_C());
+  return  lexer_p_->here_input ();
 }
 
 Paper_def*