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

[Dirk Herrmann]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Dirk Herrmann <address@hidden>  00/10/13 00:55:25

Modified files:
        guile-core     : NEWS RELEASE 
        guile-core/libguile: ChangeLog list.c list.h 
        guile-core/test-suite: ChangeLog 
        guile-core/test-suite/tests: list.test 

Log message:
        * Deprecated scm_sloppy_mem(q|v|ber)

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/NEWS.diff?r1=1.205&r2=1.206
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/RELEASE.diff?r1=1.69&r2=1.70
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/ChangeLog.diff?r1=1.1145&r2=1.1146
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/list.c.diff?r1=1.44&r2=1.45
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/list.h.diff?r1=1.15&r2=1.16
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/test-suite/ChangeLog.diff?r1=1.45&r2=1.46
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/test-suite/tests/list.test.diff?r1=1.4&r2=1.5

Patches:
Index: guile/guile-core/NEWS
diff -u guile/guile-core/NEWS:1.205 guile/guile-core/NEWS:1.206
--- guile/guile-core/NEWS:1.205 Fri Sep 22 11:33:23 2000
+++ guile/guile-core/NEWS       Fri Oct 13 00:55:23 2000
@@ -100,6 +100,10 @@
 The concept of read-only strings will disappear in next release of
 Guile.
 
+** Deprecated: scm_sloppy_memq, scm_sloppy_memv, scm_sloppy_member
+
+Instead, use scm_memq, scm_memv, scm_member.
+
 * Changes to the gh_ interface
 
 * Changes to the scm_ interface
Index: guile/guile-core/RELEASE
diff -u guile/guile-core/RELEASE:1.69 guile/guile-core/RELEASE:1.70
--- guile/guile-core/RELEASE:1.69       Fri Sep 22 09:44:41 2000
+++ guile/guile-core/RELEASE    Fri Oct 13 00:55:24 2000
@@ -60,6 +60,7 @@
 - remove scm_tc7_ssymbol
 - remove scm_tc7_msymbol
 - remove scm_tcs_symbols
+- remove scm_sloppy_memq, scm_sloppy_memv, scm_sloppy_member
 
 Modules sort.c and random.c should be factored out into separate
 modules (but still be distributed with guile-core) when we get a new
Index: guile/guile-core/libguile/ChangeLog
diff -u guile/guile-core/libguile/ChangeLog:1.1145 
guile/guile-core/libguile/ChangeLog:1.1146
--- guile/guile-core/libguile/ChangeLog:1.1145  Thu Oct 12 00:59:02 2000
+++ guile/guile-core/libguile/ChangeLog Fri Oct 13 00:55:24 2000
@@ -1,3 +1,10 @@
+2000-10-13  Dirk Herrmann  <address@hidden>
+
+       * list.[ch] (scm_sloppy_memq, scm_sloppy_memv, scm_sloppy_member):
+       Deprecated.
+
+       (scm_memq, scm_memv, scm_member):  Inline the sloppy code.
+
 2000-10-11  Dirk Herrmann  <address@hidden>
 
        * alloca.c:  Fixed include file path.  Thanks to Bruce Korb for
Index: guile/guile-core/libguile/list.c
diff -u guile/guile-core/libguile/list.c:1.44 
guile/guile-core/libguile/list.c:1.45
--- guile/guile-core/libguile/list.c:1.44       Fri Sep 29 13:22:31 2000
+++ guile/guile-core/libguile/list.c    Fri Oct 13 00:55:24 2000
@@ -504,6 +504,8 @@
 
 /* membership tests (memq, memv, etc.) */ 
 
+#if SCM_DEBUG_DEPRECATED == 0
+
 SCM_DEFINE (scm_sloppy_memq, "sloppy-memq", 2, 0, 0,
             (SCM x, SCM lst),
            "This procedure behaves like @code{memq}, but does no type or error 
checking.\n"
@@ -553,8 +555,8 @@
   return lst;
 }
 #undef FUNC_NAME
-
 
+#endif /* DEPRECATED */
 
 SCM_DEFINE (scm_memq, "memq", 2, 0, 0,
            (SCM x, SCM lst),
@@ -565,10 +567,13 @@
             "returned.")
 #define FUNC_NAME s_scm_memq
 {
-  SCM answer;
-  SCM_VALIDATE_LIST (2,lst);
-  answer = scm_sloppy_memq (x, lst);
-  return (SCM_NULLP (answer)) ? SCM_BOOL_F : answer;
+  SCM_VALIDATE_LIST (2, lst);
+  for (; !SCM_NULLP (lst); lst = SCM_CDR (lst))
+    {
+      if (SCM_EQ_P (SCM_CAR (lst), x))
+       return lst;
+    }
+  return SCM_BOOL_F;
 }
 #undef FUNC_NAME
 
