lilypond-0.0.71pre

diff --git a/init/symbol.ini b/init/symbol.ini
index d14a1037a0d3d850d13d4a3dca0d4129b84f2b23..df9c040652d7465e6567181e6e3bba66bd1577a2 100644 (file)
--- a/init/symbol.ini
+++ b/init/symbol.ini
@@ -7,5 +7,3 @@
 \include "table_sixteen.ini"
 
 
-%% Fix Me. This sux.
-\init_end ;

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index a4b7f13a8e25a7d075290b7c5e3333f727859aeb..69be888d94c3bebcdea41904490e6bacb2c9dcae 100644 (file)
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -42,6 +42,7 @@ My_lily_parser::print_declarations()
 {
 #ifndef NPRINT
     String s = "";
+    
     if (init_parse_b_) 
        s = "Init";
     if (!monitor->silence(s+"Declarations") && check_debug) {
@@ -50,31 +51,25 @@ My_lily_parser::print_declarations()
 #endif   
 }
 
-void
-My_lily_parser::do_init_file()
-{
-    init_parse_b_ = true;
-    set_debug();
-    lexer_p_->new_input(init_str_, source_l_);
-}
-
 void
 My_lily_parser::parse_file(String init, String s)
 {
     lexer_p_ = new My_lily_lexer;
     init_str_ = init;
     
+    *mlog << "Parsing ... ";
     
+    init_parse_b_ = true;
+    lexer_p_->new_input( init, source_l_);
+    do_yyparse();
+    print_declarations();
 
-    *mlog << "Parsing ... ";
-    lexer_p_->new_input(s, source_l_);
-    if (!lexer_p_->source_file_l()) {
-       warning("Can not find toplevel file. Ignoring " + s);
-       return; 
-    }
+    init_parse_b_ = false;
+    lexer_p_->new_input( s , source_l_);
     do_yyparse();
     print_declarations();
 
+    
     if(!define_spot_array_.empty())
        warning("Braces don't match.");
 }