diff options
author | Rob Browning <rlb@defaultvalue.org> | 2024-07-20 14:09:02 -0500 |
---|---|---|
committer | Rob Browning <rlb@defaultvalue.org> | 2024-07-30 19:39:32 -0500 |
commit | 6338459159a0c2ffa553916dfa09ffdcdc334eec (patch) | |
tree | 8f4b452593cd4abc57838731f47dbbd7c8f3f6cc | |
parent | 51b7021de184d4a2b737edbef2bd9a8dd7966874 (diff) | |
download | guile-6338459159a0c2ffa553916dfa09ffdcdc334eec.tar.gz |
Drop libguile srfi-1
...now that all of the C code has been migrated to Scheme.
* libguile/Makefile.am (libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES):
remove srfi-1.c.
(DOC_X_FILES): Remove srfi-1.x.
(DOT_DOC_FILES): Remove srfi-1.doc.
(modinclude_HEADERS): Remove srfi-1.h.
* libguile/init.c (scm_i_init_guile): Don't call scm_register_srfi_1.
* libguile/srfi-1.c: Remove.
* libguile/srfi-1.h: Remove.
* module/srfi/srfi-1.scm: Don't load srfi-1 from libguile.
-rw-r--r-- | libguile/Makefile.am | 4 | ||||
-rw-r--r-- | libguile/init.c | 2 | ||||
-rw-r--r-- | libguile/srfi-1.c | 71 | ||||
-rw-r--r-- | libguile/srfi-1.h | 30 | ||||
-rw-r--r-- | module/srfi/srfi-1.scm | 5 |
5 files changed, 0 insertions, 112 deletions
diff --git a/libguile/Makefile.am b/libguile/Makefile.am index ce97abad7..0890acc18 100644 --- a/libguile/Makefile.am +++ b/libguile/Makefile.am @@ -210,7 +210,6 @@ libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES = \ smob.c \ sort.c \ srcprop.c \ - srfi-1.c \ srfi-4.c \ srfi-13.c \ srfi-14.c \ @@ -324,7 +323,6 @@ DOT_X_FILES = \ smob.x \ sort.x \ srcprop.x \ - srfi-1.x \ srfi-4.x \ srfi-13.x \ srfi-14.x \ @@ -426,7 +424,6 @@ DOT_DOC_FILES = \ smob.doc \ sort.doc \ srcprop.doc \ - srfi-1.doc \ srfi-4.doc \ srfi-13.doc \ srfi-14.doc \ @@ -691,7 +688,6 @@ modinclude_HEADERS = \ socket.h \ sort.h \ srcprop.h \ - srfi-1.h \ srfi-4.h \ srfi-13.h \ srfi-14.h \ diff --git a/libguile/init.c b/libguile/init.c index 4022728f9..4a3903a2c 100644 --- a/libguile/init.c +++ b/libguile/init.c @@ -128,7 +128,6 @@ #include "socket.h" #include "sort.h" #include "srcprop.h" -#include "srfi-1.h" #include "srfi-13.h" #include "srfi-14.h" #include "srfi-4.h" @@ -377,7 +376,6 @@ scm_i_init_guile (void *base) scm_register_fdes_finalizers (); scm_register_foreign (); scm_register_foreign_object (); - scm_register_srfi_1 (); scm_register_srfi_60 (); scm_register_poll (); diff --git a/libguile/srfi-1.c b/libguile/srfi-1.c deleted file mode 100644 index c3d79e766..000000000 --- a/libguile/srfi-1.c +++ /dev/null @@ -1,71 +0,0 @@ -/* srfi-1.c --- SRFI-1 procedures for Guile - - Copyright 1995-1997,2000-2003,2005-2006,2008-2011,2013-2014,2018,2020 - Free Software Foundation, Inc. - - This file is part of Guile. - - Guile 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 3 of the License, or - (at your option) any later version. - - Guile 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 Guile. If not, see - <https://www.gnu.org/licenses/>. */ - - - - -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - -#include <stdarg.h> - -#include "boolean.h" -#include "eq.h" -#include "eval.h" -#include "extensions.h" -#include "gsubr.h" -#include "list.h" -#include "pairs.h" -#include "procs.h" -#include "values.h" -#include "vectors.h" -#include "version.h" - -#include "srfi-1.h" - - -/* The intent of this file was to gradually replace those Scheme - * procedures in srfi-1.scm that extend core primitive procedures, - * so that using srfi-1 wouldn't have performance penalties. - * - * However, we now prefer to write these procedures in Scheme, let the compiler - * optimize them, and have the VM execute them efficiently. - */ - - -void -scm_register_srfi_1 (void) -{ - scm_c_register_extension ("libguile-" SCM_EFFECTIVE_VERSION, - "scm_init_srfi_1", - (scm_t_extension_init_func)scm_init_srfi_1, NULL); -} - -void -scm_init_srfi_1 (void) -{ -#ifndef SCM_MAGIC_SNARFER -#include "srfi-1.x" -#endif -} - -/* End of srfi-1.c. */ diff --git a/libguile/srfi-1.h b/libguile/srfi-1.h deleted file mode 100644 index eb027a0c2..000000000 --- a/libguile/srfi-1.h +++ /dev/null @@ -1,30 +0,0 @@ -/* srfi-1.h --- SRFI-1 procedures for Guile - Copyright 2002-2003,2005-2006,2010-2011,2018,2020 - Free Software Foundation, Inc. - - This file is part of Guile. - - Guile 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 3 of the License, or - (at your option) any later version. - - Guile 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 Guile. If not, see - <https://www.gnu.org/licenses/>. */ - - -#ifndef SCM_SRFI_1_H -#define SCM_SRFI_1_H - -#include "libguile/scm.h" - -SCM_INTERNAL void scm_register_srfi_1 (void); -SCM_INTERNAL void scm_init_srfi_1 (void); - -#endif /* SCM_SRFI_1_H */ diff --git a/module/srfi/srfi-1.scm b/module/srfi/srfi-1.scm index 2e083c8aa..b46f7be5f 100644 --- a/module/srfi/srfi-1.scm +++ b/module/srfi/srfi-1.scm @@ -224,11 +224,6 @@ (cond-expand-provide (current-module) '(srfi-1)) -;; Load the compiled primitives from the shared library. -;; -(load-extension (string-append "libguile-" (effective-version)) - "scm_init_srfi_1") - ;;; Constructors |