From 73ef98d674b43e40987b59afb80e9d640a026431 Mon Sep 17 00:00:00 2001 From: Mikael Djurfeldt Date: Mon, 20 Sep 1999 22:10:38 +0000 Subject: [PATCH] Fix --- libguile/ChangeLog | 4 +++- libguile/numbers.c | 12 ++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libguile/ChangeLog b/libguile/ChangeLog index fb84e026e..eb4d530fa 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,4 +1,6 @@ -1999-09-20 Mikael Djurfeldt +1999-09-21 Mikael Djurfeldt + + * __scm.h (SCM_WTA_DISPATCH_0, SCM_GASSERT0): New macros. * numbers.c (scm_max, scm_min, scm_sum, scm_difference, scm_product, scm_divide): Bugfix: Don't pass SCM_UNDEFINED to the diff --git a/libguile/numbers.c b/libguile/numbers.c index 444e02b9d..894513407 100644 --- a/libguile/numbers.c +++ b/libguile/numbers.c @@ -3030,9 +3030,9 @@ scm_max (x, y) #endif if (SCM_UNBNDP (y)) { -#ifndef SCM_RECKLESS + SCM_GASSERT0 (!SCM_UNBNDP (x), + g_max, scm_makfrom0str (s_max), SCM_WNA, 0); SCM_GASSERT1 (SCM_NUMBERP (x), g_max, x, SCM_ARG1, s_max); -#endif return x; } #ifdef SCM_FLOATS @@ -3147,9 +3147,9 @@ scm_min (x, y) #endif if (SCM_UNBNDP (y)) { -#ifndef SCM_RECKLESS + SCM_GASSERT0 (!SCM_UNBNDP (x), + g_min, scm_makfrom0str (s_min), SCM_WNA, 0); SCM_GASSERT1 (SCM_NUMBERP (x), g_min, x, SCM_ARG1, s_min); -#endif return x; } #ifdef SCM_FLOATS @@ -3462,6 +3462,8 @@ scm_difference (x, y) { if (SCM_UNBNDP (y)) { + SCM_GASSERT0 (!SCM_UNBNDP (x), g_difference, + scm_makfrom0str (s_difference), SCM_WNA, 0); badx: SCM_WTA_DISPATCH_1 (g_difference, x, SCM_ARG1, s_difference); } @@ -3918,6 +3920,8 @@ scm_divide (x, y) { if (SCM_UNBNDP (y)) { + SCM_GASSERT0 (!SCM_UNBNDP (x), + g_divide, scm_makfrom0str (s_divide), SCM_WNA, 0); badx: SCM_WTA_DISPATCH_1 (g_divide, x, SCM_ARG1, s_divide); }