* Removed unused member "properties" from struct scm_subr_entry.

diff --git a/NEWS b/NEWS
index beb2775..fb1f4af 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -308,7 +308,8 @@ SCM_VALIDATE_NULLORROSTRING_COPY, SCM_ROLENGTH, SCM_LENGTH, SCM_HUGE_LENGTH,
 SCM_SUBSTRP, SCM_SUBSTR_STR, SCM_SUBSTR_OFFSET, SCM_COERCE_SUBSTR,
 SCM_ROSTRINGP, SCM_RWSTRINGP, SCM_VALIDATE_RWSTRING, SCM_ROCHARS,
 SCM_ROUCHARS, SCM_SETLENGTH, SCM_SETCHARS, SCM_LENGTH_MAX, SCM_GC8MARKP,
-SCM_SETGC8MARK, SCM_CLRGC8MARK, SCM_GCTYP16, SCM_GCCDR, SCM_SUBR_DOC
+SCM_SETGC8MARK, SCM_CLRGC8MARK, SCM_GCTYP16, SCM_GCCDR, SCM_SUBR_DOC,
+SCM_SUBR_PROPS
 
 Use SCM_ASSERT_RANGE or SCM_VALIDATE_XXX_RANGE instead of SCM_OUTOFRANGE.
 Use scm_memory_error instead of SCM_NALLOC.

diff --git a/RELEASE b/RELEASE
index 1623047..f0c9121 100644 (file)
--- a/RELEASE
+++ b/RELEASE
@@ -53,7 +53,7 @@ In release 1.6:
   SCM_COERCE_SUBSTR, SCM_ROSTRINGP, SCM_RWSTRINGP, SCM_VALIDATE_RWSTRING,
   SCM_ROCHARS, SCM_ROUCHARS, SCM_SETLENGTH, SCM_SETCHARS, SCM_LENGTH_MAX,
   SCM_GC8MARKP, SCM_SETGC8MARK, SCM_CLRGC8MARK, SCM_GCTYP16, SCM_GCCDR,
-  SCM_SUBR_DOC
+  SCM_SUBR_DOC, SCM_SUBR_PROPS
 - remove scm_vector_set_length_x
 - remove function scm_call_catching_errors
   (replaced by catch functions from throw.[ch])

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index b00cba0..321e2da 100644 (file)
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,13 @@
+2000-12-23  Dirk Herrmann  <D.Herrmann@tu-bs.de>
+
+       * procs.h (scm_subr_entry):  Removed unused struct member
+       "properties".
+
+       (SCM_SUBR_PROPS):  Deprecated.
+
+       * procs.c (scm_make_subr_opt, scm_mark_subr_table):  Struct
+       scm_subr_entry does not have a member "properties" any more.
+
 2000-12-22  Dirk Herrmann  <D.Herrmann@tu-bs.de>
 
        * procs.h (scm_subr_entry):  Removed unused struct member

diff --git a/libguile/procs.c b/libguile/procs.c
index d1279a2..a79c7d7 100644 (file)
--- a/libguile/procs.c
+++ b/libguile/procs.c
@@ -102,7 +102,6 @@ scm_make_subr_opt (const char *name, int type, SCM (*fcn) (), int set)
   scm_subr_table[entry].handle = z;
   scm_subr_table[entry].name = symbol;
   scm_subr_table[entry].generic = 0;
-  scm_subr_table[entry].properties = SCM_EOL;
   
   SCM_SET_SUBRF (z, fcn);
   SCM_SET_CELL_TYPE (z, (entry << 8) + type);
@@ -149,8 +148,6 @@ scm_mark_subr_table ()
       SCM_SETGCMARK (scm_subr_table[i].name);
       if (scm_subr_table[i].generic && *scm_subr_table[i].generic)
        scm_gc_mark (*scm_subr_table[i].generic);
-      if (SCM_NIMP (scm_subr_table[i].properties))
-       scm_gc_mark (scm_subr_table[i].properties);
     }
 }
 

diff --git a/libguile/procs.h b/libguile/procs.h
index 9a6ed62..a843525 100644 (file)
--- a/libguile/procs.h
+++ b/libguile/procs.h
@@ -62,7 +62,6 @@ typedef struct
   SCM *generic;                        /* 0 if no generic support
                                 * *generic == 0 until first method
                                 */
-  SCM properties;              /* procedure properties */
 } scm_subr_entry;
 
 #define SCM_SUBRNUM(subr) (SCM_CELL_WORD_0 (subr) >> 8)
@@ -73,6 +72,7 @@ typedef struct
 #define SCM_SUBRF(x) ((SCM (*)()) SCM_CELL_WORD_1 (x))
 #define SCM_SET_SUBRF(x, v) (SCM_SET_CELL_WORD_1 ((x), (v)))
 #define SCM_DSUBRF(x) ((double (*)()) SCM_CELL_WORD_1 (x))
+#define SCM_SUBR_GENERIC(x) (SCM_SUBR_ENTRY (x).generic)
 
 #define SCM_CCLO_LENGTH(x) (SCM_CELL_WORD_0 (x) >> 8)
 #define SCM_SET_CCLO_LENGTH(x, v) (SCM_SET_CELL_WORD_0 ((x), ((v) << 8) + scm_tc7_cclo))
@@ -85,9 +85,6 @@ typedef struct
 #define SCM_CCLO_SUBR(x) (SCM_CCLO_REF ((x), 0))
 #define SCM_SET_CCLO_SUBR(x, v) (SCM_CCLO_SET ((x), 0, (v)))
 
-#define SCM_SUBR_GENERIC(x) (SCM_SUBR_ENTRY (x).generic)
-#define SCM_SUBR_PROPS(x) (SCM_SUBR_ENTRY (x).properties)
-
 /* Closures
  */
 
@@ -191,6 +188,7 @@ extern SCM scm_make_cclo (SCM proc, SCM len);
 
 #if (SCM_DEBUG_DEPRECATED == 0)
 
+#define SCM_SUBR_PROPS(x) SCM_EOL
 #define SCM_SUBR_DOC(x) SCM_BOOL_F
 
 #endif  /* SCM_DEBUG_DEPRECATED == 0 */