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

yamaken at freedesktop.org yamaken at freedesktop.org
Fri Dec 16 16:44:30 PST 2005


Author: yamaken
Date: 2005-12-16 16:44:27 -0800 (Fri, 16 Dec 2005)
New Revision: 2624

Modified:
   branches/r5rs/sigscheme/sigscheme.h
   branches/r5rs/sigscheme/sigschemeinternal.h
Log:
* sigscheme/sigscheme.h
  - (SCM_REF_CAR, SCM_REF_CDR, SCM_REF_OFF_HEAP, SCM_DEREF, SCM_SET):
    Strip outermost parens which causes syntax error if the definition
    is not expression but block
* sigscheme/sigschemeinternal.h
  - (MAKE_TRACE_FRAME, SCM_ENTYPE_INT, SCM_ENTYPE_CONS,
    SCM_ENTYPE_SYMBOL, SCM_ENTYPE_CHAR, SCM_ENTYPE_STRING,
    SCM_ENTYPE_FUNC, SCM_ENTYPE_CLOSURE, SCM_ENTYPE_VECTOR,
    SCM_ENTYPE_PORT, SCM_ENTYPE_CONTINUATION, SCM_ENTYPE_C_POINTER,
    SCM_ENTYPE_C_FUNCPOINTER, SCM_ENTYPE_VALUEPACKET, SCM_NULLVALUESP,
    SCM_VALUECONS_CAR, SCM_VALUECONS_CDR, SCM_VALUEPACKET_SET_VALUES,
    SCM_ENTYPE_FREECELL, SCM_AS_FREECELL, SCM_FREECELLP): Ditto


Modified: branches/r5rs/sigscheme/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/sigscheme.h	2005-12-17 00:39:32 UTC (rev 2623)
+++ branches/r5rs/sigscheme/sigscheme.h	2005-12-17 00:44:27 UTC (rev 2624)
@@ -483,15 +483,15 @@
 ============================================================================*/
 #define SCM_INVALID_REF       SCM_SAL_INVALID_REF
 
-#define SCM_REF_CAR(kons)     (SCM_SAL_REF_CAR(kons))
-#define SCM_REF_CDR(kons)     (SCM_SAL_REF_CDR(kons))
-#define SCM_REF_OFF_HEAP(obj) (SCM_SAL_REF_OFF_HEAP(obj))
+#define SCM_REF_CAR(kons)     SCM_SAL_REF_CAR(kons)
+#define SCM_REF_CDR(kons)     SCM_SAL_REF_CDR(kons)
+#define SCM_REF_OFF_HEAP(obj) SCM_SAL_REF_OFF_HEAP(obj)
 
 /* SCM_DEREF(ref) is not permitted to be used as lvalue */
-#define SCM_DEREF(ref)        (SCM_SAL_DEREF(ref))
+#define SCM_DEREF(ref)        SCM_SAL_DEREF(ref)
 
 /* RFC: Is there a better name? */
