diff options
author | Greg J. Badros <gjb@cs.washington.edu> | 2000-01-06 18:02:16 +0000 |
---|---|---|
committer | Greg J. Badros <gjb@cs.washington.edu> | 2000-01-06 18:02:16 +0000 |
commit | bc00b4625c086346c8963db83c025971bd3e20d8 (patch) | |
tree | a82db27b69b2ed89bf19f04ca53390356ce30a88 /libguile/scm_validate.h | |
parent | e1385ffcd62407d2b90547bda81f676c79e009c7 (diff) | |
download | guile-bc00b4625c086346c8963db83c025971bd3e20d8.tar.gz |
scm_validate.h: Remove some redundant NIMP tests.
Diffstat (limited to 'libguile/scm_validate.h')
-rw-r--r-- | libguile/scm_validate.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libguile/scm_validate.h b/libguile/scm_validate.h index 7c9e303c8..d1279b95d 100644 --- a/libguile/scm_validate.h +++ b/libguile/scm_validate.h @@ -1,4 +1,4 @@ -/* $Id: scm_validate.h,v 1.10 2000-01-05 19:00:02 gjb Exp $ */ +/* $Id: scm_validate.h,v 1.11 2000-01-06 18:02:16 gjb Exp $ */ /* Copyright (C) 1999 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify @@ -107,11 +107,11 @@ #define SCM_VALIDATE_ROSTRING(pos,str) SCM_MAKE_VALIDATE(pos,str,ROSTRINGP) #define SCM_VALIDATE_ROSTRING_COPY(pos,str,cvar) \ - do { SCM_ASSERT(SCM_NIMP (str) && SCM_ROSTRINGP (str), str, pos, FUNC_NAME); \ + 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_NIMP (str) && SCM_ROSTRINGP (str)), str, pos, FUNC_NAME); \ + 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) |