CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Graham Percival <[EMAIL PROTECTED]> 05/07/19 05:22:25
Modified files:
. : ChangeLog
lily : parser.yy
Log message:
Yoshinobu Ishizaki's patch to allow multiple header definitions.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3890&tr2=1.3891&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/parser.yy.diff?tr1=1.478&tr2=1.479&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3890 lilypond/ChangeLog:1.3891
--- lilypond/ChangeLog:1.3890 Tue Jul 19 00:41:14 2005
+++ lilypond/ChangeLog Tue Jul 19 05:22:25 2005
@@ -1,3 +1,8 @@
+2005-07-18 Yoshinobu Isizaki <[EMAIL PROTECTED]>
+
+ * lily/parser.yy (lilypond_header_body): enables
+ multiple header definition.
+
2005-07-19 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* lily/include/translator.icc
Index: lilypond/lily/parser.yy
diff -u lilypond/lily/parser.yy:1.478 lilypond/lily/parser.yy:1.479
--- lilypond/lily/parser.yy:1.478 Wed Jul 13 18:22:34 2005
+++ lilypond/lily/parser.yy Tue Jul 19 05:22:25 2005
@@ -626,8 +626,16 @@
lilypond_header_body:
{
- $$ = ly_make_anonymous_module (be_safe_global);
- THIS->lexer_->add_scope ($$);
+ SCM id = THIS->lexer_->lookup_identifier("$globalheader");
+ if ( ly_is_module(id) ){
+ // if the header exists, then comes here.
+ THIS->lexer_->add_scope(id);
+ $$ = id;
+ }else{
+ /* org code */
+ $$ = ly_make_anonymous_module (be_safe_global);
+ THIS->lexer_->add_scope ($$);
+ }
}
| lilypond_header_body assignment {
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
