From b26c0459dde1fe822d65d21c440d696cb35842d5 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 14 Jun 2004 22:06:19 +0000 Subject: [PATCH] (before_line_breaking): do not return SCM_UNDEFINED to Scheme. --- ChangeLog | 6 ++++++ lily/context-scheme.cc | 2 +- lily/grob-scheme.cc | 4 ++-- lily/input-smob.cc | 2 +- lily/ly-module.cc | 2 +- lily/my-lily-parser.cc | 4 ++-- lily/stencil-scheme.cc | 2 +- lily/tuplet-bracket.cc | 2 +- 8 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8511362748..2c0c3e6174 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ +2004-06-15 Han-Wen Nienhuys + + * lily/tuplet-bracket.cc (before_line_breaking): do not return + SCM_UNDEFINED to Scheme. + 2004-06-14 Han-Wen Nienhuys * lily/book.cc: remove Book::to_stencil(). + (process): whoops. Score::book_rendering returns vector, not list. * scripts/convert-ly.py (conv): remove \notes. apply to input examples. diff --git a/lily/context-scheme.cc b/lily/context-scheme.cc index f6a03404fd..cbedf5ea3c 100644 --- a/lily/context-scheme.cc +++ b/lily/context-scheme.cc @@ -47,7 +47,7 @@ LY_DEFINE (ly_context_pushpop_property, "ly:context-pushpop-property", execute_pushpop_property (tg, grob, eltprop, val); - return SCM_UNDEFINED; + return SCM_UNSPECIFIED; } LY_DEFINE (ly_context_property, "ly:context-property", diff --git a/lily/grob-scheme.cc b/lily/grob-scheme.cc index 05eedf6512..7b37fecab7 100644 --- a/lily/grob-scheme.cc +++ b/lily/grob-scheme.cc @@ -156,7 +156,7 @@ LY_DEFINE (ly_grob_suicide, "ly:grob-suicide", SCM_ASSERT_TYPE (me, g, SCM_ARG1, __FUNCTION__, "grob"); me->suicide (); - return SCM_UNDEFINED; + return SCM_UNSPECIFIED; } LY_DEFINE (ly_grob_translate_axis_x, "ly:grob-translate-axis!", @@ -169,7 +169,7 @@ LY_DEFINE (ly_grob_translate_axis_x, "ly:grob-translate-axis!", SCM_ASSERT_TYPE (is_axis (a), a, SCM_ARG3, __FUNCTION__, "axis"); me->translate_axis (ly_scm2double (d), Axis (ly_scm2int (a))); - return SCM_UNDEFINED; + return SCM_UNSPECIFIED; } LY_DEFINE (ly_spanner_p, "ly:spanner?", diff --git a/lily/input-smob.cc b/lily/input-smob.cc index 595ee717da..798e61d51a 100644 --- a/lily/input-smob.cc +++ b/lily/input-smob.cc @@ -90,7 +90,7 @@ LY_DEFINE (ly_input_message, "ly:input-message", 2, 0, 0, (SCM sip, SCM msg), String m = ly_scm2string (msg); ip->message (m); - return SCM_UNDEFINED; + return SCM_UNSPECIFIED; } /* diff --git a/lily/ly-module.cc b/lily/ly-module.cc index 247a456dc3..f90176be4f 100644 --- a/lily/ly-module.cc +++ b/lily/ly-module.cc @@ -84,7 +84,7 @@ LY_DEFINE (ly_import_module, "ly:import-module", SCM_VALIDATE_MODULE (1, src); scm_internal_hash_fold ((Hash_cl_func) &ly_module_define, (void*) dest, SCM_EOL, SCM_MODULE_OBARRAY (src)); - return SCM_UNDEFINED; + return SCM_UNSPECIFIED; } static SCM diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc index bd9c938a3c..bd8939af9d 100644 --- a/lily/my-lily-parser.cc +++ b/lily/my-lily-parser.cc @@ -442,7 +442,7 @@ LY_DEFINE (ly_parser_print_score, "ly:parser-print-score", header, os); scm_gc_unprotect_object (paper->self_scm ()); } - return SCM_UNDEFINED; + return SCM_UNSPECIFIED; } @@ -493,6 +493,6 @@ LY_DEFINE (ly_parser_print_book, "ly:parser-print-book", scm_gc_unprotect_object (paper->self_scm ()); scm_gc_unprotect_object (pb->self_scm ()); - return SCM_UNDEFINED; + return SCM_UNSPECIFIED; } diff --git a/lily/stencil-scheme.cc b/lily/stencil-scheme.cc index 8f069bba45..0848c1afc3 100644 --- a/lily/stencil-scheme.cc +++ b/lily/stencil-scheme.cc @@ -30,7 +30,7 @@ LY_DEFINE (ly_stencil_set_extent_x, "ly:stencil-set-extent!", Interval iv = ly_scm2interval (np); s->dim_[Axis (ly_scm2int (axis))] = iv; - return SCM_UNDEFINED; + return SCM_UNSPECIFIED; } LY_DEFINE (ly_translate_stencil_axis, "ly:stencil-translate-axis", diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index 7a56f9c5d4..493cf23998 100644 --- a/lily/tuplet-bracket.cc +++ b/lily/tuplet-bracket.cc @@ -426,7 +426,7 @@ Tuplet_bracket::before_line_breaking (SCM smob) if (b) me->add_dependency (b); } - return SCM_UNDEFINED; + return SCM_UNSPECIFIED; } MAKE_SCHEME_CALLBACK (Tuplet_bracket,after_line_breaking,1); -- 2.39.2