CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/06/09 18:05:32
Modified files:
. : ChangeLog
lily : lily-parser.cc parser.yy scm-hash.cc
lily/include : lily-guile-macros.hh lily-parser.hh
scm : lily.scm
Log message:
* lily/include/lily-guile-macros.hh: don't protect exported module
objects.
* lily/include/lily-parser.hh (class Lily_parser): remove beam_check().
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3751&tr2=1.3752&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/lily-parser.cc.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/parser.yy.diff?tr1=1.474&tr2=1.475&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/scm-hash.cc.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/lily-guile-macros.hh.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/lily-parser.hh.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/lily.scm.diff?tr1=1.358&tr2=1.359&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3751 lilypond/ChangeLog:1.3752
--- lilypond/ChangeLog:1.3751 Thu Jun 9 17:16:45 2005
+++ lilypond/ChangeLog Thu Jun 9 18:05:30 2005
@@ -1,5 +1,10 @@
2005-06-09 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/include/lily-guile-macros.hh: don't protect exported module
+ objects.
+
+ * lily/include/lily-parser.hh (class Lily_parser): remove beam_check().
+
* scm/backend-library.scm (postscript->pdf): use
delete-intermediate-files iso. running-from-gui?
Index: lilypond/lily/include/lily-guile-macros.hh
diff -u lilypond/lily/include/lily-guile-macros.hh:1.4
lilypond/lily/include/lily-guile-macros.hh:1.5
--- lilypond/lily/include/lily-guile-macros.hh:1.4 Wed Mar 16 19:19:15 2005
+++ lilypond/lily/include/lily-guile-macros.hh Thu Jun 9 18:05:31 2005
@@ -55,7 +55,11 @@
/*
TODO: rename me to ly_c_lily_module_eval
+
+ we don't have to protect the result; it's already part of the
+ exports list of the module.
*/
+
#define ly_lily_module_constant(x) \
({ \
static SCM cached; \
@@ -64,8 +68,8 @@
if (__builtin_constant_p ((x))) \
{
\
if (!cached) \
- value = cached = scm_gc_protect_object (scm_eval (scm_str2symbol (x),
\
-
global_lily_module)); \
+ value = cached = scm_eval (scm_str2symbol (x), \
+
global_lily_module); \
}
\
else \
value = scm_eval (scm_str2symbol (x), global_lily_module); \
Index: lilypond/lily/include/lily-parser.hh
diff -u lilypond/lily/include/lily-parser.hh:1.6
lilypond/lily/include/lily-parser.hh:1.7
--- lilypond/lily/include/lily-parser.hh:1.6 Thu Mar 10 14:36:12 2005
+++ lilypond/lily/include/lily-parser.hh Thu Jun 9 18:05:31 2005
@@ -47,14 +47,12 @@
int fatal_error_;
int error_level_;
bool ignore_version_b_;
- SCM last_beam_start_;
Lily_parser (Sources *sources);
Lily_parser (Lily_parser const &);
DECLARE_SCHEME_CALLBACK (layout_description, ());
- void beam_check (SCM);
void do_init_file ();
void do_yyparse ();
void parse_file (String init, String name, String out_name);
Index: lilypond/lily/lily-parser.cc
diff -u lilypond/lily/lily-parser.cc:1.38 lilypond/lily/lily-parser.cc:1.39
--- lilypond/lily/lily-parser.cc:1.38 Thu Apr 14 20:19:07 2005
+++ lilypond/lily/lily-parser.cc Thu Jun 9 18:05:31 2005
@@ -31,7 +31,6 @@
sources_ = sources;
default_duration_ = Duration (2, 0);
error_level_ = 0;
- last_beam_start_ = SCM_EOL;
smobify_self ();
}
@@ -44,7 +43,6 @@
sources_ = src.sources_;
default_duration_ = src.default_duration_;
error_level_ = src.error_level_;
- last_beam_start_ = src.last_beam_start_;
smobify_self ();
if (src.lexer_)
Index: lilypond/lily/parser.yy
diff -u lilypond/lily/parser.yy:1.474 lilypond/lily/parser.yy:1.475
--- lilypond/lily/parser.yy:1.474 Thu Jun 9 14:09:33 2005
+++ lilypond/lily/parser.yy Thu Jun 9 18:05:31 2005
@@ -2097,14 +2097,10 @@
{
Duration dd = THIS->default_duration_;
$$ = dd.smobbed_copy ();
-
- THIS->beam_check ($$);
}
| multiplied_duration {
$$ = $1;
THIS->default_duration_ = *unsmob_duration ($$);
-
- THIS->beam_check ($$);
}
;
@@ -2665,28 +2661,6 @@
}
-/* FIXME: Should make this optional? It will also complain at
-
- [s4]
-
-which is entirely legitimate.
-
-Or we can scrap it. Barchecks should detect wrong durations, and
-skipTypesetting speeds it up a lot. */
-
-void
-Lily_parser::beam_check (SCM dur)
-{
- Duration *d = unsmob_duration (dur);
- if (unsmob_music (last_beam_start_) && d->duration_log () <= 2)
- {
- Music *m = unsmob_music (last_beam_start_);
- m->origin ()->warning (_f ("suspect duration in beam: %s",
- d->to_string ()));
- }
- last_beam_start_ = SCM_EOL;
-}
-
Index: lilypond/lily/scm-hash.cc
diff -u lilypond/lily/scm-hash.cc:1.45 lilypond/lily/scm-hash.cc:1.46
--- lilypond/lily/scm-hash.cc:1.45 Wed May 4 10:35:56 2005
+++ lilypond/lily/scm-hash.cc Thu Jun 9 18:05:31 2005
@@ -76,8 +76,7 @@
Scheme_hash_table::print_smob (SCM s, SCM p, scm_print_state*)
{
assert (unsmob (s));
- char str[1000];
- sprintf (str, "#<Scheme_hash_table 0x%0lx ", SCM_UNPACK (s));
+ scm_puts ("#<Scheme_hash_table ", p);
Scheme_hash_table *me = (Scheme_hash_table *) SCM_CELL_WORD_1 (s);
scm_display (me->hash_tab_, p);
scm_puts ("> ", p);
Index: lilypond/scm/lily.scm
diff -u lilypond/scm/lily.scm:1.358 lilypond/scm/lily.scm:1.359
--- lilypond/scm/lily.scm:1.358 Thu Jun 9 17:16:46 2005
+++ lilypond/scm/lily.scm Thu Jun 9 18:05:31 2005
@@ -326,7 +326,7 @@
(lambda () (ly:parse-file file-name))
(lambda (x . args) (handler x file-name)))
- (if #f
+ (if #t
(dump-gc-protects)))
(use-modules (scm editor))
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
