(My_lily_parser): only copy lexer if it

exists

diff --git a/ChangeLog b/ChangeLog
index dd104ef9703152c60a94006780f35daabd390f37..3db38215ffeff938c9d6797a50a711b97fa56584 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-22  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * lily/my-lily-parser.cc (My_lily_parser): only copy lexer if it
+       exists
+
 2004-06-22  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scm/output-gnome.scm: 

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 2fbfeeae1796434ed8df393ea26fa348502ef93d..8bf2f262640f04eb334e0ecbf15013c3d21d16e0 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -6,7 +6,7 @@ STEPMAKE_TEMPLATES=documentation texinfo tex
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
 LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"'
 README_TOP_FILES= DEDICATION ChangeLog
-EXTRA_DIST_FILES= 
+EXTRA_DIST_FILES= texinfo.css
 
 include $(depth)/make/stepmake.make 
 

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index 6accfaa91d9019604ac3716c1568ae6d18324c1e..bf251d11cec8e0ac700f021227799c05e2e912a3 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -101,7 +101,7 @@ My_lily_lexer::My_lily_lexer (Sources *sources)
 My_lily_lexer::My_lily_lexer (My_lily_lexer const &src)
   : Includable_lexer ()
 {
-  keytable_ = new Keyword_table (*src.keytable_);
+  keytable_ =  (src.keytable_) ? new Keyword_table (*src.keytable_) : 0;
   encoding_ = src.encoding_;
   chordmodifier_tab_ = src.chordmodifier_tab_;
   pitchname_tab_stack_ = src.pitchname_tab_stack_;

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index 100b2c47713f2f3fb2ffbdd617333e78fe4d9a4c..44c858171990d1942f33e7aaf6ab6aca26a53729 100644 (file)
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -47,7 +47,8 @@ My_lily_parser::My_lily_parser (My_lily_parser const &src)
   last_beam_start_ = src.last_beam_start_;
 
   smobify_self ();
-  lexer_ = new My_lily_lexer (*src.lexer_);
+  if (src.lexer_)
+    lexer_ = new My_lily_lexer (*src.lexer_);
 }
 
 My_lily_parser::~My_lily_parser ()