guile/guile-core/libguile ChangeLog eval.c

[Mikael Djurfeldt]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Mikael Djurfeldt <address@hidden>       01/01/23 17:26:45

Modified files:
        guile-core/libguile: ChangeLog eval.c 

Log message:
        * eval.c (SCM_APPLY): Added # args check for application of
        procedures with arity 3.  (Thanks to Anders Holst.)

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/ChangeLog.diff?r1=1.1241&r2=1.1242
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/eval.c.diff?r1=1.190&r2=1.191

Patches:
Index: guile/guile-core/libguile/ChangeLog
diff -u guile/guile-core/libguile/ChangeLog:1.1241 
guile/guile-core/libguile/ChangeLog:1.1242
--- guile/guile-core/libguile/ChangeLog:1.1241  Tue Jan 23 16:02:42 2001
+++ guile/guile-core/libguile/ChangeLog Tue Jan 23 17:26:44 2001
@@ -1,3 +1,8 @@
+2001-01-23  Mikael Djurfeldt  <address@hidden>
+
+       * eval.c (SCM_APPLY): Added # args check for application of
+       procedures with arity 3.  (Thanks to Anders Holst.)
+
 2001-01-24  Dirk Herrmann  <address@hidden>
 
        * filesys.h (SCM_DIR_FLAG_OPEN, SCM_DIR_OPEN_P):  Added.
Index: guile/guile-core/libguile/eval.c
diff -u guile/guile-core/libguile/eval.c:1.190 
guile/guile-core/libguile/eval.c:1.191
--- guile/guile-core/libguile/eval.c:1.190      Mon Jan 22 05:32:08 2001
+++ guile/guile-core/libguile/eval.c    Tue Jan 23 17:26:44 2001
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 96, 97, 98, 99, 2000, 2001 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
@@ -3338,6 +3338,10 @@
        RETURN (arg1)
       }
     case scm_tc7_subr_3:
+      SCM_ASRTGO (SCM_NNULLP (args)
+                 && SCM_NNULLP (SCM_CDR (args))
+                 && SCM_NULLP (SCM_CDDR (args)),
+                 wrongnumargs);
       RETURN (SCM_SUBRF (proc) (arg1, SCM_CAR (args), SCM_CAR (SCM_CDR 
(args))))
     case scm_tc7_lsubr:
 #ifdef DEVAL