From 368cf54d897a35436b65bbc7e451df1493b12697 Mon Sep 17 00:00:00 2001 From: "Greg J. Badros" Date: Wed, 5 Jan 2000 16:16:57 +0000 Subject: * unif.c, symbols.c, strings.c, stacks.c, random.c, print.c, posix.c: Eliminated a bunch of SCM_NIMP(..)s that are now redundant with the safer macros. Patch from Dirk Hermann applied by hand. Thanks Dirk! * scm_validate.h: Added SCM_VALIDATE_VECTOR_OR_DVECTOR for some uses in random.c. * ramap.c: whitespace change. --- libguile/random.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'libguile/random.c') diff --git a/libguile/random.c b/libguile/random.c index 2c424c5d1..372ff61e0 100644 --- a/libguile/random.c +++ b/libguile/random.c @@ -466,9 +466,7 @@ GUILE_PROC (scm_random_solid_sphere_x, "random:solid-sphere!", 1, 1, 0, "") #define FUNC_NAME s_scm_random_solid_sphere_x { - SCM_ASSERT (SCM_NIMP (v) - && (SCM_VECTORP (v) || SCM_TYP7 (v) == scm_tc7_dvect), - v, SCM_ARG1, FUNC_NAME); + SCM_VALIDATE_VECTOR_OR_DVECTOR(1,v); if (SCM_UNBNDP (state)) state = SCM_CDR (scm_var_random_state); SCM_VALIDATE_RSTATE(2,state); @@ -486,9 +484,7 @@ GUILE_PROC (scm_random_hollow_sphere_x, "random:hollow-sphere!", 1, 1, 0, "") #define FUNC_NAME s_scm_random_hollow_sphere_x { - SCM_ASSERT (SCM_NIMP (v) - && (SCM_VECTORP (v) || SCM_TYP7 (v) == scm_tc7_dvect), - v, SCM_ARG1, FUNC_NAME); + SCM_VALIDATE_VECTOR_OR_DVECTOR(1,v); if (SCM_UNBNDP (state)) state = SCM_CDR (scm_var_random_state); SCM_VALIDATE_RSTATE(2,state); @@ -505,9 +501,7 @@ GUILE_PROC (scm_random_normal_vector_x, "random:normal-vector!", 1, 1, 0, #define FUNC_NAME s_scm_random_normal_vector_x { int n; - SCM_ASSERT (SCM_NIMP (v) - && (SCM_VECTORP (v) || SCM_TYP7 (v) == scm_tc7_dvect), - v, SCM_ARG1, FUNC_NAME); + SCM_VALIDATE_VECTOR_OR_DVECTOR(1,v); if (SCM_UNBNDP (state)) state = SCM_CDR (scm_var_random_state); SCM_VALIDATE_RSTATE(2,state); -- cgit v1.2.3