summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg J. Badros <gjb@cs.washington.edu>2000-01-03 16:26:28 +0000
committerGreg J. Badros <gjb@cs.washington.edu>2000-01-03 16:26:28 +0000
commitcabe682ce632e7d657774859ced86d6c728fe440 (patch)
tree83b9f35e900b428b22f2259a41eb1b4e7928f9a2
parentd00ae47e13a793e8f792df41fb4de46edc25b48f (diff)
downloadguile-cabe682ce632e7d657774859ced86d6c728fe440.tar.gz
* dynl-vms.c, debug.c, coop-threads.c, backtrace.c, eval.c: More
SCM_NIMP tests that were redundant are now eliminated. Patches from Dirk Hermann applied by hand.
-rw-r--r--libguile/backtrace.c4
-rw-r--r--libguile/coop-threads.c2
-rw-r--r--libguile/debug.c9
-rw-r--r--libguile/dynl-vms.c108
-rw-r--r--libguile/eval.c7
5 files changed, 8 insertions, 122 deletions
diff --git a/libguile/backtrace.c b/libguile/backtrace.c
index c2b325ee7..5b2c290f0 100644
--- a/libguile/backtrace.c
+++ b/libguile/backtrace.c
@@ -157,8 +157,7 @@ display_expression (SCM frame,SCM pname,SCM source,SCM port)
pstate->length = 3;
if (SCM_ROSTRINGP (pname))
{
- if (SCM_NIMP (frame)
- && SCM_FRAMEP (frame)
+ if (SCM_FRAMEP (frame)
&& SCM_FRAME_EVAL_ARGS_P (frame))
scm_puts ("While evaluating arguments to ", port);
else
@@ -199,7 +198,6 @@ display_error_body (struct display_error_args *a)
SCM prev_frame = SCM_BOOL_F;
if (SCM_DEBUGGINGP
- && SCM_NIMP (a->stack)
&& SCM_STACKP (a->stack)
&& SCM_STACK_LENGTH (a->stack) > 0)
{
diff --git a/libguile/coop-threads.c b/libguile/coop-threads.c
index 95eac02a7..adc2b82d5 100644
--- a/libguile/coop-threads.c
+++ b/libguile/coop-threads.c
@@ -413,7 +413,7 @@ scm_make_mutex (void)
SCM
scm_lock_mutex (SCM m)
{
- SCM_ASSERT (SCM_NIMP (m) && SCM_MUTEXP (m), m, SCM_ARG1, s_lock_mutex);
+ SCM_ASSERT (SCM_MUTEXP (m), m, SCM_ARG1, s_lock_mutex);
coop_mutex_lock (SCM_MUTEX_DATA (m));
return SCM_BOOL_T;
}
diff --git a/libguile/debug.c b/libguile/debug.c
index 60be1c7c1..b59c9ffa8 100644
--- a/libguile/debug.c
+++ b/libguile/debug.c
@@ -274,8 +274,7 @@ GUILE_PROC (scm_gloc_p, "gloc?", 1, 0, 0,
"")
#define FUNC_NAME s_scm_gloc_p
{
- return SCM_BOOL((SCM_NIMP (obj)
- && SCM_MEMOIZEDP (obj)
+ return SCM_BOOL((SCM_MEMOIZEDP (obj)
&& (SCM_MEMOIZED_EXP (obj) & 7) == 1));
}
#undef FUNC_NAME
@@ -540,10 +539,8 @@ static SCM
scm_m_start_stack (SCM exp, SCM env)
{
exp = SCM_CDR (exp);
- SCM_ASSERT (SCM_NIMP (exp)
- && SCM_ECONSP (exp)
- && SCM_NIMP (SCM_CDR (exp))
- && SCM_ECONSP (SCM_CDR (exp))
+ SCM_ASSERT (SCM_ECONSP (exp)
+ && SCM_ECONSP (SCM_CDR (exp))
&& SCM_NULLP (SCM_CDDR (exp)),
exp,
SCM_WNA,
diff --git a/libguile/dynl-vms.c b/libguile/dynl-vms.c
index ca93c8211..e69de29bb 100644
--- a/libguile/dynl-vms.c
+++ b/libguile/dynl-vms.c
@@ -1,108 +0,0 @@
-/* dynl-vms.c - dynamic linking for VMS, not yet ported
- *
- * Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE. If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way. To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice. */
-
-/* "dynl.c" dynamically link&load object files.
- Author: Aubrey Jaffer
- (Not yet) modified for libguile by Marius Vollmer */
-
-/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
- gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
-
-/* We should try to implement dynamic-link/dynamic-call for VMS,
- too. */
-
-#include "_scm.h"
-
-/* This permits dynamic linking. For example, the procedure of 0 arguments
- from a file could be the initialization procedure.
- (vms:dynamic-link-call "MYDISK:[MYDIR].EXE" "foo" "INIT_FOO")
- The first argument specifies the directory where the file specified
- by the second argument resides. The current directory would be
- "SYS$DISK:[].EXE".
- The second argument cannot contain any punctuation.
- The third argument probably needs to be uppercased to mimic the VMS linker.
- */
-
-# include <descrip.h>
-# include <ssdef.h>
-# include <rmsdef.h>
-
-struct dsc$descriptor *descriptorize(x, buff)
- struct dsc$descriptor *x;
- SCM buff;
-{(*x).dsc$w_length = LENGTH(buff);
- (*x).dsc$a_pointer = CHARS(buff);
- (*x).dsc$b_class = DSC$K_CLASS_S;
- (*x).dsc$b_dtype = DSC$K_DTYPE_T;
- return(x);}
-
-static char s_dynl[] = "vms:dynamic-link-call";
-SCM dynl(SCM dir, SCM symbol, SCM fname)
-{
- struct dsc$descriptor fnamed, symbold, dird;
- void (*fcn)();
- long retval;
- ASSERT(IMP(dir) || STRINGP(dir), dir, ARG1, s_dynl);
- ASSERT(NIMP(fname) && STRINGP(fname), fname, ARG2, s_dynl);
- ASSERT(NIMP(symbol) && STRINGP(symbol), symbol, ARG3, s_dynl);
- descriptorize(&fnamed, fname);
- descriptorize(&symbold, symbol);
- DEFER_INTS;
- retval = lib$find_image_symbol(&fnamed, &symbold, &fcn,
- IMP(dir) ? 0 : descriptorize(&dird, dir));
- if (SS$_NORMAL != retval) {
- /* wta(MAKINUM(retval), "vms error", s_dynl); */
- ALLOW_INTS;
- return BOOL_F;
- }
- ALLOW_INTS;
-/* *loc_loadpath = dir; */
- (*fcn)();
-/* *loc_loadpath = oloadpath; */
- return BOOL_T;
-}
-
-void init_dynl()
-{
- make_subr(s_dynl, tc7_subr_3, dynl);
-}
diff --git a/libguile/eval.c b/libguile/eval.c
index 7468dc3f5..27ac70b9f 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -547,7 +547,7 @@ scm_m_set_x (SCM xorig, SCM env)
{
SCM x = SCM_CDR (xorig);
SCM_ASSYNT (2 == scm_ilength (x), xorig, scm_s_expression, scm_s_set_x);
- SCM_ASSYNT (SCM_NIMP (SCM_CAR (x)) && SCM_SYMBOLP (SCM_CAR (x)),
+ SCM_ASSYNT (SCM_SYMBOLP (SCM_CAR (x)),
xorig, scm_s_variable, scm_s_set_x);
return scm_cons (SCM_IM_SET_X, x);
}
@@ -3407,8 +3407,7 @@ tail:
else
{
SCM tl = args = scm_cons (SCM_CAR (arg1), SCM_UNSPECIFIED);
- while (SCM_NIMP (arg1 = SCM_CDR (arg1))
- && SCM_CONSP (arg1))
+ while (arg1 = SCM_CDR (arg1), SCM_CONSP (arg1))
{
SCM_SETCDR (tl, scm_cons (SCM_CAR (arg1),
SCM_UNSPECIFIED));
@@ -3773,7 +3772,7 @@ any other object.")
ans = tl = scm_cons_source (obj,
scm_copy_tree (SCM_CAR (obj)),
SCM_UNSPECIFIED);
- while (SCM_NIMP (obj = SCM_CDR (obj)) && SCM_CONSP (obj))
+ while (obj = SCM_CDR (obj), SCM_CONSP (obj))
{
SCM_SETCDR (tl, scm_cons (scm_copy_tree (SCM_CAR (obj)),
SCM_UNSPECIFIED));