[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] GNU Guile branch, master, updated. release_1-9-12-18-gcf
|
From: |
Andy Wingo |
|
Subject: |
[Guile-commits] GNU Guile branch, master, updated. release_1-9-12-18-gcf7e51b |
|
Date: |
Sun, 12 Sep 2010 21:38:11 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".
http://git.savannah.gnu.org/cgit/guile.git/commit/?id=cf7e51b48987ae4717dbc8d36e95501999886e9f
The branch, master has been updated
via cf7e51b48987ae4717dbc8d36e95501999886e9f (commit)
via 140b4f6e3a5de2de30f8b4845b34ce5963aedae4 (commit)
via 37710f7e8f63f784de0343c1948e8afbbc10e395 (commit)
via 4453f887ed6004126a73673f76853b30263209aa (commit)
from 4fb23c1722a0f6302d2f28775ad34e78fdd75ae8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cf7e51b48987ae4717dbc8d36e95501999886e9f
Author: Andy Wingo <address@hidden>
Date: Sun Sep 12 23:39:52 2010 +0200
libguile gitignore
* libguile/.gitignore: Fix for recent cpp-{E,SIG} change.
commit 140b4f6e3a5de2de30f8b4845b34ce5963aedae4
Author: Andy Wingo <address@hidden>
Date: Sun Sep 12 23:30:43 2010 +0200
build tweak to remove SRFI version definitions
* GUILE-VERSION: Remove SRFI version definitions, as they are no longer
needed.
commit 37710f7e8f63f784de0343c1948e8afbbc10e395
Author: Andy Wingo <address@hidden>
Date: Sun Sep 12 23:18:54 2010 +0200
move srfi-1 and srfi-60 C impl to libguile, without public C api
* libguile/srfi-1.c:
* libguile/srfi-1.h:
* libguile/srfi-60.c:
* libguile/srfi-60.h:
* libguile/ChangeLog-srfi: Move here, from the srfi/ dir. The C API is
internal. Add API to register the extensions, called by init.c.
* libguile/init.c: Verily, register srfi extensions.
* libguile/Makefile.am: Add srfi files.
* module/srfi/srfi-1.scm:
* module/srfi/srfi-60.scm: Update load-extension invocation.
* Makefile.am:
* configure.ac: Remove srfi/ dir.
* test-suite/standalone/Makefile.am:
* test-suite/standalone/test-srfi-1.c: Remove srfi-1 C test, we don't
support this API any more.
commit 4453f887ed6004126a73673f76853b30263209aa
Author: Andy Wingo <address@hidden>
Date: Sun Sep 12 22:41:15 2010 +0200
remove empty srfi-4, srfi-13, and srfi-14 shlibs
* srfi/srfi-13.c:
* srfi/srfi-13.h:
* srfi/srfi-14.c:
* srfi/srfi-14.h:
* srfi/srfi-4.c:
* srfi/srfi-4.h:
* srfi/Makefile.am:
* configure.ac: Remove empty shlibs and headers for srfis 4, 13, and
14. The "version" was never programmatically exported, so there's no
possible way people could have used these.
-----------------------------------------------------------------------
Summary of changes:
GUILE-VERSION | 29 -------
Makefile.am | 2 +-
configure.ac | 25 ------
libguile/.gitignore | 4 +-
srfi/ChangeLog-2008 => libguile/ChangeLog-srfi | 0
libguile/Makefile.am | 16 +++-
libguile/init.c | 6 +-
{srfi => libguile}/srfi-1.c | 24 +++++-
libguile/srfi-1.h | 84 ++++++++++++++++++++
{srfi => libguile}/srfi-60.c | 23 +++++-
libguile/{debug-malloc.h => srfi-60.h} | 38 ++++------
module/srfi/srfi-1.scm | 3 +-
module/srfi/srfi-60.scm | 3 +-
srfi/Makefile.am | 82 -------------------
srfi/README | 100 ------------------------
srfi/srfi-1.h | 92 ----------------------
srfi/srfi-13.c | 41 ----------
srfi/srfi-13.h | 57 --------------
srfi/srfi-14.c | 35 --------
srfi/srfi-14.h | 39 ---------
srfi/srfi-4.c | 37 ---------
srfi/srfi-4.h | 28 -------
srfi/srfi-60.h | 46 -----------
test-suite/standalone/Makefile.am | 9 --
test-suite/standalone/test-srfi-1.c | 86 --------------------
25 files changed, 162 insertions(+), 747 deletions(-)
rename srfi/ChangeLog-2008 => libguile/ChangeLog-srfi (100%)
rename {srfi => libguile}/srfi-1.c (98%)
create mode 100644 libguile/srfi-1.h
rename {srfi => libguile}/srfi-60.c (96%)
copy libguile/{debug-malloc.h => srfi-60.h} (53%)
delete mode 100644 srfi/Makefile.am
delete mode 100644 srfi/README
delete mode 100644 srfi/srfi-1.h
delete mode 100644 srfi/srfi-13.c
delete mode 100644 srfi/srfi-13.h
delete mode 100644 srfi/srfi-14.c
delete mode 100644 srfi/srfi-14.h
delete mode 100644 srfi/srfi-4.c
delete mode 100644 srfi/srfi-4.h
delete mode 100644 srfi/srfi-60.h
delete mode 100644 test-suite/standalone/test-srfi-1.c
diff --git a/GUILE-VERSION b/GUILE-VERSION
index 2b518df..da181ac 100644
--- a/GUILE-VERSION
+++ b/GUILE-VERSION
@@ -22,32 +22,3 @@ LIBGUILE_INTERFACE_CURRENT=18
LIBGUILE_INTERFACE_REVISION=0
LIBGUILE_INTERFACE_AGE=0
LIBGUILE_INTERFACE="${LIBGUILE_INTERFACE_CURRENT}:${LIBGUILE_INTERFACE_REVISION}:${LIBGUILE_INTERFACE_AGE}"
-
-# NOTE: You must edit each corresponding .scm file (the one that
-# dynamic-links the relevant lib) if you change the versioning
-# information here to make sure the dynamic-link explicitly loads the
-# right shared lib version.
-
-LIBGUILE_SRFI_SRFI_1_MAJOR=4
-LIBGUILE_SRFI_SRFI_1_INTERFACE_CURRENT=4
-LIBGUILE_SRFI_SRFI_1_INTERFACE_REVISION=0
-LIBGUILE_SRFI_SRFI_1_INTERFACE_AGE=0
-LIBGUILE_SRFI_SRFI_1_INTERFACE="${LIBGUILE_SRFI_SRFI_1_INTERFACE_CURRENT}:${LIBGUILE_SRFI_SRFI_1_INTERFACE_REVISION}:${LIBGUILE_SRFI_SRFI_1_INTERFACE_AGE}"
-
-LIBGUILE_SRFI_SRFI_4_MAJOR=4
-LIBGUILE_SRFI_SRFI_4_INTERFACE_CURRENT=4
-LIBGUILE_SRFI_SRFI_4_INTERFACE_REVISION=0
-LIBGUILE_SRFI_SRFI_4_INTERFACE_AGE=0
-LIBGUILE_SRFI_SRFI_4_INTERFACE="${LIBGUILE_SRFI_SRFI_4_INTERFACE_CURRENT}:${LIBGUILE_SRFI_SRFI_4_INTERFACE_REVISION}:${LIBGUILE_SRFI_SRFI_4_INTERFACE_AGE}"
-
-LIBGUILE_SRFI_SRFI_13_14_MAJOR=4
-LIBGUILE_SRFI_SRFI_13_14_INTERFACE_CURRENT=4
-LIBGUILE_SRFI_SRFI_13_14_INTERFACE_REVISION=0
-LIBGUILE_SRFI_SRFI_13_14_INTERFACE_AGE=0
-LIBGUILE_SRFI_SRFI_13_14_INTERFACE="${LIBGUILE_SRFI_SRFI_13_14_INTERFACE_CURRENT}:${LIBGUILE_SRFI_SRFI_13_14_INTERFACE_REVISION}:${LIBGUILE_SRFI_SRFI_13_14_INTERFACE_AGE}"
-
-LIBGUILE_SRFI_SRFI_60_MAJOR=3
-LIBGUILE_SRFI_SRFI_60_INTERFACE_CURRENT=3
-LIBGUILE_SRFI_SRFI_60_INTERFACE_REVISION=0
-LIBGUILE_SRFI_SRFI_60_INTERFACE_AGE=0
-LIBGUILE_SRFI_SRFI_60_INTERFACE="${LIBGUILE_SRFI_SRFI_60_INTERFACE_CURRENT}:${LIBGUILE_SRFI_SRFI_60_INTERFACE_REVISION}:${LIBGUILE_SRFI_SRFI_60_INTERFACE_AGE}"
diff --git a/Makefile.am b/Makefile.am
index d9be548..65ae2d6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@
AUTOMAKE_OPTIONS = 1.10
SUBDIRS = lib meta libguile guile-readline emacs \
- srfi examples test-suite benchmark-suite am \
+ examples test-suite benchmark-suite am \
module doc
libguileincludedir = $(pkgincludedir)/$(GUILE_EFFECTIVE_VERSION)
diff --git a/configure.ac b/configure.ac
index 915f01e..b73c3ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1547,30 +1547,6 @@ AC_SUBST(LIBGUILE_INTERFACE_REVISION)
AC_SUBST(LIBGUILE_INTERFACE_AGE)
AC_SUBST(LIBGUILE_INTERFACE)
-AC_SUBST(LIBGUILE_SRFI_SRFI_1_MAJOR)
-AC_SUBST(LIBGUILE_SRFI_SRFI_1_INTERFACE_CURRENT)
-AC_SUBST(LIBGUILE_SRFI_SRFI_1_INTERFACE_REVISION)
-AC_SUBST(LIBGUILE_SRFI_SRFI_1_INTERFACE_AGE)
-AC_SUBST(LIBGUILE_SRFI_SRFI_1_INTERFACE)
-
-AC_SUBST(LIBGUILE_SRFI_SRFI_4_MAJOR)
-AC_SUBST(LIBGUILE_SRFI_SRFI_4_INTERFACE_CURRENT)
-AC_SUBST(LIBGUILE_SRFI_SRFI_4_INTERFACE_REVISION)
-AC_SUBST(LIBGUILE_SRFI_SRFI_4_INTERFACE_AGE)
-AC_SUBST(LIBGUILE_SRFI_SRFI_4_INTERFACE)
-
-AC_SUBST(LIBGUILE_SRFI_SRFI_13_14_MAJOR)
-AC_SUBST(LIBGUILE_SRFI_SRFI_13_14_INTERFACE_CURRENT)
-AC_SUBST(LIBGUILE_SRFI_SRFI_13_14_INTERFACE_REVISION)
-AC_SUBST(LIBGUILE_SRFI_SRFI_13_14_INTERFACE_AGE)
-AC_SUBST(LIBGUILE_SRFI_SRFI_13_14_INTERFACE)
-
-AC_SUBST(LIBGUILE_SRFI_SRFI_60_MAJOR)
-AC_SUBST(LIBGUILE_SRFI_SRFI_60_INTERFACE_CURRENT)
-AC_SUBST(LIBGUILE_SRFI_SRFI_60_INTERFACE_REVISION)
-AC_SUBST(LIBGUILE_SRFI_SRFI_60_INTERFACE_AGE)
-AC_SUBST(LIBGUILE_SRFI_SRFI_60_INTERFACE)
-
AC_SUBST(LIBGUILE_I18N_MAJOR)
AC_SUBST(LIBGUILE_I18N_INTERFACE_CURRENT)
AC_SUBST(LIBGUILE_I18N_INTERFACE_REVISION)
@@ -1621,7 +1597,6 @@ AC_CONFIG_FILES([
examples/Makefile
libguile/Makefile
libguile/version.h
- srfi/Makefile
guile-readline/Makefile
test-suite/Makefile
test-suite/standalone/Makefile
diff --git a/libguile/.gitignore b/libguile/.gitignore
index c9357d2..16c60ec 100644
--- a/libguile/.gitignore
+++ b/libguile/.gitignore
@@ -1,6 +1,6 @@
c-tokenize.c
-cpp_err_symbols.c
-cpp_sig_symbols.c
+cpp-E.c
+cpp-SIG.c
gen-scmconfig
gen-scmconfig.h
guile
diff --git a/srfi/ChangeLog-2008 b/libguile/ChangeLog-srfi
similarity index 100%
rename from srfi/ChangeLog-2008
rename to libguile/ChangeLog-srfi
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index b8c4e6b..9ebb521 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -189,9 +189,11 @@ address@hidden@_la_SOURCES =
\
smob.c \
sort.c \
srcprop.c \
+ srfi-1.c \
+ srfi-4.c \
srfi-13.c \
srfi-14.c \
- srfi-4.c \
+ srfi-60.c \
stackchk.c \
stacks.c \
stime.c \
@@ -284,9 +286,11 @@ DOT_X_FILES = \
smob.x \
sort.x \
srcprop.x \
+ srfi-1.x \
+ srfi-4.x \
srfi-13.x \
srfi-14.x \
- srfi-4.x \
+ srfi-60.x \
stackchk.x \
stacks.x \
stime.x \
@@ -383,9 +387,11 @@ DOT_DOC_FILES = \
smob.doc \
sort.doc \
srcprop.doc \
+ srfi-1.doc \
+ srfi-4.doc \
srfi-13.doc \
srfi-14.doc \
- srfi-4.doc \
+ srfi-60.doc \
stackchk.doc \
stacks.doc \
stime.doc \
@@ -557,9 +563,11 @@ modinclude_HEADERS = \
socket.h \
sort.h \
srcprop.h \
+ srfi-1.h \
+ srfi-4.h \
srfi-13.h \
srfi-14.h \
- srfi-4.h \
+ srfi-60.h \
stackchk.h \
stacks.h \
stime.h \
diff --git a/libguile/init.c b/libguile/init.c
index 6e4ee0e..f64258f 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -115,8 +115,11 @@
#include "libguile/stacks.h"
#include "libguile/stime.h"
#include "libguile/strings.h"
+#include "libguile/srfi-1.h"
+#include "libguile/srfi-4.h"
#include "libguile/srfi-13.h"
#include "libguile/srfi-14.h"
+#include "libguile/srfi-60.h"
#include "libguile/strorder.h"
#include "libguile/strports.h"
#include "libguile/struct.h"
@@ -134,7 +137,6 @@
#include "libguile/guardians.h"
#include "libguile/extensions.h"
#include "libguile/uniform.h"
-#include "libguile/srfi-4.h"
#include "libguile/deprecated.h"
#include "libguile/init.h"
@@ -454,6 +456,8 @@ scm_i_init_guile (SCM_STACKITEM *base)
scm_bootstrap_programs ();
scm_bootstrap_vm ();
scm_register_foreign ();
+ scm_register_srfi_1 ();
+ scm_register_srfi_60 ();
scm_init_strings (); /* Requires array-handle */
scm_init_struct (); /* Requires strings */
diff --git a/srfi/srfi-1.c b/libguile/srfi-1.c
similarity index 98%
rename from srfi/srfi-1.c
rename to libguile/srfi-1.c
index b81c905..96715dc 100644
--- a/srfi/srfi-1.c
+++ b/libguile/srfi-1.c
@@ -19,17 +19,25 @@
* 02110-1301 USA
*/
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#include <libguile.h>
+#include "libguile/_scm.h"
+#include "libguile/eq.h"
+
+#include "libguile/validate.h"
+#include "libguile/list.h"
+#include "libguile/eval.h"
+#include "libguile/srfi-1.h"
+
+#include <stdarg.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 won't have performance penalties.
+ * 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.
@@ -1586,11 +1594,19 @@ scm_srfi1_xcons (SCM d, SCM a)
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)
{
SCM the_root_module = scm_lookup_closure_module (SCM_BOOL_F);
#ifndef SCM_MAGIC_SNARFER
-#include "srfi/srfi-1.x"
+#include "libguile/srfi-1.x"
#endif
scm_c_extend_primitive_generic
(SCM_VARIABLE_REF (scm_c_module_lookup (the_root_module, "map")),
diff --git a/libguile/srfi-1.h b/libguile/srfi-1.h
new file mode 100644
index 0000000..020de34
--- /dev/null
+++ b/libguile/srfi-1.h
@@ -0,0 +1,84 @@
+/* srfi-1.h --- SRFI-1 procedures for Guile
+ *
+ * Copyright (C) 2002, 2003, 2005, 2006, 2010 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 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
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+
+#ifndef SCM_SRFI_1_H
+#define SCM_SRFI_1_H
+
+#include "libguile/__scm.h"
+
+SCM_INTERNAL SCM scm_srfi1_alist_copy (SCM alist);
+SCM_INTERNAL SCM scm_srfi1_append_reverse (SCM revhead, SCM tail);
+SCM_INTERNAL SCM scm_srfi1_append_reverse_x (SCM revhead, SCM tail);
+SCM_INTERNAL SCM scm_srfi1_break (SCM pred, SCM lst);
+SCM_INTERNAL SCM scm_srfi1_break_x (SCM pred, SCM lst);
+SCM_INTERNAL SCM scm_srfi1_car_plus_cdr (SCM pair);
+SCM_INTERNAL SCM scm_srfi1_concatenate (SCM lstlst);
+SCM_INTERNAL SCM scm_srfi1_concatenate_x (SCM lstlst);
+SCM_INTERNAL SCM scm_srfi1_count (SCM pred, SCM list1, SCM rest);
+SCM_INTERNAL SCM scm_srfi1_delete (SCM x, SCM lst, SCM pred);
+SCM_INTERNAL SCM scm_srfi1_delete_x (SCM x, SCM lst, SCM pred);
+SCM_INTERNAL SCM scm_srfi1_delete_duplicates (SCM lst, SCM pred);
+SCM_INTERNAL SCM scm_srfi1_delete_duplicates_x (SCM lst, SCM pred);
+SCM_INTERNAL SCM scm_srfi1_drop_right (SCM lst, SCM n);
+SCM_INTERNAL SCM scm_srfi1_drop_right_x (SCM lst, SCM n);
+SCM_INTERNAL SCM scm_srfi1_drop_while (SCM pred, SCM lst);
+SCM_INTERNAL SCM scm_srfi1_eighth (SCM lst);
+SCM_INTERNAL SCM scm_srfi1_fifth (SCM lst);
+SCM_INTERNAL SCM scm_srfi1_filter_map (SCM proc, SCM list1, SCM rest);
+SCM_INTERNAL SCM scm_srfi1_find (SCM pred, SCM lst);
+SCM_INTERNAL SCM scm_srfi1_find_tail (SCM pred, SCM lst);
+SCM_INTERNAL SCM scm_srfi1_fold (SCM proc, SCM init, SCM list1, SCM rest);
+SCM_INTERNAL SCM scm_srfi1_last (SCM lst);
+SCM_INTERNAL SCM scm_srfi1_length_plus (SCM lst);
+SCM_INTERNAL SCM scm_srfi1_lset_adjoin (SCM equal, SCM lst, SCM rest);
+SCM_INTERNAL SCM scm_srfi1_lset_difference_x (SCM equal, SCM lst, SCM rest);
+SCM_INTERNAL SCM scm_srfi1_list_copy (SCM lst);
+SCM_INTERNAL SCM scm_srfi1_list_index (SCM pred, SCM list1, SCM rest);
+SCM_INTERNAL SCM scm_srfi1_list_tabulate (SCM n, SCM proc);
+SCM_INTERNAL SCM scm_srfi1_map (SCM proc, SCM arg1, SCM args);
+SCM_INTERNAL SCM scm_srfi1_for_each (SCM proc, SCM arg1, SCM args);
+SCM_INTERNAL SCM scm_srfi1_member (SCM obj, SCM ls, SCM pred);
+SCM_INTERNAL SCM scm_srfi1_ninth (SCM lst);
+SCM_INTERNAL SCM scm_srfi1_assoc (SCM key, SCM alist, SCM pred);
+SCM_INTERNAL SCM scm_srfi1_not_pair_p (SCM obj);
+SCM_INTERNAL SCM scm_srfi1_partition (SCM pred, SCM list);
+SCM_INTERNAL SCM scm_srfi1_partition_x (SCM pred, SCM list);
+SCM_INTERNAL SCM scm_srfi1_reduce (SCM proc, SCM def, SCM lst);
+SCM_INTERNAL SCM scm_srfi1_reduce_right (SCM proc, SCM def, SCM lst);
+SCM_INTERNAL SCM scm_srfi1_remove (SCM pred, SCM list);
+SCM_INTERNAL SCM scm_srfi1_remove_x (SCM pred, SCM list);
+SCM_INTERNAL SCM scm_srfi1_seventh (SCM lst);
+SCM_INTERNAL SCM scm_srfi1_sixth (SCM lst);
+SCM_INTERNAL SCM scm_srfi1_span (SCM pred, SCM lst);
+SCM_INTERNAL SCM scm_srfi1_span_x (SCM pred, SCM lst);
+SCM_INTERNAL SCM scm_srfi1_split_at (SCM lst, SCM n);
+SCM_INTERNAL SCM scm_srfi1_split_at_x (SCM lst, SCM n);
+SCM_INTERNAL SCM scm_srfi1_take_x (SCM lst, SCM n);
+SCM_INTERNAL SCM scm_srfi1_take_right (SCM lst, SCM n);
+SCM_INTERNAL SCM scm_srfi1_take_while (SCM pred, SCM lst);
+SCM_INTERNAL SCM scm_srfi1_take_while_x (SCM pred, SCM lst);
+SCM_INTERNAL SCM scm_srfi1_tenth (SCM lst);
+SCM_INTERNAL SCM scm_srfi1_xcons (SCM d, SCM a);
+
+SCM_INTERNAL void scm_register_srfi_1 (void);
+SCM_INTERNAL void scm_init_srfi_1 (void);
+
+#endif /* SCM_SRFI_1_H */
diff --git a/srfi/srfi-60.c b/libguile/srfi-60.c
similarity index 96%
rename from srfi/srfi-60.c
rename to libguile/srfi-60.c
index 989898f..264f4cb 100644
--- a/srfi/srfi-60.c
+++ b/libguile/srfi-60.c
@@ -1,6 +1,6 @@
/* srfi-60.c --- Integers as Bits
*
- * Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc.
+ * Copyright (C) 2005, 2006, 2008, 2010 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
@@ -18,12 +18,19 @@
* 02110-1301 USA
*/
+
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#include <libguile.h>
-#include <srfi/srfi-60.h>
+#include "libguile/_scm.h"
+#include "libguile/eq.h"
+
+#include "libguile/validate.h"
+#include "libguile/numbers.h"
+
+#include "libguile/srfi-60.h"
SCM_DEFINE (scm_srfi60_log2_binary_factors, "log2-binary-factors", 1, 0, 0,
@@ -415,9 +422,17 @@ SCM_REGISTER_PROC (s_srfi60_booleans_to_integer,
"booleans->integer", 0, 0, 1, s
void
+scm_register_srfi_60 (void)
+{
+ scm_c_register_extension ("libguile-" SCM_EFFECTIVE_VERSION,
+ "scm_init_srfi_60",
+ (scm_t_extension_init_func)scm_init_srfi_60, NULL);
+}
+
+void
scm_init_srfi_60 (void)
{
#ifndef SCM_MAGIC_SNARFER
-#include "srfi/srfi-60.x"
+#include "libguile/srfi-60.x"
#endif
}
diff --git a/libguile/debug-malloc.h b/libguile/srfi-60.h
similarity index 53%
copy from libguile/debug-malloc.h
copy to libguile/srfi-60.h
index 7830adb..013820f 100644
--- a/libguile/debug-malloc.h
+++ b/libguile/srfi-60.h
@@ -1,9 +1,6 @@
-/* classes: h_files */
-
-#ifndef SCM_DEBUG_MALLOC_H
-#define SCM_DEBUG_MALLOC_H
-
-/* Copyright (C) 2000,2001, 2006, 2008 Free Software Foundation, Inc.
+/* srfi-60.h --- SRFI-60 procedures for Guile
+ *
+ * Copyright (C) 2005, 2006, 2010 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
@@ -20,26 +17,21 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA
*/
-
-#include "libguile/__scm.h"
+#ifndef SCM_SRFI_60_H
+#define SCM_SRFI_60_H
-
-
-SCM_API void scm_malloc_register (void *obj, const char *what);
-SCM_API void scm_malloc_unregister (void *obj);
-SCM_API void scm_malloc_reregister (void *obj, void *new, const char *what);
-
-SCM_API SCM scm_malloc_stats (void);
+#include "libguile/__scm.h"
-SCM_INTERNAL void scm_debug_malloc_prehistory (void);
-SCM_INTERNAL void scm_init_debug_malloc (void);
+SCM_INTERNAL SCM scm_srfi60_log2_binary_factors (SCM n);
+SCM_INTERNAL SCM scm_srfi60_copy_bit (SCM index, SCM n, SCM bit);
+SCM_INTERNAL SCM scm_srfi60_rotate_bit_field (SCM n, SCM count, SCM start, SCM
end);
+SCM_INTERNAL SCM scm_srfi60_reverse_bit_field (SCM n, SCM start, SCM end);
+SCM_INTERNAL SCM scm_srfi60_integer_to_list (SCM n, SCM len);
+SCM_INTERNAL SCM scm_srfi60_list_to_integer (SCM lst);
-#endif /* SCM_DEBUG_MALLOC_H */
+SCM_INTERNAL void scm_register_srfi_60 (void);
+SCM_INTERNAL void scm_init_srfi_60 (void);
-/*
- Local Variables:
- c-file-style: "gnu"
- End:
-*/
+#endif /* SCM_SRFI_60_H */
diff --git a/module/srfi/srfi-1.scm b/module/srfi/srfi-1.scm
index 1e27d6f..5eaf8ea 100644
--- a/module/srfi/srfi-1.scm
+++ b/module/srfi/srfi-1.scm
@@ -220,7 +220,8 @@
;; Load the compiled primitives from the shared library.
;;
-(load-extension "libguile-srfi-srfi-1-v-4" "scm_init_srfi_1")
+(load-extension (string-append "libguile-" (effective-version))
+ "scm_init_srfi_1")
;;; Constructors
diff --git a/module/srfi/srfi-60.scm b/module/srfi/srfi-60.scm
index dbb0776..b3ddaad 100644
--- a/module/srfi/srfi-60.scm
+++ b/module/srfi/srfi-60.scm
@@ -44,7 +44,8 @@
logbit?
ash))
-(load-extension "libguile-srfi-srfi-60-v-3" "scm_init_srfi_60")
+(load-extension (string-append "libguile-" (effective-version))
+ "scm_init_srfi_60")
(define bitwise-and logand)
(define bitwise-ior logior)
diff --git a/srfi/Makefile.am b/srfi/Makefile.am
deleted file mode 100644
index 655d214..0000000
--- a/srfi/Makefile.am
+++ /dev/null
@@ -1,82 +0,0 @@
-## Process this file with Automake to create Makefile.in
-##
-## Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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, 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; see the file COPYING.LESSER. If not,
-## write to the Free Software Foundation, Inc., 51 Franklin Street,
-## Fifth Floor, Boston, MA 02110-1301 USA
-
-include $(top_srcdir)/am/snarf
-
-AUTOMAKE_OPTIONS = gnu
-
-## Prevent automake from adding extra -I options
-DEFS = @DEFS@ @EXTRA_DEFS@
-## Check for headers in $(srcdir)/.., so that #include
-## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
-## building. Also look for Gnulib headers in `lib'.
-AM_CPPFLAGS = -I.. -I$(srcdir)/.. \
- -I$(top_srcdir)/lib -I$(top_builddir)/lib
-
-AM_CFLAGS = $(GCC_CFLAGS)
-AM_LDFLAGS = $(GNU_LD_FLAGS)
-
-# FIXME: should be libguile/srfi
-srfiincludedir = $(pkgincludedir)/$(GUILE_EFFECTIVE_VERSION)/srfi
-
-# These headers are visible as <guile/srfi/mumble.h>
-srfiinclude_HEADERS = srfi-1.h srfi-4.h srfi-13.h srfi-14.h srfi-60.h
-
-lib_LTLIBRARIES = \
- address@hidden@.la \
- address@hidden@.la \
- address@hidden@.la \
- address@hidden@.la
-
-BUILT_SOURCES = srfi-1.x srfi-4.x srfi-13.x srfi-14.x srfi-60.x
-
address@hidden@_la_SOURCES = srfi-1.c
address@hidden@_la_LIBADD = \
- $(top_builddir)/libguile/address@hidden@.la $(top_builddir)/lib/libgnu.la
address@hidden@_la_LDFLAGS = -no-undefined -export-dynamic -version-info
@LIBGUILE_SRFI_SRFI_1_INTERFACE@
-
address@hidden@_la_SOURCES = srfi-4.c
address@hidden@_la_LIBADD = \
- $(top_builddir)/libguile/address@hidden@.la $(top_builddir)/lib/libgnu.la
address@hidden@_la_LDFLAGS = -no-undefined -export-dynamic -version-info
@LIBGUILE_SRFI_SRFI_4_INTERFACE@
-
address@hidden@_la_SOURCES = srfi-13.c srfi-14.c
address@hidden@_la_LIBADD = \
- $(top_builddir)/libguile/address@hidden@.la $(top_builddir)/lib/libgnu.la
address@hidden@_la_LDFLAGS = -no-undefined -export-dynamic -version-info
@LIBGUILE_SRFI_SRFI_13_14_INTERFACE@
-
address@hidden@_la_SOURCES = srfi-60.c
address@hidden@_la_LIBADD = \
- $(top_builddir)/libguile/address@hidden@.la $(top_builddir)/lib/libgnu.la
address@hidden@_la_LDFLAGS = -no-undefined -export-dynamic -version-info
@LIBGUILE_SRFI_SRFI_60_INTERFACE@
-
-EXTRA_DIST = ChangeLog-2008
-
-MKDEP = gcc -M -MG $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)
-
-snarfcppopts = $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)
-
-SUFFIXES = .x
-
-.c.x:
- $(AM_V_SNARF)$(GUILE_SNARF) -o $@ $< $(snarfcppopts)
-
-CLEANFILES = *.x
diff --git a/srfi/README b/srfi/README
deleted file mode 100644
index 9d84a87..0000000
--- a/srfi/README
+++ /dev/null
@@ -1,100 +0,0 @@
-This directory includes most of Guile's SRFI support. -*- text -*-
-
-For more details about what SRFI means, and what the various numbers
-stand for, please refer to the SRFI homepage at
-
- http://srfi.schemers.org
-
-SRFI-0: cond-expand
-
- Supported by default, no module required.
-
-SRFI-1: List Library
-
- A full toolbox of list processing procedures. (use-modules (srfi
- srfi-1)) will make them available for use.
-
-SRFI-2: and-let*
-
- (use-modules (srfi srfi-2)) to make and-let* available.
-
-SRFI-4: Homogeneous numeric vector datatypes
-
-SRFI-6: open-input-string, open-output-string and get-output-string
-
- (use-modules (srfi srfi-6)) to make these available. (Currently,
- these procedures are available without using the module, but the
- procedures might be factored out of the core library in the
- future.)
-
-SRFI-8: receive
-
- (use-modules (srfi srfi-8)) to make receive available.
-
-SRFI-9: define-record-type
-
- A mechanism for defining record types. (use-modules (srfi srfi-9))
- makes this syntactic form available.
-
-SRFI-10: #,()
-
- The hash-comma reader extension. (use-modules (srfi srfi-10))
- activates the extension.
-
-SRFI-11: let-values and let-values*
-
- Syntactic extensions for handling multiple values. (use-modules
- (srfi srfi-11)) makes these syntactic forms available.
-
-SRFI-13: string library
-
- A lot of (more or less) useful string processing procedures.
- (use-modules (srfi srfi-13)) loads the procedures.
-
-SRFI-14: character-set library
-
- Character-set library. (use-modules (srfi srfi-14)) loads the
- procedures and standard variables.
-
-SRFI-16: case-lambda
-
- Syntactic form which permits writing functions acting different
- according to the number of arguments passed. (use-modules (srfi
- srfi-16)) makes this syntactic form available.
-
-SRFI-17: Generalized set!
-
- Guile supports generalized set! by default, but this module makes it
- fully compliant to the SRFI. (use-modules (srfi srfi-17)) loads the
- procedures.
-
-SRFI-19: Time Data Types and Procedures
-
- A lot of data types and procedures for dealing with times and
- dates. (use-modules (srfi srfi-19)) loads the procedures.
-
-SRFI-23: Error reporting mechanism
-
- Guile fully supports this SRFI. No need to load any module.
-
-SRFI-26: Notation for Specializing Parameters without Currying
-
- Exports: cut, cute.
-
-SRFI-31: A special form for recursive evaluation
-
- Exports: rec.
-
-SRFI-34: Exception Handling for Programs
-
- Exports: with-exception-handler, raise.
- Exports syntax: guard.
-
-SRFI-39: Parameter objects
-
- Exports: make-parameter, with-parameters*.
- Exports syntax: parameterize.
-
-SRFI-55: require-extension
-
- Supported by default, no module required.
diff --git a/srfi/srfi-1.h b/srfi/srfi-1.h
deleted file mode 100644
index 5797579..0000000
--- a/srfi/srfi-1.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef SCM_SRFI_1_H
-#define SCM_SRFI_1_H
-/* srfi-1.h --- SRFI-1 procedures for Guile
- *
- * Copyright (C) 2002, 2003, 2005, 2006 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 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
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-
-/* SCM_SRFI1_API is a macro prepended to all function and data definitions
- which should be exported or imported in the resulting dynamic link
- library in the Win32 port. */
-
-#if defined (SCM_SRFI1_IMPORT)
-# define SCM_SRFI1_API __declspec (dllimport) extern
-#elif defined (SCM_SRFI1_EXPORT) || defined (DLL_EXPORT)
-# define SCM_SRFI1_API __declspec (dllexport) extern
-#else
-# define SCM_SRFI1_API extern
-#endif
-
-SCM_SRFI1_API SCM scm_srfi1_alist_copy (SCM alist);
-SCM_SRFI1_API SCM scm_srfi1_append_reverse (SCM revhead, SCM tail);
-SCM_SRFI1_API SCM scm_srfi1_append_reverse_x (SCM revhead, SCM tail);
-SCM_SRFI1_API SCM scm_srfi1_break (SCM pred, SCM lst);
-SCM_SRFI1_API SCM scm_srfi1_break_x (SCM pred, SCM lst);
-SCM_SRFI1_API SCM scm_srfi1_car_plus_cdr (SCM pair);
-SCM_SRFI1_API SCM scm_srfi1_concatenate (SCM lstlst);
-SCM_SRFI1_API SCM scm_srfi1_concatenate_x (SCM lstlst);
-SCM_SRFI1_API SCM scm_srfi1_count (SCM pred, SCM list1, SCM rest);
-SCM_SRFI1_API SCM scm_srfi1_delete (SCM x, SCM lst, SCM pred);
-SCM_SRFI1_API SCM scm_srfi1_delete_x (SCM x, SCM lst, SCM pred);
-SCM_SRFI1_API SCM scm_srfi1_delete_duplicates (SCM lst, SCM pred);
-SCM_SRFI1_API SCM scm_srfi1_delete_duplicates_x (SCM lst, SCM pred);
-SCM_SRFI1_API SCM scm_srfi1_drop_right (SCM lst, SCM n);
-SCM_SRFI1_API SCM scm_srfi1_drop_right_x (SCM lst, SCM n);
-SCM_SRFI1_API SCM scm_srfi1_drop_while (SCM pred, SCM lst);
-SCM_SRFI1_API SCM scm_srfi1_eighth (SCM lst);
-SCM_SRFI1_API SCM scm_srfi1_fifth (SCM lst);
-SCM_SRFI1_API SCM scm_srfi1_filter_map (SCM proc, SCM list1, SCM rest);
-SCM_SRFI1_API SCM scm_srfi1_find (SCM pred, SCM lst);
-SCM_SRFI1_API SCM scm_srfi1_find_tail (SCM pred, SCM lst);
-SCM_SRFI1_API SCM scm_srfi1_fold (SCM proc, SCM init, SCM list1, SCM rest);
-SCM_SRFI1_API SCM scm_srfi1_last (SCM lst);
-SCM_SRFI1_API SCM scm_srfi1_length_plus (SCM lst);
-SCM_SRFI1_API SCM scm_srfi1_lset_adjoin (SCM equal, SCM lst, SCM rest);
-SCM_SRFI1_API SCM scm_srfi1_lset_difference_x (SCM equal, SCM lst, SCM rest);
-SCM_SRFI1_API SCM scm_srfi1_list_copy (SCM lst);
-SCM_SRFI1_API SCM scm_srfi1_list_index (SCM pred, SCM list1, SCM rest);
-SCM_SRFI1_API SCM scm_srfi1_list_tabulate (SCM n, SCM proc);
-SCM_SRFI1_API SCM scm_srfi1_map (SCM proc, SCM arg1, SCM args);
-SCM_SRFI1_API SCM scm_srfi1_for_each (SCM proc, SCM arg1, SCM args);
-SCM_SRFI1_API SCM scm_srfi1_member (SCM obj, SCM ls, SCM pred);
-SCM_SRFI1_API SCM scm_srfi1_ninth (SCM lst);
-SCM_SRFI1_API SCM scm_srfi1_assoc (SCM key, SCM alist, SCM pred);
-SCM_SRFI1_API SCM scm_srfi1_not_pair_p (SCM obj);
-SCM_SRFI1_API SCM scm_srfi1_partition (SCM pred, SCM list);
-SCM_SRFI1_API SCM scm_srfi1_partition_x (SCM pred, SCM list);
-SCM_SRFI1_API SCM scm_srfi1_reduce (SCM proc, SCM def, SCM lst);
-SCM_SRFI1_API SCM scm_srfi1_reduce_right (SCM proc, SCM def, SCM lst);
-SCM_SRFI1_API SCM scm_srfi1_remove (SCM pred, SCM list);
-SCM_SRFI1_API SCM scm_srfi1_remove_x (SCM pred, SCM list);
-SCM_SRFI1_API SCM scm_srfi1_seventh (SCM lst);
-SCM_SRFI1_API SCM scm_srfi1_sixth (SCM lst);
-SCM_SRFI1_API SCM scm_srfi1_span (SCM pred, SCM lst);
-SCM_SRFI1_API SCM scm_srfi1_span_x (SCM pred, SCM lst);
-SCM_SRFI1_API SCM scm_srfi1_split_at (SCM lst, SCM n);
-SCM_SRFI1_API SCM scm_srfi1_split_at_x (SCM lst, SCM n);
-SCM_SRFI1_API SCM scm_srfi1_take_x (SCM lst, SCM n);
-SCM_SRFI1_API SCM scm_srfi1_take_right (SCM lst, SCM n);
-SCM_SRFI1_API SCM scm_srfi1_take_while (SCM pred, SCM lst);
-SCM_SRFI1_API SCM scm_srfi1_take_while_x (SCM pred, SCM lst);
-SCM_SRFI1_API SCM scm_srfi1_tenth (SCM lst);
-SCM_SRFI1_API SCM scm_srfi1_xcons (SCM d, SCM a);
-
-SCM_SRFI1_API void scm_init_srfi_1 (void);
-
-#endif /* SCM_SRFI_1_H */
diff --git a/srfi/srfi-13.c b/srfi/srfi-13.c
deleted file mode 100644
index 61a960e..0000000
--- a/srfi/srfi-13.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* srfi-13.c --- old place of SRFI-13 procedures for Guile
- *
- * Copyright (C) 2001, 2004, 2006, 2008 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 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
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-
-/* This file is now empty since all its procedures are now in the
- core. We keep the libguile-srfi-srfi-13.so library around anyway
- since people might still be linking with it.
-*/
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <srfi/srfi-13.h>
-
-void
-scm_init_srfi_13 (void)
-{
-}
-
-void
-scm_init_srfi_13_14 (void)
-{
-}
diff --git a/srfi/srfi-13.h b/srfi/srfi-13.h
deleted file mode 100644
index a110ffd..0000000
--- a/srfi/srfi-13.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef SCM_SRFI_13_H
-#define SCM_SRFI_13_H
-
-/* SRFI-13 procedures for Guile
- *
- * Copyright (C) 2001, 2004, 2006 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 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
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-
-/* All SRFI-13 procedures are in in the core now. */
-
-#include <libguile.h>
-
-/* SCM_SRFI1314_API is a macro prepended to all function and data definitions
- which should be exported or imported in the resulting dynamic link
- library in the Win32 port. */
-
-#if defined (SCM_SRFI1314_IMPORT)
-# define SCM_SRFI1314_API __declspec (dllimport) extern
-#elif defined (SCM_SRFI1314_EXPORT) || defined (DLL_EXPORT)
-# define SCM_SRFI1314_API __declspec (dllexport) extern
-#else
-# define SCM_SRFI1314_API extern
-#endif
-
-SCM_SRFI1314_API void scm_init_srfi_13 (void);
-SCM_SRFI1314_API void scm_init_srfi_13_14 (void);
-
-/* The following functions have new names in the core.
- */
-
-#define scm_string_to_listS scm_substring_to_list
-#define scm_string_copyS scm_substring_copy
-#define scm_substring_sharedS scm_substring_shared
-#define scm_string_fill_xS scm_substring_fill_x
-#define scm_string_indexS scm_string_index
-#define scm_string_upcase_xS scm_substring_upcase_x
-#define scm_string_upcaseS scm_substring_upcase
-#define scm_string_downcase_xS scm_substring_downcase_x
-#define scm_string_downcaseS scm_substring_downcase
-
-#endif /* SCM_SRFI_13_H */
diff --git a/srfi/srfi-14.c b/srfi/srfi-14.c
deleted file mode 100644
index 9f6ad8b..0000000
--- a/srfi/srfi-14.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* srfi-14.c --- Old place of SRFI-14 procedures for Guile
- *
- * Copyright (C) 2001, 2004, 2006, 2008 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 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
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <srfi/srfi-14.h>
-
-void
-scm_init_srfi_14 (void)
-{
-}
-
-void
-scm_c_init_srfi_14 (void)
-{
-}
diff --git a/srfi/srfi-14.h b/srfi/srfi-14.h
deleted file mode 100644
index a793159..0000000
--- a/srfi/srfi-14.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef SCM_SRFI_14_H
-#define SCM_SRFI_14_H
-/* srfi-14.c --- SRFI-14 procedures for Guile
- *
- * Copyright (C) 2001, 2004, 2006 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 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
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-
-/* SCM_SRFI1314_API is a macro prepended to all function and data definitions
- which should be exported or imported in the resulting dynamic link
- library in the Win32 port. */
-
-#if defined (SCM_SRFI1314_IMPORT)
-# define SCM_SRFI1314_API __declspec (dllimport) extern
-#elif defined (SCM_SRFI1314_EXPORT) || defined (DLL_EXPORT)
-# define SCM_SRFI1314_API __declspec (dllexport) extern
-#else
-# define SCM_SRFI1314_API extern
-#endif
-
-SCM_SRFI1314_API void scm_c_init_srfi_14 (void);
-SCM_SRFI1314_API void scm_init_srfi_14 (void);
-
-#endif /* SCM_SRFI_14_H */
diff --git a/srfi/srfi-4.c b/srfi/srfi-4.c
deleted file mode 100644
index 9b32b61..0000000
--- a/srfi/srfi-4.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* srfi-4.c --- Homogeneous numeric vector datatypes.
- *
- * Copyright (C) 2001, 2004, 2006, 2008 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 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
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-/* This file is now empty since all its procedures are now in the
- core. We keep the libguile-srfi-srfi-4.so library around anyway
- since people might still be linking with it.
-*/
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <srfi/srfi-4.h>
-
-void
-scm_init_srfi_4 (void)
-{
-}
-
-/* End of srfi-4.c. */
diff --git a/srfi/srfi-4.h b/srfi/srfi-4.h
deleted file mode 100644
index 0439675..0000000
--- a/srfi/srfi-4.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef SCM_SRFI_SRFI_4_H
-#define SCM_SRFI_SRFI_4_H
-/* srfi-4.c --- Homogeneous numeric vector datatypes.
- *
- * Copyright (C) 2001, 2006 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 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
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-
-/* All SRFI-4 procedures are in in the core now. */
-
-#include <libguile.h>
-
-#endif /* SCM_SRFI_SRFI_4_H */
diff --git a/srfi/srfi-60.h b/srfi/srfi-60.h
deleted file mode 100644
index 47a8cf7..0000000
--- a/srfi/srfi-60.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* srfi-60.h --- SRFI-60 procedures for Guile
- *
- * Copyright (C) 2005, 2006 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 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
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-
-#ifndef SCM_SRFI_60_H
-#define SCM_SRFI_60_H
-
-/* SCM_SRFI60_API is a macro prepended to all function and data definitions
- which should be exported or imported in the resulting dynamic link
- library in the Win32 port. */
-
-#if defined (SCM_SRFI60_IMPORT)
-# define SCM_SRFI60_API __declspec (dllimport) extern
-#elif defined (SCM_SRFI60_EXPORT) || defined (DLL_EXPORT)
-# define SCM_SRFI60_API __declspec (dllexport) extern
-#else
-# define SCM_SRFI60_API extern
-#endif
-
-SCM_SRFI60_API SCM scm_srfi60_log2_binary_factors (SCM n);
-SCM_SRFI60_API SCM scm_srfi60_copy_bit (SCM index, SCM n, SCM bit);
-SCM_SRFI60_API SCM scm_srfi60_rotate_bit_field (SCM n, SCM count, SCM start,
SCM end);
-SCM_SRFI60_API SCM scm_srfi60_reverse_bit_field (SCM n, SCM start, SCM end);
-SCM_SRFI60_API SCM scm_srfi60_integer_to_list (SCM n, SCM len);
-SCM_SRFI60_API SCM scm_srfi60_list_to_integer (SCM lst);
-
-SCM_SRFI60_API void scm_init_srfi_60 (void);
-
-#endif /* SCM_SRFI_60_H */
diff --git a/test-suite/standalone/Makefile.am
b/test-suite/standalone/Makefile.am
index 68c8360..3fa9540 100644
--- a/test-suite/standalone/Makefile.am
+++ b/test-suite/standalone/Makefile.am
@@ -163,15 +163,6 @@ libtest_extensions_la_LIBADD =
${top_builddir}/libguile/address@hidden
check_SCRIPTS += test-extensions
TESTS += test-extensions
-# test-srfi-1
-test_srfi_1_SOURCES = test-srfi-1.c
-test_srfi_1_CFLAGS = ${test_cflags}
-test_srfi_1_LDADD = \
- ${top_builddir}/srfi/address@hidden@.la \
- ${top_builddir}/libguile/address@hidden@.la
-check_PROGRAMS += test-srfi-1
-TESTS += test-srfi-1
-
if BUILD_PTHREAD_SUPPORT
# test-with-guile-module
diff --git a/test-suite/standalone/test-srfi-1.c
b/test-suite/standalone/test-srfi-1.c
deleted file mode 100644
index 995c20e..0000000
--- a/test-suite/standalone/test-srfi-1.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright (C) 2010 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 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
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-/* Exercise the compatibility layer of `libguile-srfi-srfi-1'. */
-
-#ifndef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <libguile.h>
-#include <srfi/srfi-1.h>
-
-#include <stdlib.h>
-
-static void
-failure (const char *proc, SCM result)
-{
- scm_simple_format (scm_current_error_port (),
- scm_from_locale_string ("`~S' failed: ~S~%"),
- scm_list_2 (scm_from_locale_symbol (proc), result));
-}
-
-static void *
-tests (void *data)
-{
- SCM times, negative_p, lst, result;
-
- scm_init_srfi_1 ();
-
- times = SCM_VARIABLE_REF (scm_c_lookup ("*"));
- lst = scm_list_3 (scm_from_int (1), scm_from_int (2), scm_from_int (3));
-
- /* (fold * 1 '(1 2 3) '(1 2 3)) */
- result = scm_srfi1_fold (times, scm_from_int (1), lst, scm_list_1 (lst));
-
- if (scm_to_int (result) == 36)
- {
- negative_p = SCM_VARIABLE_REF (scm_c_lookup ("negative?"));
- result = scm_srfi1_break (negative_p,
- scm_list_3 (scm_from_int (1),
- scm_from_int (2),
- scm_from_int (-1)));
-
- if (SCM_VALUESP (result))
- /* There's no API to access the values, so assume this is OK. */
- * (int *) data = EXIT_SUCCESS;
- else
- {
- failure ("break", result);
- * (int *) data = EXIT_FAILURE;
- }
- }
- else
- {
- failure ("fold", result);
- * (int *) data = EXIT_FAILURE;
- }
-
- return data;
-}
-
-
-int
-main (int argc, char *argv[])
-{
- int ret;
-
- scm_with_guile (tests, &ret);
-
- return ret;
-}
hooks/post-receive
--
GNU Guile
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Guile-commits] GNU Guile branch, master, updated. release_1-9-12-18-gcf7e51b,
Andy Wingo <=