-#define SCM_SET(ref, obj)     (SCM_SAL_SET((ref), (obj)))
+#define SCM_SET(ref, obj)     SCM_SAL_SET((ref), (obj))
 
 /*============================================================================
   Special Constants and Predicates

Modified: branches/r5rs/sigscheme/sigschemeinternal.h
===================================================================
--- branches/r5rs/sigscheme/sigschemeinternal.h	2005-12-17 00:39:32 UTC (rev 2623)
+++ branches/r5rs/sigscheme/sigschemeinternal.h	2005-12-17 00:44:27 UTC (rev 2624)
@@ -88,38 +88,38 @@
 #endif /* TRUE */
 
 /* 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
 
 #if SCM_USE_STORAGE_ABSTRACTION_LAYER
-#define SCM_ENTYPE_INT(o)            (SCM_SAL_ENTYPE_INT(o))
-#define SCM_ENTYPE_CONS(o)           (SCM_SAL_ENTYPE_CONS(o))
-#define SCM_ENTYPE_SYMBOL(o)         (SCM_SAL_ENTYPE_SYMBOL(o))
-#define SCM_ENTYPE_CHAR(o)           (SCM_SAL_ENTYPE_CHAR(o))
-#define SCM_ENTYPE_STRING(o)         (SCM_SAL_ENTYPE_STRING(o))
-#define SCM_ENTYPE_FUNC(o)           (SCM_SAL_ENTYPE_FUNC(o))
-#define SCM_ENTYPE_CLOSURE(o)        (SCM_SAL_ENTYPE_CLOSURE(o))
-#define SCM_ENTYPE_VECTOR(o)         (SCM_SAL_ENTYPE_VECTOR(o))
-#define SCM_ENTYPE_PORT(o)           (SCM_SAL_ENTYPE_PORT(o))
-#define SCM_ENTYPE_CONTINUATION(o)   (SCM_SAL_ENTYPE_CONTINUATION(o))
-#define SCM_ENTYPE_C_POINTER(o)      (SCM_SAL_ENTYPE_C_POINTER(o))
-#define SCM_ENTYPE_C_FUNCPOINTER(o)  (SCM_SAL_ENTYPE_C_FUNCPOINTER(o))
+#define SCM_ENTYPE_INT(o)            SCM_SAL_ENTYPE_INT(o)
+#define SCM_ENTYPE_CONS(o)           SCM_SAL_ENTYPE_CONS(o)
+#define SCM_ENTYPE_SYMBOL(o)         SCM_SAL_ENTYPE_SYMBOL(o)
+#define SCM_ENTYPE_CHAR(o)           SCM_SAL_ENTYPE_CHAR(o)
+#define SCM_ENTYPE_STRING(o)         SCM_SAL_ENTYPE_STRING(o)
+#define SCM_ENTYPE_FUNC(o)           SCM_SAL_ENTYPE_FUNC(o)
+#define SCM_ENTYPE_CLOSURE(o)        SCM_SAL_ENTYPE_CLOSURE(o)
+#define SCM_ENTYPE_VECTOR(o)         SCM_SAL_ENTYPE_VECTOR(o)
+#define SCM_ENTYPE_PORT(o)           SCM_SAL_ENTYPE_PORT(o)
+#define SCM_ENTYPE_CONTINUATION(o)   SCM_SAL_ENTYPE_CONTINUATION(o)
+#define SCM_ENTYPE_C_POINTER(o)      SCM_SAL_ENTYPE_C_POINTER(o)
+#define SCM_ENTYPE_C_FUNCPOINTER(o)  SCM_SAL_ENTYPE_C_FUNCPOINTER(o)
 
-#define SCM_ENTYPE_VALUEPACKET(o)    (SCM_SAL_ENTYPE_VALUEPACKET(o))
+#define SCM_ENTYPE_VALUEPACKET(o)    SCM_SAL_ENTYPE_VALUEPACKET(o)
 #if SCM_USE_VALUECONS
-#define SCM_NULLVALUESP(o)           (SCM_SAL_NULLVALUESP(o))
-#define SCM_VALUECONS_CAR(o)         (SCM_SAL_VALUECONS_CAR(o))
-#define SCM_VALUECONS_CDR(o)         (SCM_SAL_VALUECONS_CDR(o))
+#define SCM_NULLVALUESP(o)           SCM_SAL_NULLVALUESP(o)
+#define SCM_VALUECONS_CAR(o)         SCM_SAL_VALUECONS_CAR(o)
+#define SCM_VALUECONS_CDR(o)         SCM_SAL_VALUECONS_CDR(o)
 #else /* SCM_USE_VALUECONS */
 #define SCM_VALUEPACKET_SET_VALUES(o, vals)                                  \
-    (SCM_SAL_VALUEPACKET_SET_VALUES((o), (vals)))
+    SCM_SAL_VALUEPACKET_SET_VALUES((o), (vals))
 #endif /* SCM_USE_VALUECONS */
 
-#define SCM_ENTYPE_FREECELL(o)       (SCM_SAL_ENTYPE_FREECELL(o))
-#define SCM_AS_FREECELL(o)           (SCM_SAL_AS_FREECELL(o))
+#define SCM_ENTYPE_FREECELL(o)       SCM_SAL_ENTYPE_FREECELL(o)
+#define SCM_AS_FREECELL(o)           SCM_SAL_AS_FREECELL(o)
 
-#define SCM_FREECELLP(o)             (SCM_SAL_FREECELLP(o))
+#define SCM_FREECELLP(o)                SCM_SAL_FREECELLP(o)
 #define SCM_FREECELL_NEXT(o)            SCM_SAL_FREECELL_NEXT(o)
 #define SCM_FREECELL_FREESLOT(o)        SCM_SAL_FREECELL_FREESLOT(o)
 #define SCM_FREECELL_SET_NEXT(o, next)  SCM_SAL_FREECELL_SET_NEXT((o), (next))
@@ -131,10 +131,10 @@
 #define SCM_RECLAIM_CELL(cell, next)    SCM_SAL_RECLAIM_CELL((cell), (next))
 
 /* FIXME: rename appropriately */
-#define SCM_IS_MARKED(o)             (SCM_SAL_IS_MARKED(o))
-#define SCM_IS_UNMARKED(o)           (SCM_SAL_IS_UNMARKED(o))
-#define SCM_DO_MARK(o)               (SCM_SAL_DO_MARK(o))
-#define SCM_DO_UNMARK(o)             (SCM_SAL_DO_UNMARK(o))
+#define SCM_IS_MARKED(o)             SCM_SAL_IS_MARKED(o)
+#define SCM_IS_UNMARKED(o)           SCM_SAL_IS_UNMARKED(o)
+#define SCM_DO_MARK(o)               SCM_SAL_DO_MARK(o)
+#define SCM_DO_UNMARK(o)             SCM_SAL_DO_UNMARK(o)
 
 #else /* SCM_USE_STORAGE_ABSTRACTION_LAYER */
 



More information about the uim-commit mailing list