diff options
author | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2001-03-17 13:34:21 +0000 |
---|---|---|
committer | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2001-03-17 13:34:21 +0000 |
commit | b3fcac341bca85278d1694d09e2d3207edb5ab94 (patch) | |
tree | 9ffd590ab04035fbe899a84195452548fdd0edf7 /libguile/validate.h | |
parent | 68baa7e7f8088e21eaa3d0b568a985528314ada5 (diff) | |
download | guile-b3fcac341bca85278d1694d09e2d3207edb5ab94.tar.gz |
* __scm.h (SCM_ASSERT, SCM_WTA_DISPATCH_0, SCM_WTA_DISPATCH_1,
SCM_WTA_DISPATCH_2, SCM_WTA_DISPATCH_n): Don't call scm_wta, call
scm_wrong_type_arg instead.
(SCM_WNA): Deprecated.
* error.[ch] (scm_wta): Deprecated.
* numbers.c (s_i_log): Minor comment fix.
* read.c (scm_lreadr), unif.c (scm_aind, scm_shap2ra,
scm_make_shared_array, scm_transpose_array, scm_enclose_array,
scm_array_in_bounds_p): Don't use SCM_ASSERT to check for
wrong-num-args or misc errors.
* unif.c (scm_make_shared_array, scm_transpose_array,
scm_enclose_array, scm_array_in_bounds_p, scm_array_set_x):
Validate the rest argument (note: this is only done when guile is
built with SCM_DEBUG_REST_ARGUMENT=1)
(scm_array_in_bounds_p, scm_uniform_vector_ref, scm_array_set_x):
Replace calls to scm_wrong_num_args by SCM_WRONG_NUM_ARGS.
* validate.h (SCM_FUNC_NAME, SCM_VALIDATE_NUMBER_COPY,
SCM_VALIDATE_NUMBER_DEF_COPY): Deprecated.
Diffstat (limited to 'libguile/validate.h')
-rw-r--r-- | libguile/validate.h | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/libguile/validate.h b/libguile/validate.h index a75e7eea2..0a147df49 100644 --- a/libguile/validate.h +++ b/libguile/validate.h @@ -1,4 +1,4 @@ -/* $Id: validate.h,v 1.29 2001-03-17 12:20:36 dirk Exp $ */ +/* $Id: validate.h,v 1.30 2001-03-17 13:34:21 dirk Exp $ */ /* Copyright (C) 1999, 2000 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify @@ -45,8 +45,6 @@ #ifndef SCM_VALIDATE_H__ #define SCM_VALIDATE_H__ -#define SCM_FUNC_NAME (scm_makfrom0str (FUNC_NAME)) - #define SCM_SYSERROR do { scm_syserror (FUNC_NAME); } while (0) #define SCM_MEMORY_ERROR do { scm_memory_error (FUNC_NAME); } while (0) @@ -149,29 +147,6 @@ #define SCM_VALIDATE_NUMBER(pos, z) SCM_MAKE_VALIDATE (pos, z, NUMBERP) -#define SCM_VALIDATE_NUMBER_COPY(pos, z, cvar) \ - do { \ - if (SCM_INUMP (z)) \ - cvar = (double) SCM_INUM (z); \ - else if (SCM_REALP (z)) \ - cvar = SCM_REAL_VALUE (z); \ - else if (SCM_BIGP (z)) \ - cvar = scm_big2dbl (z); \ - else \ - { \ - cvar = 0.0; \ - SCM_WRONG_TYPE_ARG (pos, z); \ - } \ - } while (0) - -#define SCM_VALIDATE_NUMBER_DEF_COPY(pos, number, def, cvar) \ - do { \ - if (SCM_UNBNDP (number)) \ - cvar = def; \ - else \ - SCM_VALIDATE_NUMBER_COPY(pos, number, cvar); \ - } while (0) - #define SCM_VALIDATE_INUM(pos, k) SCM_MAKE_VALIDATE (pos, k, INUMP) #define SCM_VALIDATE_INUM_COPY(pos, k, cvar) \ @@ -405,12 +380,37 @@ #if (SCM_DEBUG_DEPRECATED == 0) +#define SCM_FUNC_NAME (scm_makfrom0str (FUNC_NAME)) + #define SCM_WTA(pos, scm) \ do { scm_wta (scm, (char *) pos, FUNC_NAME); } while (0) #define RETURN_SCM_WTA(pos, scm) \ do { return scm_wta (scm, (char *) pos, FUNC_NAME); } while (0) +#define SCM_VALIDATE_NUMBER_COPY(pos, z, cvar) \ + do { \ + if (SCM_INUMP (z)) \ + cvar = (double) SCM_INUM (z); \ + else if (SCM_REALP (z)) \ + cvar = SCM_REAL_VALUE (z); \ + else if (SCM_BIGP (z)) \ + cvar = scm_big2dbl (z); \ + else \ + { \ + cvar = 0.0; \ + SCM_WRONG_TYPE_ARG (pos, z); \ + } \ + } while (0) + +#define SCM_VALIDATE_NUMBER_DEF_COPY(pos, number, def, cvar) \ + do { \ + if (SCM_UNBNDP (number)) \ + cvar = def; \ + else \ + SCM_VALIDATE_NUMBER_COPY(pos, number, cvar); \ + } while (0) + #define SCM_VALIDATE_STRINGORSUBSTR SCM_VALIDATE_STRING #define SCM_VALIDATE_ROSTRING(pos, str) SCM_MAKE_VALIDATE (pos, str, ROSTRINGP) |