diff options
author | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2000-10-30 11:42:26 +0000 |
---|---|---|
committer | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2000-10-30 11:42:26 +0000 |
commit | a6d9e5abe5b110dc30e8cf914bcb4de4d28baf43 (patch) | |
tree | d5a3679c885a17f8469801bc97897a80ae48f1d6 /libguile/validate.h | |
parent | e9bfab50e4ec7787db05605727a06f98fe30f5b6 (diff) | |
download | guile-a6d9e5abe5b110dc30e8cf914bcb4de4d28baf43.tar.gz |
* Change a couple of functions to accept either symbols or strings only.
* Get rid of remainig uses of SCM_LENGTH etc.
Diffstat (limited to 'libguile/validate.h')
-rw-r--r-- | libguile/validate.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/libguile/validate.h b/libguile/validate.h index 4115c8200..e80f5708a 100644 --- a/libguile/validate.h +++ b/libguile/validate.h @@ -1,4 +1,4 @@ -/* $Id: validate.h,v 1.18 2000-10-25 11:01:03 dirk Exp $ */ +/* $Id: validate.h,v 1.19 2000-10-30 11:42:26 dirk Exp $ */ /* Copyright (C) 1999, 2000 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify @@ -124,24 +124,6 @@ cvar = SCM_CHAR (scm); \ } while (0) -#define SCM_VALIDATE_ROSTRING(pos, str) SCM_MAKE_VALIDATE (pos, str, ROSTRINGP) - -#define SCM_VALIDATE_ROSTRING_COPY(pos, str, cvar) \ - do { \ - SCM_ASSERT (SCM_ROSTRINGP (str), str, pos, FUNC_NAME); \ - cvar = SCM_ROCHARS (str); \ - } while (0) - -#define SCM_VALIDATE_NULLORROSTRING_COPY(pos, str, cvar) \ - do { \ - SCM_ASSERT (SCM_FALSEP (str) || SCM_ROSTRINGP (str), \ - str, pos, FUNC_NAME); \ - if (SCM_FALSEP(str)) \ - cvar = NULL; \ - else \ - cvar = SCM_ROCHARS(str); \ - } while (0) - #define SCM_VALIDATE_STRING(pos, str) SCM_MAKE_VALIDATE (pos, str, STRINGP) #define SCM_VALIDATE_STRING_COPY(pos, str, cvar) \ @@ -416,6 +398,24 @@ #define SCM_VALIDATE_STRINGORSUBSTR SCM_VALIDATE_STRING +#define SCM_VALIDATE_ROSTRING(pos, str) SCM_MAKE_VALIDATE (pos, str, ROSTRINGP) + +#define SCM_VALIDATE_ROSTRING_COPY(pos, str, cvar) \ + do { \ + SCM_ASSERT (SCM_ROSTRINGP (str), str, pos, FUNC_NAME); \ + cvar = SCM_ROCHARS (str); \ + } while (0) + +#define SCM_VALIDATE_NULLORROSTRING_COPY(pos, str, cvar) \ + do { \ + SCM_ASSERT (SCM_FALSEP (str) || SCM_ROSTRINGP (str), \ + str, pos, FUNC_NAME); \ + if (SCM_FALSEP(str)) \ + cvar = NULL; \ + else \ + cvar = SCM_ROCHARS(str); \ + } while (0) + #endif /* SCM_DEBUG_DEPRECATED == 0 */ #endif |