[uim-commit] r2797 - branches/r5rs/sigscheme

[yamaken at freedesktop.org]

Author: yamaken
Date: 2006-01-04 19:45:42 -0800 (Wed, 04 Jan 2006)
New Revision: 2797

Modified:
   branches/r5rs/sigscheme/sigschemeinternal.h
   branches/r5rs/sigscheme/storage-continuation.c
Log:
* sigscheme/sigschemeinternal.h
  - (MAKE_TRACE_FRAME, PREPARE_PORT): Fix operator association
* sigscheme/storage-continuation.c
  - (MAKE_DYNEXT_FRAME): Ditto


Modified: branches/r5rs/sigscheme/sigschemeinternal.h
===================================================================
--- branches/r5rs/sigscheme/sigschemeinternal.h	2006-01-05 03:34:15 UTC (rev 2796)
+++ branches/r5rs/sigscheme/sigschemeinternal.h	2006-01-05 03:45:42 UTC (rev 2797)
@@ -83,7 +83,7 @@
    Macro Declarations
 =======================================*/
 /* trace stack for debugging */
-#define MAKE_TRACE_FRAME(obj, env) CONS(obj, env)
+#define MAKE_TRACE_FRAME(obj, env) CONS((obj), (env))
 #define TRACE_FRAME_OBJ CAR
 #define TRACE_FRAME_ENV CDR
 
@@ -338,9 +338,9 @@
 
 #define PREPARE_PORT(port, args, default_port)                               \
     do {                                                                     \
-        port = POP_ARG(args);                                                \
+        (port) = POP_ARG(args);                                              \
         if (!VALIDP(port))                                                   \
-            port = default_port;                                             \
+            (port) = (default_port);                                         \
         ENSURE_PORT(port);                                                   \
         ASSERT_NO_MORE_ARG(args);                                            \
     } while (/* CONSTCOND */ 0)

Modified: branches/r5rs/sigscheme/storage-continuation.c
===================================================================
--- branches/r5rs/sigscheme/storage-continuation.c	2006-01-05 03:34:15 UTC (rev 2796)
+++ branches/r5rs/sigscheme/storage-continuation.c	2006-01-05 03:45:42 UTC (rev 2797)
@@ -121,7 +121,7 @@
 /*============================================================================
   Dynamic Extent
 ============================================================================*/
-#define MAKE_DYNEXT_FRAME(before, after) (CONS(before, after))
+#define MAKE_DYNEXT_FRAME(before, after) CONS((before), (after))
 #define DYNEXT_FRAME_BEFORE CAR
 #define DYNEXT_FRAME_AFTER  CDR