guile/guile-core THANKS libguile/ChangeLog libg...

[Dirk Herrmann]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Dirk Herrmann <address@hidden>  01/01/19 09:16:52

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

Log message:
        * Applied Martin Grabmueller's fix of case's handling of 'else.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/THANKS.diff?r1=1.157&r2=1.158
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/ChangeLog.diff?r1=1.1238&r2=1.1239
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/eval.c.diff?r1=1.188&r2=1.189

Patches:
Index: guile/guile-core/THANKS
diff -u guile/guile-core/THANKS:1.157 guile/guile-core/THANKS:1.158
--- guile/guile-core/THANKS:1.157       Wed Jan 17 10:15:30 2001
+++ guile/guile-core/THANKS     Fri Jan 19 09:16:52 2001
@@ -18,6 +18,7 @@
      George Caswell
       Chris Cramer
       I. N. Golubev
+     Martin Grabmueller
        Brad Knotwell
    Matthias Köppe
       Bruce Korb
Index: guile/guile-core/libguile/ChangeLog
diff -u guile/guile-core/libguile/ChangeLog:1.1238 
guile/guile-core/libguile/ChangeLog:1.1239
--- guile/guile-core/libguile/ChangeLog:1.1238  Thu Jan 18 14:54:54 2001
+++ guile/guile-core/libguile/ChangeLog Fri Jan 19 09:16:52 2001
@@ -1,3 +1,9 @@
+2001-01-19  Dirk Herrmann  <address@hidden>
+
+       * eval.c (scm_m_case):  The 'else' clause of a 'case' statement
+       now has to be the last clause, as required by R5RS.  Thanks to
+       Martin Grabmueller for the patch.
+
 2001-01-18  Gary Houston  <address@hidden>
 
        * ioext.c: further simplify scm_read_string_x_partial by defining
Index: guile/guile-core/libguile/eval.c
diff -u guile/guile-core/libguile/eval.c:1.188 
guile/guile-core/libguile/eval.c:1.189
--- guile/guile-core/libguile/eval.c:1.188      Thu Dec 28 08:49:09 2000
+++ guile/guile-core/libguile/eval.c    Fri Jan 19 09:16:52 2001
@@ -595,7 +595,8 @@
       proc = SCM_CAR (x);
       SCM_ASSYNT (scm_ilength (proc) >= 2, xorig, scm_s_clauses, s_case);
       SCM_ASSYNT (scm_ilength (SCM_CAR (proc)) >= 0
-                 || SCM_EQ_P (scm_sym_else, SCM_CAR (proc)),
+                 || (SCM_EQ_P (scm_sym_else, SCM_CAR (proc)) 
+                     && SCM_NULLP (SCM_CDR (x))),
                  xorig, scm_s_clauses, s_case);
     }
   return scm_cons (SCM_IM_CASE, cdrx);