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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-11-19 21:06:12 -0800 (Sat, 19 Nov 2005)
New Revision: 2175

Modified:
   branches/r5rs/sigscheme/operations.c
   branches/r5rs/sigscheme/sigschemetype-compact.h
   branches/r5rs/sigscheme/sigschemetype.h
Log:
* sigscheme/sigschemetype.h
  - (SCM_REF_NULL, SCM_INVALID_REF): Rename SCM_REF_NULL to
    SCM_INVALID_REF since the name SCM_REF_* is reserved for
    referencing action
  - (SCM_REF): Removed to be unified to SCM_REF_OFF_HEAP
  - (SCM_REF_OFF_HEAP): Rename the argument name 'cons' with 'obj' to
    be generalized
  - (SCM_REF_CAR, SCM_REF_CDR): Substitute semantically inappropriate
    use of SCM_REF() with the unary operator '&'. SCM_REF() was
    created to abstract referencing, but these two macro definitions
    should not be abstract (i.e. don't hide raw cell access here)
* sigscheme/sigschemetype-compact.h
  - Follow the changes of sigschemetype.h
  - (SCM_REF_NULL, SCM_REF): Removed
  - (SCM_INVALID_REF, SCM_REF_OFF_HEAP): New macro
  - (SCM_REF_CAR, SCM_REF_CDR): Follow the changes of sigschemetype.h
* sigscheme/operations.c
  - (ScmOp_append): Replace SCM_REF() with SCM_REF_OFF_HEAP()


Modified: branches/r5rs/sigscheme/operations.c
===================================================================
--- branches/r5rs/sigscheme/operations.c	2005-11-20 04:37:33 UTC (rev 2174)
+++ branches/r5rs/sigscheme/operations.c	2005-11-20 05:06:12 UTC (rev 2175)
@@ -750,7 +750,7 @@
 ScmObj ScmOp_append(ScmObj args)
 {
     ScmObj ret_lst  = SCM_NULL;
-    ScmRef ret_tail = SCM_REF(ret_lst);
+    ScmRef ret_tail = SCM_REF_OFF_HEAP(ret_lst);
     ScmObj ls;
     ScmObj obj = SCM_NULL;
     DECLARE_FUNCTION("append", ProcedureVariadic0);

Modified: branches/r5rs/sigscheme/sigschemetype-compact.h
===================================================================
--- branches/r5rs/sigscheme/sigschemetype-compact.h	2005-11-20 04:37:33 UTC (rev 2174)
+++ branches/r5rs/sigscheme/sigschemetype-compact.h	2005-11-20 05:06:12 UTC (rev 2175)
@@ -633,11 +633,11 @@
   Abstract ScmObj Reference For Storage-Representation Independent Efficient
   List Operations
 ============================================================================*/
-#define SCM_REF_NULL      NULL
+#define SCM_INVALID_REF   NULL
 
-#define SCM_REF(obj)      (&(obj))
-#define SCM_REF_CAR(cons) (SCM_REF(SCM_GET_DIRECT_CAR(cons)))
-#define SCM_REF_CDR(cons) (SCM_REF(SCM_GET_DIRECT_CDR(cons)))
+#define SCM_REF_CAR(cons) (&SCM_GET_DIRECT_CAR(cons))
+#define SCM_REF_CDR(cons) (&SCM_GET_DIRECT_CDR(cons))
+#define SCM_REF_OFF_HEAP(obj) (&(obj))
 #define SCM_DEREF(ref)    (*(ref))
 
 /* RFC: Is there a better name? */

Modified: branches/r5rs/sigscheme/sigschemetype.h
===================================================================
--- branches/r5rs/sigscheme/sigschemetype.h	2005-11-20 04:37:33 UTC (rev 2174)
+++ branches/r5rs/sigscheme/sigschemetype.h	2005-11-20 05:06:12 UTC (rev 2175)
@@ -396,12 +396,11 @@
   Abstract ScmObj Reference For Storage-Representation Independent Efficient
   List Operations
 ============================================================================*/
-#define SCM_REF_NULL      NULL
+#define SCM_INVALID_REF   NULL
 
-#define SCM_REF(obj)      (&(obj))
-#define SCM_REF_CAR(cons) (SCM_REF(SCM_CAR(cons)))
-#define SCM_REF_CDR(cons) (SCM_REF(SCM_CDR(cons)))
-#define SCM_REF_OFF_HEAP(cons) (&(cons))
+#define SCM_REF_CAR(cons) (&SCM_CAR(cons))
+#define SCM_REF_CDR(cons) (&SCM_CDR(cons))
+#define SCM_REF_OFF_HEAP(obj) (&(obj))
 #define SCM_DEREF(ref)    (*(ref))
 /* RFC: Is there a better name? */
 #define SCM_SET(ref, obj) (*(ref) = (obj))