lilypond-0.0.44

diff --git a/lily/include/parseconstruct.hh b/lily/include/parseconstruct.hh
index 6a44167532c8e8a672bc0dc798e3adf324b42158..45b7c3f3c8404b23d2d485fe51c0982e1a8a6d95 100644 (file)
--- a/lily/include/parseconstruct.hh
+++ b/lily/include/parseconstruct.hh
@@ -9,27 +9,12 @@
 
 #include "proto.hh"
 
-extern char const* defined_ch_c_l;
-extern char const* req_defined_ch_c_l;
-
-
-
-
-Voice_element * get_note_element(Note_req * ,int *);
-Voice_element* get_rest_element(String,int *);
-Voice_element* get_word_element(Text_def*, int*);
-void add_requests( Voice_element*v, Array<Request*>&req);
-Request* get_request(char);
-Script_def* get_scriptdef(char);
-Text_def*get_text(String s);
+String * get_scriptdef(char c);
+Request* get_script_req(char);
 Request* get_plet_request( char c, int dur_i, int type_i ); 
 Request*get_script_req(int d , Script_def*def);
 Request*get_text_req(int d , Text_def*def);
 Request* get_stemdir_req(int);
-
-
-
-
 Request*get_grouping_req(Array<int> i_arr);
 
 #endif // PARSECONSTRUCT_HH

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
new file mode 100644 (file)
index 0000000..6340a91
--- /dev/null
+++ b/lily/my-lily-parser.cc
@@ -0,0 +1,232 @@
+/*
+  my-lily-parser.cc -- implement 
+
+  source file of the LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+#include "my-lily-parser.hh"
+#include "my-lily-lexer.hh"
+#include "debug.hh"
+#include "main.hh"
+#include "voice-element.hh"
+#include "musical-request.hh"
+#include "command-request.hh"
+
+void
+My_lily_parser::set_debug()
+{
+#ifndef NPRINT
+    String s = "";
+    if (init_parse_b_) 
+       s = "Init";
+    set_yydebug( !monitor->silence(s+"Parser") && check_debug);
+    lexer_p_->set_debug( !monitor->silence(s+"Lexer") && check_debug);
+#endif
+}
+void
+My_lily_parser::print_declarations()
+{
+#ifndef NPRINT
+    String s = "";
+    if (init_parse_b_) 
+       s = "Init";
+    if (!monitor->silence(s+"Declarations") && check_debug) {
+       lexer_p_->print_declarations(init_parse_b_);
+    }
+#endif   
+}
+
+void
+My_lily_parser::parse_file(String init, String s)
+{
+    *mlog << "Parsing ... ";
+    lexer_p_ = new My_lily_lexer;
+
+    set_debug();
+
+    lexer_p_->new_input(init, source_l_);
+    do_yyparse();
+    print_declarations();
+   
+    init_parse_b_ = false;
+    lexer_p_->new_input(s, source_l_);
+    do_yyparse();
+
+
+    if(!define_spot_array_.empty())
+       warning("Braces don't match.",0);
+}
+
+My_lily_parser::~My_lily_parser()
+{
+    delete lexer_p_;
+}
+    
+void
+My_lily_parser::remember_spot()
+{
+    define_spot_array_.push(here_ch_C());
+}
+
+char const * 
+My_lily_parser::here_ch_C()const
+{
+    return lexer_p_->here_ch_C();
+}
+
+void
+My_lily_parser::parser_error(String s)
+{
+    lexer_p_->LexerError(s);
+
+    if ( fatal_error_i_ )
+       exit( fatal_error_i_ );
+    error_level_i_ = 1;
+}
+
+void
+My_lily_parser::set_duration_mode(String s)
+{
+    s = s.upper_str();
+    last_duration_mode = (s== "LAST");
+}
+
+void
+My_lily_parser::set_last_duration(Duration const *d)
+{
+    if (last_duration_mode)
+       default_duration_ = *d;
+}
+
+
+Voice_element*
+My_lily_parser::get_word_element(Text_def* tdef_p, Duration * duration_p)
+{
+    Voice_element* velt_p = new Voice_element;
+    
+    Lyric_req* lreq_p = new Lyric_req(tdef_p);
+
+    lreq_p->duration_ = *duration_p;
+    lreq_p->print();
+    lreq_p->defined_ch_C_ = here_ch_C();
+
+    velt_p->add(lreq_p);
+
+    delete  duration_p;
+    return velt_p;
+}
+
+Voice_element *
+My_lily_parser::get_rest_element(String,  Duration * duration_p )
+{    
+    Voice_element* velt_p = new Voice_element;
+    velt_p->defined_ch_C_ = lexer_p_->here_ch_C();
+
+    Rest_req * rest_req_p = new Rest_req;
+    rest_req_p->duration_ = *duration_p;
+    rest_req_p->print();
+    rest_req_p->defined_ch_C_ = here_ch_C();
+
+    velt_p->add(rest_req_p);
+    delete duration_p;
+    return velt_p;
+}
+
+Voice_element *
+My_lily_parser::get_note_element(Note_req *rq, Duration * duration_p )
+{
+    Voice_element*v = new Voice_element;
+    v->defined_ch_C_ = here_ch_C();
+    
+    if (duration_p->type_i_ >= 2) {
+       Stem_req * stem_req_p = new Stem_req();
+       stem_req_p->duration_ = *duration_p;
+       
+       stem_req_p->defined_ch_C_ = here_ch_C();
+       v->add(stem_req_p);
+    }
+
+    rq->set_duration(*duration_p);
+    rq->defined_ch_C_ = here_ch_C();
+
+
+    v->add(rq);
+    delete duration_p ;
+    return v;
+}
+
+Request*
+My_lily_parser::get_parens_request(char c)
+{
+    Request* req_p=0;
+    switch (c) {
+    case '|':
+       req_p = new Barcheck_req;
+       break;
+
+    case '[':
+    case ']':
+    {
+       Beam_req*b = new Beam_req;
+       int p_i=default_duration_.plet_.type_i_ ; // ugh . Should junk?
+       if (p_i!= 1)
+           b->nplet = p_i;
+       req_p = b;
+    }
+    break;
+
+
+    case ')':
+    case '(':
+       req_p = new Slur_req;
+       break;
+    default:
+       assert(false);
+       break;
+    }
+    
+    switch (c) {
+    case '(':
+    case '[':
+       req_p->span()->spantype = Span_req::START;
+       break;
+    case ')':
+    case ']':
+       req_p->span()->spantype = Span_req::STOP;
+       break;
+       
+    default:
+       break;
+    }
+
+    req_p->defined_ch_C_ = here_ch_C();
+    return req_p;
+}
+
+My_lily_parser::My_lily_parser(Sources * source_l)
+{
+    source_l_ = source_l;
+    lexer_p_ = 0;
+    default_duration_.type_i_ = 4;
+    default_octave_i_=0;
+    textstyle_str_="roman";            // in lexer?
+    error_level_i_ = 0;
+    last_duration_mode = false;
+    defined_ch_C_ = 0;
+    fatal_error_i_ = 0;
+}
+
+void
+My_lily_parser::add_requests(Voice_element*v)
+{
+    for (int i = 0; i < pre_reqs.size(); i++) {
+       v->add(pre_reqs[i]);
+    }
+    pre_reqs.set_size(0);
+    for (int i = 0; i <post_reqs.size(); i++) {
+       v->add(post_reqs[i]);
+    }
+    post_reqs.set_size(0);
+}