guile/guile-core NEWS RELEASE libguile/ChangeLo...

[Dirk Herrmann]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Dirk Herrmann <address@hidden>  00/12/22 08:46:17

Modified files:
        guile-core     : NEWS RELEASE 
        guile-core/libguile: ChangeLog procs.c procs.h 

Log message:
        * Removed unused member "documentation" from struct scm_subr_entry.
        * Eliminate use of scm_intern0/scm_sysintern0 in procs.c.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/NEWS.diff?r1=1.231&r2=1.232
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/RELEASE.diff?r1=1.81&r2=1.82
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/ChangeLog.diff?r1=1.1216&r2=1.1217
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/procs.c.diff?r1=1.47&r2=1.48
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/procs.h.diff?r1=1.34&r2=1.35

Patches:
Index: guile/guile-core/NEWS
diff -u guile/guile-core/NEWS:1.231 guile/guile-core/NEWS:1.232
--- guile/guile-core/NEWS:1.231 Fri Dec 15 14:01:30 2000
+++ guile/guile-core/NEWS       Fri Dec 22 08:46:16 2000
@@ -308,7 +308,7 @@
 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_SETGC8MARK, SCM_CLRGC8MARK, SCM_GCTYP16, SCM_GCCDR, SCM_SUBR_DOC
 
 Use SCM_ASSERT_RANGE or SCM_VALIDATE_XXX_RANGE instead of SCM_OUTOFRANGE.
 Use scm_memory_error instead of SCM_NALLOC.
Index: guile/guile-core/RELEASE
diff -u guile/guile-core/RELEASE:1.81 guile/guile-core/RELEASE:1.82
--- guile/guile-core/RELEASE:1.81       Fri Dec  8 10:10:57 2000
+++ guile/guile-core/RELEASE    Fri Dec 22 08:46:16 2000
@@ -52,7 +52,8 @@
   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_GC8MARKP, SCM_SETGC8MARK, SCM_CLRGC8MARK, SCM_GCTYP16, SCM_GCCDR,
+  SCM_SUBR_DOC
 - remove scm_vector_set_length_x
 - remove function scm_call_catching_errors
   (replaced by catch functions from throw.[ch])
Index: guile/guile-core/libguile/ChangeLog
diff -u guile/guile-core/libguile/ChangeLog:1.1216 
guile/guile-core/libguile/ChangeLog:1.1217
--- guile/guile-core/libguile/ChangeLog:1.1216  Thu Dec 21 09:51:55 2000
+++ guile/guile-core/libguile/ChangeLog Fri Dec 22 08:46:16 2000
@@ -1,3 +1,17 @@
+2000-12-22  Dirk Herrmann  <address@hidden>
+
+       * procs.h (scm_subr_entry):  Removed unused struct member
+       "documentation".
+
+       (SCM_SUBR_DOC):  Deprecated.
+
+       * procs.c (scm_make_subr_opt):  Eliminate use of scm_intern0 in
+       favor of scm_str2symbol.  Similarly, prefer scm_sysintern over
+       scm_sysintern0.
+
+       (scm_make_subr_opt, scm_mark_subr_table):  Struct scm_subr_entry
+       does not have a member "documentation" any more.
+
 2000-12-21  Dirk Herrmann  <address@hidden>
 
        * eval.c (restore_environment):  Make sure that changes to the
Index: guile/guile-core/libguile/procs.c
diff -u guile/guile-core/libguile/procs.c:1.47 
guile/guile-core/libguile/procs.c:1.48
--- guile/guile-core/libguile/procs.c:1.47      Wed Dec  6 07:16:59 2000
+++ guile/guile-core/libguile/procs.c   Fri Dec 22 08:46:17 2000
@@ -70,6 +70,7 @@
 SCM 
 scm_make_subr_opt (const char *name, int type, SCM (*fcn) (), int set)
 {
+  SCM symbol;
   SCM symcell;
   register SCM z;
   int entry;
@@ -87,14 +88,21 @@
     }
 
   SCM_NEWCELL (z);
-  symcell = set ? scm_sysintern0 (name) : scm_intern0 (name);
+  if (set)
+    {
+      symcell = scm_sysintern (name, SCM_UNDEFINED);
+      symbol = SCM_CAR (symcell);
+    }
+  else
+    {
+      symbol = scm_str2symbol (name);
+    }
   
   entry = scm_subr_table_size;
   scm_subr_table[entry].handle = z;
-  scm_subr_table[entry].name = SCM_CAR (symcell);
+  scm_subr_table[entry].name = symbol;
   scm_subr_table[entry].generic = 0;
   scm_subr_table[entry].properties = SCM_EOL;
-  scm_subr_table[entry].documentation = SCM_BOOL_F;
   
   SCM_SET_SUBRF (z, fcn);
   SCM_SET_CELL_TYPE (z, (entry << 8) + type);
@@ -143,8 +151,6 @@
        scm_gc_mark (*scm_subr_table[i].generic);
       if (SCM_NIMP (scm_subr_table[i].properties))
        scm_gc_mark (scm_subr_table[i].properties);
-      if (SCM_NIMP (scm_subr_table[i].documentation))
-       scm_gc_mark (scm_subr_table[i].documentation);
     }
 }
 
Index: guile/guile-core/libguile/procs.h
diff -u guile/guile-core/libguile/procs.h:1.34 
guile/guile-core/libguile/procs.h:1.35
--- guile/guile-core/libguile/procs.h:1.34      Tue Sep 26 13:11:22 2000
+++ guile/guile-core/libguile/procs.h   Fri Dec 22 08:46:17 2000
@@ -63,7 +63,6 @@
                                 * *generic == 0 until first method
                                 */
   SCM properties;              /* procedure properties */
-  SCM documentation;
 } scm_subr_entry;
 
 #define SCM_SUBRNUM(subr) (SCM_CELL_WORD_0 (subr) >> 8)
@@ -88,7 +87,6 @@
 
 #define SCM_SUBR_GENERIC(x) (SCM_SUBR_ENTRY (x).generic)
 #define SCM_SUBR_PROPS(x) (SCM_SUBR_ENTRY (x).properties)
-#define SCM_SUBR_DOC(x) (SCM_SUBR_ENTRY (x).documentation)
 
 /* Closures
  */
@@ -190,6 +188,13 @@
 #endif /*GUILE_DEBUG*/
 
 
+
+#if (SCM_DEBUG_DEPRECATED == 0)
+
+#define SCM_SUBR_DOC(x) SCM_BOOL_F
+
+#endif  /* SCM_DEBUG_DEPRECATED == 0 */
+
 #endif  /* PROCSH */
 
 /*