diff options
author | Andy Wingo <wingo@pobox.com> | 2018-06-17 22:42:20 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2018-06-17 22:42:20 +0200 |
commit | eb5e1b8d5f9cbe2313a04959643b4ee1b0464be8 (patch) | |
tree | dc2476d83e97e1bd1ac871f6fb63ff09330c4668 | |
parent | 82d56628878ad414af5175caf98ae62129bff254 (diff) | |
download | guile-eb5e1b8d5f9cbe2313a04959643b4ee1b0464be8.tar.gz |
Remove public SCM_VALIDATE_NIM
* libguile/random.c (scm_random): Remove needless use of
SCM_VALIDATE_NIM.
* libguile/srcprop.c (SCM_VALIDATE_NIM): Move definition here, as this
file is its only use.
* libguile/validate.h (SCM_VALIDATE_NIM): Remove. This was public but
unlikely to be used in the wild.
-rw-r--r-- | libguile/random.c | 1 | ||||
-rw-r--r-- | libguile/srcprop.c | 3 | ||||
-rw-r--r-- | libguile/validate.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libguile/random.c b/libguile/random.c index 75eb53b6a..13af962f0 100644 --- a/libguile/random.c +++ b/libguile/random.c @@ -411,7 +411,6 @@ SCM_DEFINE (scm_random, "random", 1, 1, 0, #error "Cannot deal with this platform's scm_t_bits size" #endif } - SCM_VALIDATE_NIM (1, n); if (SCM_REALP (n)) return scm_from_double (SCM_REAL_VALUE (n) * scm_c_uniform01 (SCM_RSTATE (state))); diff --git a/libguile/srcprop.c b/libguile/srcprop.c index 118c9da7c..fc819f739 100644 --- a/libguile/srcprop.c +++ b/libguile/srcprop.c @@ -196,6 +196,9 @@ SCM_DEFINE (scm_source_properties, "source-properties", 1, 0, 0, } #undef FUNC_NAME +#define SCM_VALIDATE_NIM(pos, scm) \ + SCM_MAKE_VALIDATE_MSG (pos, scm, NIMP, "non-immediate") + /* Perhaps this procedure should look through an alist and try to make a srcprops-object...? */ SCM_DEFINE (scm_set_source_properties_x, "set-source-properties!", 2, 0, 0, diff --git a/libguile/validate.h b/libguile/validate.h index cb15622bc..386a21932 100644 --- a/libguile/validate.h +++ b/libguile/validate.h @@ -31,8 +31,6 @@ -#define SCM_VALIDATE_NIM(pos, scm) SCM_MAKE_VALIDATE_MSG (pos, scm, NIMP, "non-immediate") - #define SCM_VALIDATE_BOOL(pos, flag) \ do { \ SCM_ASSERT_TYPE (scm_is_bool (flag), flag, pos, FUNC_NAME, "boolean"); \ |