@@ -583,10 +588,13 @@
             "returned.")
 #define FUNC_NAME s_scm_memv
 {
-  SCM answer;
-  SCM_VALIDATE_LIST (2,lst);
-  answer = scm_sloppy_memv (x, lst);
-  return (SCM_NULLP (answer)) ? SCM_BOOL_F : answer;
+  SCM_VALIDATE_LIST (2, lst);
+  for (; !SCM_NULLP (lst); lst = SCM_CDR (lst))
+    {
+      if (! SCM_FALSEP (scm_eqv_p (SCM_CAR (lst), x)))
+       return lst;
+    }
+  return SCM_BOOL_F;
 }
 #undef FUNC_NAME
 
@@ -600,10 +608,13 @@
             "returned.")
 #define FUNC_NAME s_scm_member
 {
-  SCM answer;
-  SCM_VALIDATE_LIST (2,lst);
-  answer = scm_sloppy_member (x, lst);
-  return (SCM_NULLP (answer)) ? SCM_BOOL_F : answer;
+  SCM_VALIDATE_LIST (2, lst);
+  for (; !SCM_NULLP (lst); lst = SCM_CDR (lst))
+    {
+      if (! SCM_FALSEP (scm_equal_p (SCM_CAR (lst), x)))
+       return lst;
+    }
+  return SCM_BOOL_F;
 }
 #undef FUNC_NAME
 
Index: guile/guile-core/libguile/list.h
diff -u guile/guile-core/libguile/list.h:1.15 
guile/guile-core/libguile/list.h:1.16
--- guile/guile-core/libguile/list.h:1.15       Mon Jun 19 03:04:31 2000
+++ guile/guile-core/libguile/list.h    Fri Oct 13 00:55:24 2000
@@ -83,9 +83,6 @@
 extern SCM scm_list_cdr_set_x (SCM lst, SCM k, SCM val);
 extern SCM scm_last_pair (SCM sx);
 extern SCM scm_list_tail (SCM lst, SCM k);
-extern SCM scm_sloppy_memq (SCM x, SCM lst);
-extern SCM scm_sloppy_memv (SCM x, SCM lst);
-extern SCM scm_sloppy_member (SCM x, SCM lst);
 extern SCM scm_memq (SCM x, SCM lst);
 extern SCM scm_memv (SCM x, SCM lst);
 extern SCM scm_member (SCM x, SCM lst);
@@ -106,6 +103,9 @@
 #if (SCM_DEBUG_DEPRECATED == 0)
 
 #define scm_list_star scm_cons_star
+extern SCM scm_sloppy_memq (SCM x, SCM lst);
+extern SCM scm_sloppy_memv (SCM x, SCM lst);
+extern SCM scm_sloppy_member (SCM x, SCM lst);
 
 #endif  /* SCM_DEBUG_DEPRECATED == 0 */
 
Index: guile/guile-core/test-suite/ChangeLog
diff -u guile/guile-core/test-suite/ChangeLog:1.45 
guile/guile-core/test-suite/ChangeLog:1.46
--- guile/guile-core/test-suite/ChangeLog:1.45  Tue Sep 26 13:39:03 2000
+++ guile/guile-core/test-suite/ChangeLog       Fri Oct 13 00:55:24 2000
@@ -1,3 +1,7 @@
+2000-10-13  Dirk Herrmann  <address@hidden>
+
+       * tests/list.test:  Removed references to sloppy-mem(q|v|ber)
+
 2000-09-26  Dirk Herrmann  <address@hidden>
 
        * tests/strings.test:  Added a test to help remember that string=?
Index: guile/guile-core/test-suite/tests/list.test
diff -u guile/guile-core/test-suite/tests/list.test:1.4 
guile/guile-core/test-suite/tests/list.test:1.5
--- guile/guile-core/test-suite/tests/list.test:1.4     Fri Jun 30 03:46:34 2000
+++ guile/guile-core/test-suite/tests/list.test Fri Oct 13 00:55:25 2000
@@ -665,15 +665,6 @@
 ;;; list-copy
 
 
-;;; sloppy-memq
-
-
-;;; sloppy-memv
-
-
-;;; sloppy-member
-
-
 ;;; memq