[uim-commit] r3070 - branches/r5rs/sigscheme/src
yamaken at freedesktop.org
yamaken at freedesktop.org
Wed Feb 1 22:59:35 PST 2006
Author: yamaken
Date: 2006-02-01 22:59:29 -0800 (Wed, 01 Feb 2006)
New Revision: 3070
Added:
branches/r5rs/sigscheme/src/deep-cadrs.c
Removed:
branches/r5rs/sigscheme/src/module-r5rs-deepcadrs.c
Modified:
branches/r5rs/sigscheme/src/Makefile.am
branches/r5rs/sigscheme/src/sigscheme.c
branches/r5rs/sigscheme/src/sigscheme.h
Log:
* sigscheme/src/deep-cadrs.c
- Renamed from module-r5rs-deepcadrs.c
* sigscheme/src/module-r5rs-deepcadrs.c
- Rename to deep-cadrs.c
* sigscheme/src/Makefile.am
- Remove the rule for functable-r5rs-deepcadrs.c
- (FUNC_TABLES): Remove functable-r5rs-deepcadrs.c
- (R5RS_PROC_SRCS): Add deep-cadrs.c conditionally
- (libsscm_la_SOURCES): Follow the file renaming
* sigscheme/src/sigscheme.c
- Exclude functable-r5rs-deepcadrs.c
- (scm_initialize_internal): Follow the changes
Modified: branches/r5rs/sigscheme/src/Makefile.am
===================================================================
--- branches/r5rs/sigscheme/src/Makefile.am 2006-02-02 06:48:33 UTC (rev 3069)
+++ branches/r5rs/sigscheme/src/Makefile.am 2006-02-02 06:59:29 UTC (rev 3070)
@@ -13,7 +13,6 @@
functable-sscm-core.c \
functable-r5rs-syntax.c \
functable-r5rs-procedure.c \
- functable-r5rs-deepcadrs.c \
functable-nonstd.c \
functable-siod.c \
functable-srfi1.c \
@@ -48,6 +47,9 @@
if USE_LOAD
R5RS_PROC_SRCS += load.c
endif
+if USE_DEEP_CADRS
+ R5RS_PROC_SRCS += deep-cadrs.c
+endif
.PHONY: func-tables
func-tables: $(FUNC_TABLES)
@@ -58,8 +60,6 @@
functable-r5rs-procedure.c: $(R5RS_PROC_SRCS) $(BUILD_FUNCTBL_DEPS)
$(BUILD_FUNCTBL) $@ "scm_r5rs_procedure_func_info_table" \
$(R5RS_PROC_SRCS)
-functable-r5rs-deepcadrs.c: module-r5rs-deepcadrs.c $(BUILD_FUNCTBL_DEPS)
- $(BUILD_FUNCTBL) $@ "scm_r5rs_deepcadrs_func_info_table" $<
functable-nonstd.c: module-nonstd.c $(BUILD_FUNCTBL_DEPS)
$(BUILD_FUNCTBL) $@ "scm_nonstd_func_info_table" $<
functable-srfi1.c: module-srfi1.c $(BUILD_FUNCTBL_DEPS)
@@ -129,13 +129,13 @@
if USE_LOAD
libsscm_la_SOURCES += load.c
endif
+if USE_DEEP_CADRS
+ libsscm_la_SOURCES += deep-cadrs.c
+endif
if USE_MULTIBYTE_CHAR
pkginclude_HEADERS += encoding.h
libsscm_la_SOURCES += encoding.c
endif
-if USE_DEEP_CADRS
- libsscm_la_SOURCES += module-r5rs-deepcadrs.c
-endif
if USE_NONSTD_FEATURES
libsscm_la_SOURCES += module-nonstd.c
endif
Copied: branches/r5rs/sigscheme/src/deep-cadrs.c (from rev 3063, branches/r5rs/sigscheme/src/module-r5rs-deepcadrs.c)
===================================================================
--- branches/r5rs/sigscheme/src/module-r5rs-deepcadrs.c 2006-02-01 09:27:04 UTC (rev 3063)
+++ branches/r5rs/sigscheme/src/deep-cadrs.c 2006-02-02 06:59:29 UTC (rev 3070)
@@ -0,0 +1,240 @@
+/*===========================================================================
+ * FileName : deep-cadrs.c
+ * About : Deep c[ad]+r operations of R5RS
+ *
+ * Copyright (C) 2005-2006 Kazuki Ohta <mover AT hct.zaq.ne.jp>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of authors nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
+ * IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+===========================================================================*/
+
+#include "config.h"
+
+/*=======================================
+ System Include
+=======================================*/
+
+/*=======================================
+ Local Include
+=======================================*/
+#include "sigscheme.h"
+#include "sigschemeinternal.h"
+
+/*=======================================
+ File Local Macro Definitions
+=======================================*/
+
+/*=======================================
+ File Local Type Definitions
+=======================================*/
+
+/*=======================================
+ Variable Declarations
+=======================================*/
+
+/*=======================================
+ File Local Function Declarations
+=======================================*/
+
+/*=======================================
+ Function Implementations
+=======================================*/
+ScmObj
+scm_p_caaar(ScmObj lst)
+{
+ DECLARE_FUNCTION("caaar", procedure_fixed_1);
+
+ return scm_p_car( scm_p_car( scm_p_car(lst) ));
+}
+
+ScmObj
+scm_p_caadr(ScmObj lst)
+{
+ DECLARE_FUNCTION("caadr", procedure_fixed_1);
+
+ return scm_p_car( scm_p_car( scm_p_cdr(lst) ));
+}
+
+ScmObj
+scm_p_cadar(ScmObj lst)
+{
+ DECLARE_FUNCTION("cadar", procedure_fixed_1);
+
+ return scm_p_car( scm_p_cdr( scm_p_car(lst) ));
+}
+
+ScmObj
+scm_p_cdaar(ScmObj lst)
+{
+ DECLARE_FUNCTION("cdaar", procedure_fixed_1);
+
+ return scm_p_cdr( scm_p_car( scm_p_car(lst) ));
+}
+
+ScmObj
+scm_p_cdadr(ScmObj lst)
+{
+ DECLARE_FUNCTION("cdadr", procedure_fixed_1);
+
+ return scm_p_cdr( scm_p_car( scm_p_cdr(lst) ));
+}
+
+ScmObj
+scm_p_cddar(ScmObj lst)
+{
+ DECLARE_FUNCTION("cddar", procedure_fixed_1);
+
+ return scm_p_cdr( scm_p_cdr( scm_p_car(lst) ));
+}
+
+ScmObj
+scm_p_caaaar(ScmObj lst)
+{
+ DECLARE_FUNCTION("caaaar", procedure_fixed_1);
+
+ return scm_p_car( scm_p_car( scm_p_car( scm_p_car(lst) )));
+}
+
+ScmObj
+scm_p_caaadr(ScmObj lst)
+{
+ DECLARE_FUNCTION("caaadr", procedure_fixed_1);
+
+ return scm_p_car( scm_p_car( scm_p_car( scm_p_cdr(lst) )));
+}
+
+ScmObj
+scm_p_caadar(ScmObj lst)
+{
+ DECLARE_FUNCTION("caadar", procedure_fixed_1);
+
+ return scm_p_car( scm_p_car( scm_p_cdr( scm_p_car(lst) )));
+}
+
+ScmObj
+scm_p_caaddr(ScmObj lst)
+{
+ DECLARE_FUNCTION("caaddr", procedure_fixed_1);
+
+ return scm_p_car( scm_p_car( scm_p_cdr( scm_p_cdr(lst) )));
+}
+
+ScmObj
+scm_p_cadaar(ScmObj lst)
+{
+ DECLARE_FUNCTION("cadaar", procedure_fixed_1);
+
+ return scm_p_car( scm_p_cdr( scm_p_car( scm_p_car(lst) )));
+}
+
+ScmObj
+scm_p_cadadr(ScmObj lst)
+{
+ DECLARE_FUNCTION("cadadr", procedure_fixed_1);
+
+ return scm_p_car( scm_p_cdr( scm_p_car( scm_p_cdr(lst) )));
+}
+
+ScmObj
+scm_p_caddar(ScmObj lst)
+{
+ DECLARE_FUNCTION("caddar", procedure_fixed_1);
+
+ return scm_p_car( scm_p_cdr( scm_p_cdr( scm_p_car(lst) )));
+}
+
+ScmObj
+scm_p_cadddr(ScmObj lst)
+{
+ DECLARE_FUNCTION("cadddr", procedure_fixed_1);
+
+ return scm_p_car( scm_p_cdr( scm_p_cdr( scm_p_cdr(lst) )));
+}
+
+ScmObj
+scm_p_cdaaar(ScmObj lst)
+{
+ DECLARE_FUNCTION("cdaaar", procedure_fixed_1);
+
+ return scm_p_cdr( scm_p_car( scm_p_car( scm_p_car(lst) )));
+}
+
+ScmObj
+scm_p_cdaadr(ScmObj lst)
+{
+ DECLARE_FUNCTION("cdaadr", procedure_fixed_1);
+
+ return scm_p_cdr( scm_p_car( scm_p_car( scm_p_cdr(lst) )));
+}
+
+ScmObj
+scm_p_cdadar(ScmObj lst)
+{
+ DECLARE_FUNCTION("cdadar", procedure_fixed_1);
+
+ return scm_p_cdr( scm_p_car( scm_p_cdr( scm_p_car(lst) )));
+}
+
+ScmObj
+scm_p_cdaddr(ScmObj lst)
+{
+ DECLARE_FUNCTION("cdaddr", procedure_fixed_1);
+
+ return scm_p_cdr( scm_p_car( scm_p_cdr( scm_p_cdr(lst) )));
+}
+
+ScmObj
+scm_p_cddaar(ScmObj lst)
+{
+ DECLARE_FUNCTION("cddaar", procedure_fixed_1);
+
+ return scm_p_cdr( scm_p_cdr( scm_p_car( scm_p_car(lst) )));
+}
+
+ScmObj
+scm_p_cddadr(ScmObj lst)
+{
+ DECLARE_FUNCTION("cddadr", procedure_fixed_1);
+
+ return scm_p_cdr( scm_p_cdr( scm_p_car( scm_p_cdr(lst) )));
+}
+
+ScmObj
+scm_p_cdddar(ScmObj lst)
+{
+ DECLARE_FUNCTION("cdddar", procedure_fixed_1);
+
+ return scm_p_cdr( scm_p_cdr( scm_p_cdr( scm_p_car(lst) )));
+}
+
+ScmObj
+scm_p_cddddr(ScmObj lst)
+{
+ DECLARE_FUNCTION("cddddr", procedure_fixed_1);
+
+ return scm_p_cdr( scm_p_cdr( scm_p_cdr( scm_p_cdr(lst) )));
+}
Deleted: branches/r5rs/sigscheme/src/module-r5rs-deepcadrs.c
===================================================================
--- branches/r5rs/sigscheme/src/module-r5rs-deepcadrs.c 2006-02-02 06:48:33 UTC (rev 3069)
+++ branches/r5rs/sigscheme/src/module-r5rs-deepcadrs.c 2006-02-02 06:59:29 UTC (rev 3070)
@@ -1,240 +0,0 @@
-/*===========================================================================
- * FileName : module-r5rs-deepcadrs.c
- * About : Deep c[ad]+r operations of R5RS
- *
- * Copyright (C) 2005-2006 Kazuki Ohta <mover AT hct.zaq.ne.jp>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of authors nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
- * IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-===========================================================================*/
-
-#include "config.h"
-
-/*=======================================
- System Include
-=======================================*/
-
-/*=======================================
- Local Include
-=======================================*/
-#include "sigscheme.h"
-#include "sigschemeinternal.h"
-
-/*=======================================
- File Local Macro Definitions
-=======================================*/
-
-/*=======================================
- File Local Type Definitions
-=======================================*/
-
-/*=======================================
- Variable Declarations
-=======================================*/
-
-/*=======================================
- File Local Function Declarations
-=======================================*/
-
-/*=======================================
- Function Implementations
-=======================================*/
-ScmObj
-scm_p_caaar(ScmObj lst)
-{
- DECLARE_FUNCTION("caaar", procedure_fixed_1);
-
- return scm_p_car( scm_p_car( scm_p_car(lst) ));
-}
-
-ScmObj
-scm_p_caadr(ScmObj lst)
-{
- DECLARE_FUNCTION("caadr", procedure_fixed_1);
-
- return scm_p_car( scm_p_car( scm_p_cdr(lst) ));
-}
-
-ScmObj
-scm_p_cadar(ScmObj lst)
-{
- DECLARE_FUNCTION("cadar", procedure_fixed_1);
-
- return scm_p_car( scm_p_cdr( scm_p_car(lst) ));
-}
-
-ScmObj
-scm_p_cdaar(ScmObj lst)
-{
- DECLARE_FUNCTION("cdaar", procedure_fixed_1);
-
- return scm_p_cdr( scm_p_car( scm_p_car(lst) ));
-}
-
-ScmObj
-scm_p_cdadr(ScmObj lst)
-{
- DECLARE_FUNCTION("cdadr", procedure_fixed_1);
-
- return scm_p_cdr( scm_p_car( scm_p_cdr(lst) ));
-}
-
-ScmObj
-scm_p_cddar(ScmObj lst)
-{
- DECLARE_FUNCTION("cddar", procedure_fixed_1);
-
- return scm_p_cdr( scm_p_cdr( scm_p_car(lst) ));
-}
-
-ScmObj
-scm_p_caaaar(ScmObj lst)
-{
- DECLARE_FUNCTION("caaaar", procedure_fixed_1);
-
- return scm_p_car( scm_p_car( scm_p_car( scm_p_car(lst) )));
-}
-
-ScmObj
-scm_p_caaadr(ScmObj lst)
-{
- DECLARE_FUNCTION("caaadr", procedure_fixed_1);
-
- return scm_p_car( scm_p_car( scm_p_car( scm_p_cdr(lst) )));
-}
-
-ScmObj
-scm_p_caadar(ScmObj lst)
-{
- DECLARE_FUNCTION("caadar", procedure_fixed_1);
-
- return scm_p_car( scm_p_car( scm_p_cdr( scm_p_car(lst) )));
-}
-
-ScmObj
-scm_p_caaddr(ScmObj lst)
-{
- DECLARE_FUNCTION("caaddr", procedure_fixed_1);
-
- return scm_p_car( scm_p_car( scm_p_cdr( scm_p_cdr(lst) )));
-}
-
-ScmObj
-scm_p_cadaar(ScmObj lst)
-{
- DECLARE_FUNCTION("cadaar", procedure_fixed_1);
-
- return scm_p_car( scm_p_cdr( scm_p_car( scm_p_car(lst) )));
-}
-
-ScmObj
-scm_p_cadadr(ScmObj lst)
-{
- DECLARE_FUNCTION("cadadr", procedure_fixed_1);
-
- return scm_p_car( scm_p_cdr( scm_p_car( scm_p_cdr(lst) )));
-}
-
-ScmObj
-scm_p_caddar(ScmObj lst)
-{
- DECLARE_FUNCTION("caddar", procedure_fixed_1);
-
- return scm_p_car( scm_p_cdr( scm_p_cdr( scm_p_car(lst) )));
-}
-
-ScmObj
-scm_p_cadddr(ScmObj lst)
-{
- DECLARE_FUNCTION("cadddr", procedure_fixed_1);
-
- return scm_p_car( scm_p_cdr( scm_p_cdr( scm_p_cdr(lst) )));
-}
-
-ScmObj
-scm_p_cdaaar(ScmObj lst)
-{
- DECLARE_FUNCTION("cdaaar", procedure_fixed_1);
-
- return scm_p_cdr( scm_p_car( scm_p_car( scm_p_car(lst) )));
-}
-
-ScmObj
-scm_p_cdaadr(ScmObj lst)
-{
- DECLARE_FUNCTION("cdaadr", procedure_fixed_1);
-
- return scm_p_cdr( scm_p_car( scm_p_car( scm_p_cdr(lst) )));
-}
-
-ScmObj
-scm_p_cdadar(ScmObj lst)
-{
- DECLARE_FUNCTION("cdadar", procedure_fixed_1);
-
- return scm_p_cdr( scm_p_car( scm_p_cdr( scm_p_car(lst) )));
-}
-
-ScmObj
-scm_p_cdaddr(ScmObj lst)
-{
- DECLARE_FUNCTION("cdaddr", procedure_fixed_1);
-
- return scm_p_cdr( scm_p_car( scm_p_cdr( scm_p_cdr(lst) )));
-}
-
-ScmObj
-scm_p_cddaar(ScmObj lst)
-{
- DECLARE_FUNCTION("cddaar", procedure_fixed_1);
-
- return scm_p_cdr( scm_p_cdr( scm_p_car( scm_p_car(lst) )));
-}
-
-ScmObj
-scm_p_cddadr(ScmObj lst)
-{
- DECLARE_FUNCTION("cddadr", procedure_fixed_1);
-
- return scm_p_cdr( scm_p_cdr( scm_p_car( scm_p_cdr(lst) )));
-}
-
-ScmObj
-scm_p_cdddar(ScmObj lst)
-{
- DECLARE_FUNCTION("cdddar", procedure_fixed_1);
-
- return scm_p_cdr( scm_p_cdr( scm_p_cdr( scm_p_car(lst) )));
-}
-
-ScmObj
-scm_p_cddddr(ScmObj lst)
-{
- DECLARE_FUNCTION("cddddr", procedure_fixed_1);
-
- return scm_p_cdr( scm_p_cdr( scm_p_cdr( scm_p_cdr(lst) )));
-}
Modified: branches/r5rs/sigscheme/src/sigscheme.c
===================================================================
--- branches/r5rs/sigscheme/src/sigscheme.c 2006-02-02 06:48:33 UTC (rev 3069)
+++ branches/r5rs/sigscheme/src/sigscheme.c 2006-02-02 06:59:29 UTC (rev 3070)
@@ -65,9 +65,6 @@
=======================================*/
#include "functable-sscm-core.c"
#include "functable-r5rs-procedure.c"
-#if SCM_USE_DEEP_CADRS
-#include "functable-r5rs-deepcadrs.c"
-#endif
static scm_bool scm_initialized;
@@ -134,10 +131,6 @@
/* R5RS Procedures */
scm_register_funcs(scm_r5rs_procedure_func_info_table);
-#if SCM_USE_DEEP_CADRS
- /* Deep c[ad]+r Functions */
- scm_register_funcs(scm_r5rs_deepcadrs_func_info_table);
-#endif
#if SCM_USE_NONSTD_FEATURES
scm_use("sscm");
#endif
Modified: branches/r5rs/sigscheme/src/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/src/sigscheme.h 2006-02-02 06:48:33 UTC (rev 3069)
+++ branches/r5rs/sigscheme/src/sigscheme.h 2006-02-02 06:59:29 UTC (rev 3070)
@@ -1292,7 +1292,7 @@
ScmObj scm_p_list2vector(ScmObj lst);
ScmObj scm_p_vector_filld(ScmObj vec, ScmObj fill);
-/* module-r5rs-deepcadrs.c */
+/* deep-cadrs.c */
#if SCM_USE_DEEP_CADRS
ScmObj scm_p_caaar(ScmObj lst);
ScmObj scm_p_caadr(ScmObj lst);
More information about the uim-commit
mailing list