Remove tests and shims for pre-7.2 bdw-gc.

[bpt/guile.git] / libguile / alist.c

diff --git a/libguile/alist.c b/libguile/alist.c
index 314c1f8..82c70a0 100644 (file)
--- a/libguile/alist.c
+++ b/libguile/alist.c
@@ -1,26 +1,30 @@
-/* Copyright (C) 1995, 96, 97, 98, 99, 2000, 2001, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 96, 97, 98, 99, 2000, 2001, 2004, 2006, 2008, 2010, 2011 Free Software Foundation, Inc.
  * 
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3 of
+ * the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
  */
 
 
 \f
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "libguile/_scm.h"
 #include "libguile/eq.h"
 #include "libguile/list.h"
-#include "libguile/lang.h"
 
 #include "libguile/validate.h"
 #include "libguile/pairs.h"
@@ -36,9 +40,7 @@ SCM_DEFINE (scm_acons, "acons", 3, 0, 0,
            "function is @emph{not} destructive; @var{alist} is not modified.")
 #define FUNC_NAME s_scm_acons
 {
-  return scm_cell (SCM_UNPACK (scm_cell (SCM_UNPACK (key),
-                                        SCM_UNPACK (value))),
-                  SCM_UNPACK (alist));
+  return scm_cons (scm_cons (key, value), alist);
 }
 #undef FUNC_NAME
 
@@ -253,9 +255,9 @@ SCM_DEFINE (scm_assq_set_x, "assq-set!", 3, 0, 0,
             (SCM alist, SCM key, SCM val),
            "@deffnx {Scheme Procedure} assv-set! alist key value\n"
            "@deffnx {Scheme Procedure} assoc-set! alist key value\n"
-           "Reassociate @var{key} in @var{alist} with @var{value}: find any existing\n"
+           "Reassociate @var{key} in @var{alist} with @var{val}: find any existing\n"
            "@var{alist} entry for @var{key} and associate it with the new\n"
-           "@var{value}.  If @var{alist} does not contain an entry for @var{key},\n"
+           "@var{val}.  If @var{alist} does not contain an entry for @var{key},\n"
            "add a new one.  Return the (possibly new) alist.\n\n"
            "These functions do not attempt to verify the structure of @var{alist},\n"
            "and so may cause unusual results if passed an object that is not an\n"