guile/guile-core/libguile ChangeLog __scm.h

[Mikael Djurfeldt]

CVSROOT:        /cvs
Module name:    guile
Changes by:             01/04/19 14:10:52

Modified files:
        guile-core/libguile: ChangeLog __scm.h 

Log message:
        * __scm.h (SCM_WTA_DISPATCH_0, SCM_WTA_DISPATCH_1,
        SCM_WTA_DISPATCH_2, SCM_WTA_DISPATCH_n): Inserted required
        parentheses in order to get the correct associativity.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/ChangeLog.diff?cvsroot=OldCVS&tr1=1.1357&tr2=1.1358&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/__scm.h.diff?cvsroot=OldCVS&tr1=1.66&tr2=1.67&r1=text&r2=text

Patches:
Index: guile/guile-core/libguile/ChangeLog
diff -u guile/guile-core/libguile/ChangeLog:1.1357 
guile/guile-core/libguile/ChangeLog:1.1358
--- guile/guile-core/libguile/ChangeLog:1.1357  Thu Apr 19 09:27:01 2001
+++ guile/guile-core/libguile/ChangeLog Thu Apr 19 14:10:52 2001
@@ -1,3 +1,9 @@
+2001-04-19  Mikael Djurfeldt  <address@hidden>
+
+       * __scm.h (SCM_WTA_DISPATCH_0, SCM_WTA_DISPATCH_1,
+       SCM_WTA_DISPATCH_2, SCM_WTA_DISPATCH_n): Inserted required
+       parentheses in order to get the correct associativity.
+
 2001-04-19  Dirk Herrmann  <address@hidden>
 
        * unif.c (scm_array_to_list):  Added missing handling of arrays of
Index: guile/guile-core/libguile/__scm.h
diff -u guile/guile-core/libguile/__scm.h:1.66 
guile/guile-core/libguile/__scm.h:1.67
--- guile/guile-core/libguile/__scm.h:1.66      Tue Apr 17 02:15:39 2001
+++ guile/guile-core/libguile/__scm.h   Thu Apr 19 14:10:52 2001
@@ -514,40 +514,42 @@
 
 extern SCM scm_call_generic_0 (SCM gf);
 
-#define SCM_WTA_DISPATCH_0(gf, arg, pos, subr) \
-  return (SCM_UNPACK (gf) \
-          ? scm_call_generic_0 ((gf)) \
-          : scm_wrong_type_arg ((subr), (pos), (arg)), 0)
+#define SCM_WTA_DISPATCH_0(gf, arg, pos, subr)                 \
+  return (SCM_UNPACK (gf)                                      \
+         ? scm_call_generic_0 ((gf))                           \
+         : (scm_wrong_type_arg ((subr), (pos), (arg)), SCM_UNSPECIFIED))
 #define SCM_GASSERT0(cond, gf, arg, pos, subr) \
   if (!(cond)) SCM_WTA_DISPATCH_0((gf), (arg), (pos), (subr))
 
 extern SCM scm_call_generic_1 (SCM gf, SCM a1);
 
-#define SCM_WTA_DISPATCH_1(gf, a1, pos, subr) \
-  return (SCM_UNPACK (gf) \
-          ? scm_call_generic_1 ((gf), (a1)) \
-          : scm_wrong_type_arg ((subr), (pos), (a1)), 0)
+#define SCM_WTA_DISPATCH_1(gf, a1, pos, subr)                  \
+  return (SCM_UNPACK (gf)                                      \
+         ? scm_call_generic_1 ((gf), (a1))                     \
+         : (scm_wrong_type_arg ((subr), (pos), (a1)), SCM_UNSPECIFIED))
 #define SCM_GASSERT1(cond, gf, a1, pos, subr) \
   if (!(cond)) SCM_WTA_DISPATCH_1((gf), (a1), (pos), (subr))
 
 extern SCM scm_call_generic_2 (SCM gf, SCM a1, SCM a2);
 
-#define SCM_WTA_DISPATCH_2(gf, a1, a2, pos, subr) \
-  return (SCM_UNPACK (gf) \
-          ? scm_call_generic_2 ((gf), (a1), (a2)) \
-          : scm_wrong_type_arg ((subr), (pos), \
-                                (pos) == SCM_ARG1 ? (a1) : (a2)), 0)
+#define SCM_WTA_DISPATCH_2(gf, a1, a2, pos, subr)                      \
+  return (SCM_UNPACK (gf)                                              \
+         ? scm_call_generic_2 ((gf), (a1), (a2))                       \
+         : (scm_wrong_type_arg ((subr), (pos),                         \
+                                (pos) == SCM_ARG1 ? (a1) : (a2)),      \
+            SCM_UNSPECIFIED))
 #define SCM_GASSERT2(cond, gf, a1, a2, pos, subr) \
   if (!(cond)) SCM_WTA_DISPATCH_2((gf), (a1), (a2), (pos), (subr))
 
 extern SCM scm_apply_generic (SCM gf, SCM args);
 
-#define SCM_WTA_DISPATCH_n(gf, args, pos, subr) \
-  return (SCM_UNPACK (gf) \
-          ? scm_apply_generic ((gf), (args)) \
-          : scm_wrong_type_arg ((subr), (pos), \
-                                scm_list_ref ((args), \
-                                              SCM_MAKINUM ((pos) - 1))), 0)
+#define SCM_WTA_DISPATCH_n(gf, args, pos, subr)                                
  \
+  return (SCM_UNPACK (gf)                                                \
+         ? scm_apply_generic ((gf), (args))                              \
+         : (scm_wrong_type_arg ((subr), (pos),                           \
+                                scm_list_ref ((args),                    \
+                                              SCM_MAKINUM ((pos) - 1))), \
+            SCM_UNSPECIFIED))
 #define SCM_GASSERTn(cond, gf, args, pos, subr) \
   if (!(cond)) SCM_WTA_DISPATCH_n((gf), (args), (pos), (subr))