diff options
| author | Andy Wingo <wingo@pobox.com> | 2011-05-15 13:34:07 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2011-05-15 15:34:16 +0200 |
| commit | 6703caf7265602951ffcc932bddc64fc37769b19 (patch) | |
| tree | 179cd93daa482c10f091c5013f7ce2f78cc5e25c /libguile/error.h | |
| parent | cb5b7677a2df77cecd9cd8a7a19b5d4433d908b0 (diff) | |
| download | guile-6703caf7265602951ffcc932bddc64fc37769b19.tar.gz | |
SCM_ASSERT to error.h
* libguile/error.h (SCM_ASSERT, SCM_ASSERT_TYPE): Move definition here.
Remove SCM_RECKLESS case.
* libguile/__scm.h: (From here.)
Diffstat (limited to 'libguile/error.h')
| -rw-r--r-- | libguile/error.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/libguile/error.h b/libguile/error.h index 8cc68b752..1611fd529 100644 --- a/libguile/error.h +++ b/libguile/error.h @@ -3,7 +3,7 @@ #ifndef SCM_ERROR_H #define SCM_ERROR_H -/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2002, 2006, 2008 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2002, 2006, 2008, 2011 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -36,6 +36,16 @@ SCM_API SCM scm_misc_error_key; +#define SCM_ASSERT(_cond, _arg, _pos, _subr) \ + do { if (SCM_UNLIKELY (!(_cond))) \ + scm_wrong_type_arg (_subr, _pos, _arg); } while (0) +#define SCM_ASSERT_TYPE(_cond, _arg, _pos, _subr, _msg) \ + do { if (SCM_UNLIKELY (!(_cond))) \ + scm_wrong_type_arg_msg(_subr, _pos, _arg, _msg); } while (0) + + + + SCM_API void scm_error (SCM key, const char *subr, const char *message, SCM args, SCM rest) SCM_NORETURN; SCM_API SCM scm_error_scm (SCM key, SCM subr, SCM message, |