[uim-commit] r3067 - in branches/r5rs/sigscheme/src: . script
yamaken at freedesktop.org
yamaken at freedesktop.org
Wed Feb 1 21:26:12 PST 2006
Author: yamaken
Date: 2006-02-01 21:26:08 -0800 (Wed, 01 Feb 2006)
New Revision: 3067
Modified:
branches/r5rs/sigscheme/src/Makefile.am
branches/r5rs/sigscheme/src/error.c
branches/r5rs/sigscheme/src/module-nonstd.c
branches/r5rs/sigscheme/src/module-siod.c
branches/r5rs/sigscheme/src/module-srfi1.c
branches/r5rs/sigscheme/src/module-srfi2.c
branches/r5rs/sigscheme/src/module-srfi23.c
branches/r5rs/sigscheme/src/module-srfi34.c
branches/r5rs/sigscheme/src/module-srfi38.c
branches/r5rs/sigscheme/src/module-srfi6.c
branches/r5rs/sigscheme/src/module-srfi60.c
branches/r5rs/sigscheme/src/module-srfi8.c
branches/r5rs/sigscheme/src/script/functable-header.txt
branches/r5rs/sigscheme/src/sigscheme.c
branches/r5rs/sigscheme/src/syntax.c
Log:
* sigscheme/src/script/functable-header.txt
- Remove unneeded section headers
* sigscheme/src/Makefile.am
- (SCRIPT_DIR): New variable
- Rename sigschemefunctable-*.c to functable-*.c since the prefix
does not make sense
- (BUILD_FUNCTBL_SOURCES, BUILD_FUNCTBL_DEPS): Rename
BUILD_FUNCTBL_SOURCES to BUILD_FUNCTBL_DEPS to fix the
automake-reserved name
* sigscheme/src/error.c
* sigscheme/src/syntax.c
* sigscheme/src/sigscheme.c
* sigscheme/src/module-nonstd.c
* sigscheme/src/module-siod.c
* sigscheme/src/module-srfi1.c
* sigscheme/src/module-srfi2.c
* sigscheme/src/module-srfi6.c
* sigscheme/src/module-srfi8.c
* sigscheme/src/module-srfi23.c
* sigscheme/src/module-srfi34.c
* sigscheme/src/module-srfi38.c
* sigscheme/src/module-srfi60.c
- Follow the file renamings
Modified: branches/r5rs/sigscheme/src/Makefile.am
===================================================================
--- branches/r5rs/sigscheme/src/Makefile.am 2006-02-02 04:59:55 UTC (rev 3066)
+++ branches/r5rs/sigscheme/src/Makefile.am 2006-02-02 05:26:08 UTC (rev 3067)
@@ -1,28 +1,30 @@
#noinst_LTLIBRARIES = libsscm.la
lib_LTLIBRARIES = libsscm.la
+SCRIPT_DIR = ./script
+
FUNC_TABLES = \
- sigschemefunctable-r5rs-syntax.c \
- sigschemefunctable-r5rs-procedure.c \
- sigschemefunctable-r5rs-deepcadrs.c \
- sigschemefunctable-error.c \
- sigschemefunctable-nonstd.c \
- sigschemefunctable-siod.c \
- sigschemefunctable-srfi1.c \
- sigschemefunctable-srfi2.c \
- sigschemefunctable-srfi6.c \
- sigschemefunctable-srfi8.c \
- sigschemefunctable-srfi23.c \
- sigschemefunctable-srfi34.c \
- sigschemefunctable-srfi38.c \
- sigschemefunctable-srfi60.c
+ functable-r5rs-syntax.c \
+ functable-r5rs-procedure.c \
+ functable-r5rs-deepcadrs.c \
+ functable-error.c \
+ functable-nonstd.c \
+ functable-siod.c \
+ functable-srfi1.c \
+ functable-srfi2.c \
+ functable-srfi6.c \
+ functable-srfi8.c \
+ functable-srfi23.c \
+ functable-srfi34.c \
+ functable-srfi38.c \
+ functable-srfi60.c
-BUILD_FUNCTBL = ./script/build_func_table.rb
-BUILD_FUNCTBL_SOURCES = \
- $(BUILD_FUNCTBL) \
- ./script/scm_decl.rb
- ./script/functable-header.txt \
- ./script/functable-footer.txt
+BUILD_FUNCTBL = $(SCRIPT_DIR)/build_func_table.rb
+BUILD_FUNCTBL_DEPS = \
+ $(BUILD_FUNCTBL) \
+ $(SCRIPT_DIR)/scm_decl.rb \
+ $(SCRIPT_DIR)/functable-header.txt \
+ $(SCRIPT_DIR)/functable-footer.txt
# FIXME: separate non-core R5RS features
R5RS_PROC_SRCS = sigscheme.c procedure.c eval.c list.c number.c string.c \
@@ -30,38 +32,37 @@
.PHONY: func-tables
func-tables: $(FUNC_TABLES)
-sigschemefunctable-r5rs-syntax.c: syntax.c module.c $(BUILD_FUNCTBL_SOURCES)
+functable-r5rs-syntax.c: syntax.c module.c $(BUILD_FUNCTBL_DEPS)
$(BUILD_FUNCTBL) $@ "scm_r5rs_syntax_func_info_table" syntax.c module.c
-sigschemefunctable-r5rs-procedure.c: $(R5RS_PROC_SRCS) $(BUILD_FUNCTBL_SOURCES)
+functable-r5rs-procedure.c: $(R5RS_PROC_SRCS) $(BUILD_FUNCTBL_DEPS)
$(BUILD_FUNCTBL) $@ "scm_r5rs_procedure_func_info_table" \
$(R5RS_PROC_SRCS)
-sigschemefunctable-r5rs-deepcadrs.c: module-r5rs-deepcadrs.c $(BUILD_FUNCTBL_SOURCES)
+functable-r5rs-deepcadrs.c: module-r5rs-deepcadrs.c $(BUILD_FUNCTBL_DEPS)
$(BUILD_FUNCTBL) $@ "scm_r5rs_deepcadrs_func_info_table" $<
-sigschemefunctable-error.c: error.c $(BUILD_FUNCTBL_SOURCES)
+functable-error.c: error.c $(BUILD_FUNCTBL_DEPS)
$(BUILD_FUNCTBL) $@ "scm_error_func_info_table" $<
-sigschemefunctable-nonstd.c: module-nonstd.c $(BUILD_FUNCTBL_SOURCES)
+functable-nonstd.c: module-nonstd.c $(BUILD_FUNCTBL_DEPS)
$(BUILD_FUNCTBL) $@ "scm_nonstd_func_info_table" $<
-sigschemefunctable-srfi1.c: module-srfi1.c $(BUILD_FUNCTBL_SOURCES)
+functable-srfi1.c: module-srfi1.c $(BUILD_FUNCTBL_DEPS)
$(BUILD_FUNCTBL) $@ "scm_srfi1_func_info_table" $<
-sigschemefunctable-srfi2.c: module-srfi2.c $(BUILD_FUNCTBL_SOURCES)
+functable-srfi2.c: module-srfi2.c $(BUILD_FUNCTBL_DEPS)
$(BUILD_FUNCTBL) $@ "scm_srfi2_func_info_table" $<
-sigschemefunctable-srfi6.c: module-srfi6.c $(BUILD_FUNCTBL_SOURCES)
+functable-srfi6.c: module-srfi6.c $(BUILD_FUNCTBL_DEPS)
$(BUILD_FUNCTBL) $@ "scm_srfi6_func_info_table" $<
-sigschemefunctable-srfi8.c: module-srfi8.c $(BUILD_FUNCTBL_SOURCES)
+functable-srfi8.c: module-srfi8.c $(BUILD_FUNCTBL_DEPS)
$(BUILD_FUNCTBL) $@ "scm_srfi8_func_info_table" $<
-sigschemefunctable-srfi23.c: module-srfi23.c $(BUILD_FUNCTBL_SOURCES)
+functable-srfi23.c: module-srfi23.c $(BUILD_FUNCTBL_DEPS)
$(BUILD_FUNCTBL) $@ "scm_srfi23_func_info_table" $<
-sigschemefunctable-srfi34.c: module-srfi34.c $(BUILD_FUNCTBL_SOURCES)
+functable-srfi34.c: module-srfi34.c $(BUILD_FUNCTBL_DEPS)
$(BUILD_FUNCTBL) $@ "scm_srfi34_func_info_table" $<
-sigschemefunctable-srfi38.c: module-srfi38.c $(BUILD_FUNCTBL_SOURCES)
+functable-srfi38.c: module-srfi38.c $(BUILD_FUNCTBL_DEPS)
$(BUILD_FUNCTBL) $@ "scm_srfi38_func_info_table" $<
-sigschemefunctable-srfi60.c: module-srfi60.c $(BUILD_FUNCTBL_SOURCES)
+functable-srfi60.c: module-srfi60.c $(BUILD_FUNCTBL_DEPS)
$(BUILD_FUNCTBL) $@ "scm_srfi60_func_info_table" $<
-sigschemefunctable-siod.c: module-siod.c $(BUILD_FUNCTBL_SOURCES)
+functable-siod.c: module-siod.c $(BUILD_FUNCTBL_DEPS)
$(BUILD_FUNCTBL) $@ "scm_siod_func_info_table" $<
-EXTRA_DIST = $(FUNC_TABLES) $(BUILD_FUNCTBL_SOURCES) \
- test-compact.c
+EXTRA_DIST = $(FUNC_TABLES) $(BUILD_FUNCTBL_DEPS) test-compact.c
# Only works on 'make all', 'make check' and 'make install'.
# See "Built sources" section of automake info.
Modified: branches/r5rs/sigscheme/src/error.c
===================================================================
--- branches/r5rs/sigscheme/src/error.c 2006-02-02 04:59:55 UTC (rev 3066)
+++ branches/r5rs/sigscheme/src/error.c 2006-02-02 05:26:08 UTC (rev 3067)
@@ -61,7 +61,7 @@
/*=======================================
Variable Declarations
=======================================*/
-#include "sigschemefunctable-error.c"
+#include "functable-error.c"
#if (!HAVE_C99_VARIADIC_MACRO && !HAVE_GNU_VARIADIC_MACRO)
const char *scm_err_funcname;
Modified: branches/r5rs/sigscheme/src/module-nonstd.c
===================================================================
--- branches/r5rs/sigscheme/src/module-nonstd.c 2006-02-02 04:59:55 UTC (rev 3066)
+++ branches/r5rs/sigscheme/src/module-nonstd.c 2006-02-02 05:26:08 UTC (rev 3067)
@@ -58,7 +58,7 @@
/*=======================================
Variable Declarations
=======================================*/
-#include "sigschemefunctable-nonstd.c"
+#include "functable-nonstd.c"
/* io.c */
extern const char *scm_lib_path;
Modified: branches/r5rs/sigscheme/src/module-siod.c
===================================================================
--- branches/r5rs/sigscheme/src/module-siod.c 2006-02-02 04:59:55 UTC (rev 3066)
+++ branches/r5rs/sigscheme/src/module-siod.c 2006-02-02 05:26:08 UTC (rev 3067)
@@ -76,7 +76,7 @@
/*=======================================
Variable Declarations
=======================================*/
-#include "sigschemefunctable-siod.c"
+#include "functable-siod.c"
static const int sscm_debug_mask_tbl[] = {
SCM_DBG_SIOD_V0,
Modified: branches/r5rs/sigscheme/src/module-srfi1.c
===================================================================
--- branches/r5rs/sigscheme/src/module-srfi1.c 2006-02-02 04:59:55 UTC (rev 3066)
+++ branches/r5rs/sigscheme/src/module-srfi1.c 2006-02-02 05:26:08 UTC (rev 3067)
@@ -60,7 +60,7 @@
/*=======================================
Variable Declarations
=======================================*/
-#include "sigschemefunctable-srfi1.c"
+#include "functable-srfi1.c"
/*=======================================
File Local Function Declarations
Modified: branches/r5rs/sigscheme/src/module-srfi2.c
===================================================================
--- branches/r5rs/sigscheme/src/module-srfi2.c 2006-02-02 04:59:55 UTC (rev 3066)
+++ branches/r5rs/sigscheme/src/module-srfi2.c 2006-02-02 05:26:08 UTC (rev 3067)
@@ -56,7 +56,7 @@
/*=======================================
Variable Declarations
=======================================*/
-#include "sigschemefunctable-srfi2.c"
+#include "functable-srfi2.c"
/*=======================================
File Local Function Declarations
Modified: branches/r5rs/sigscheme/src/module-srfi23.c
===================================================================
--- branches/r5rs/sigscheme/src/module-srfi23.c 2006-02-02 04:59:55 UTC (rev 3066)
+++ branches/r5rs/sigscheme/src/module-srfi23.c 2006-02-02 05:26:08 UTC (rev 3067)
@@ -55,7 +55,7 @@
/*=======================================
Variable Declarations
=======================================*/
-#include "sigschemefunctable-srfi23.c"
+#include "functable-srfi23.c"
/*=======================================
File Local Function Declarations
Modified: branches/r5rs/sigscheme/src/module-srfi34.c
===================================================================
--- branches/r5rs/sigscheme/src/module-srfi34.c 2006-02-02 04:59:55 UTC (rev 3066)
+++ branches/r5rs/sigscheme/src/module-srfi34.c 2006-02-02 05:26:08 UTC (rev 3067)
@@ -73,7 +73,7 @@
/*=======================================
Variable Declarations
=======================================*/
-#include "sigschemefunctable-srfi34.c"
+#include "functable-srfi34.c"
static ScmObj current_exception_handlers;
Modified: branches/r5rs/sigscheme/src/module-srfi38.c
===================================================================
--- branches/r5rs/sigscheme/src/module-srfi38.c 2006-02-02 04:59:55 UTC (rev 3066)
+++ branches/r5rs/sigscheme/src/module-srfi38.c 2006-02-02 05:26:08 UTC (rev 3067)
@@ -57,7 +57,7 @@
/*=======================================
Variable Declarations
=======================================*/
-#include "sigschemefunctable-srfi38.c"
+#include "functable-srfi38.c"
/*=======================================
File Local Function Declarations
Modified: branches/r5rs/sigscheme/src/module-srfi6.c
===================================================================
--- branches/r5rs/sigscheme/src/module-srfi6.c 2006-02-02 04:59:55 UTC (rev 3066)
+++ branches/r5rs/sigscheme/src/module-srfi6.c 2006-02-02 05:26:08 UTC (rev 3067)
@@ -59,7 +59,7 @@
/*=======================================
Variable Declarations
=======================================*/
-#include "sigschemefunctable-srfi6.c"
+#include "functable-srfi6.c"
/*=======================================
File Local Function Declarations
Modified: branches/r5rs/sigscheme/src/module-srfi60.c
===================================================================
--- branches/r5rs/sigscheme/src/module-srfi60.c 2006-02-02 04:59:55 UTC (rev 3066)
+++ branches/r5rs/sigscheme/src/module-srfi60.c 2006-02-02 05:26:08 UTC (rev 3067)
@@ -77,7 +77,7 @@
/*=======================================
Variable Declarations
=======================================*/
-#include "sigschemefunctable-srfi60.c"
+#include "functable-srfi60.c"
/*=======================================
File Local Function Declarations
Modified: branches/r5rs/sigscheme/src/module-srfi8.c
===================================================================
--- branches/r5rs/sigscheme/src/module-srfi8.c 2006-02-02 04:59:55 UTC (rev 3066)
+++ branches/r5rs/sigscheme/src/module-srfi8.c 2006-02-02 05:26:08 UTC (rev 3067)
@@ -55,7 +55,7 @@
/*=======================================
Variable Declarations
=======================================*/
-#include "sigschemefunctable-srfi8.c"
+#include "functable-srfi8.c"
/*=======================================
File Local Function Declarations
Modified: branches/r5rs/sigscheme/src/script/functable-header.txt
===================================================================
--- branches/r5rs/sigscheme/src/script/functable-header.txt 2006-02-02 04:59:55 UTC (rev 3066)
+++ branches/r5rs/sigscheme/src/script/functable-header.txt 2006-02-02 05:26:08 UTC (rev 3067)
@@ -33,22 +33,3 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===========================================================================*/
-/*=======================================
- System Include
-=======================================*/
-
-/*=======================================
- Local Include
-=======================================*/
-
-/*=======================================
- Macro Definitions
-=======================================*/
-
-/*=======================================
- Type Definitions
-=======================================*/
-
-/*=======================================
- Builtin Function Tables
-=======================================*/
Modified: branches/r5rs/sigscheme/src/sigscheme.c
===================================================================
--- branches/r5rs/sigscheme/src/sigscheme.c 2006-02-02 04:59:55 UTC (rev 3066)
+++ branches/r5rs/sigscheme/src/sigscheme.c 2006-02-02 05:26:08 UTC (rev 3067)
@@ -61,9 +61,9 @@
/*=======================================
Variable Declarations
=======================================*/
-#include "sigschemefunctable-r5rs-procedure.c"
+#include "functable-r5rs-procedure.c"
#if SCM_USE_DEEP_CADRS
-#include "sigschemefunctable-r5rs-deepcadrs.c"
+#include "functable-r5rs-deepcadrs.c"
#endif
static scm_bool scm_initialized;
Modified: branches/r5rs/sigscheme/src/syntax.c
===================================================================
--- branches/r5rs/sigscheme/src/syntax.c 2006-02-02 04:59:55 UTC (rev 3066)
+++ branches/r5rs/sigscheme/src/syntax.c 2006-02-02 05:26:08 UTC (rev 3067)
@@ -57,7 +57,7 @@
/*=======================================
Variable Declarations
=======================================*/
-#include "sigschemefunctable-r5rs-syntax.c"
+#include "functable-r5rs-syntax.c"
ScmObj scm_sym_quote, scm_sym_quasiquote;
ScmObj scm_sym_unquote, scm_sym_unquote_splicing;
More information about the uim-commit
mailing list