[uim-commit] r3068 - branches/r5rs/sigscheme/src

[yamaken at freedesktop.org]

Author: yamaken
Date: 2006-02-01 22:33:28 -0800 (Wed, 01 Feb 2006)
New Revision: 3068

Modified:
   branches/r5rs/sigscheme/src/Makefile.am
   branches/r5rs/sigscheme/src/error.c
   branches/r5rs/sigscheme/src/sigscheme.c
Log:
* sigscheme/src/Makefile.am
  - Generate functable-sscm-core.c
  - Remove functable-error.c
  - Move module.c to functable-sscm-core.c from functable-r5rs-syntax.c
  - (FUNC_TABLES):
    * Remove functable-error.c
    * Add functable-sscm-core.c
  - (SSCM_PROC_SRCS): New variable
  - (R5RS_PROC_SRCS):
    * Remove obsolete sigscheme.c
    * Make contitional features optional
* sigscheme/src/sigscheme.c
  - Include functable-sscm-core.c
  - (scm_initialize_internal): Register SigScheme-specific core
    syntaxes and procedures
* sigscheme/src/error.c
  - Follow the changes


Modified: branches/r5rs/sigscheme/src/Makefile.am
===================================================================
--- branches/r5rs/sigscheme/src/Makefile.am	2006-02-02 05:26:08 UTC (rev 3067)
+++ branches/r5rs/sigscheme/src/Makefile.am	2006-02-02 06:33:28 UTC (rev 3068)
@@ -2,12 +2,18 @@
 lib_LTLIBRARIES = libsscm.la
 
 SCRIPT_DIR = ./script
+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
 
 FUNC_TABLES = \
+        functable-sscm-core.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 \
@@ -19,28 +25,41 @@
         functable-srfi38.c \
         functable-srfi60.c
 
-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
+SSCM_PROC_SRCS = error.c module.c
+R5RS_PROC_SRCS = eval.c procedure.c list.c
+if USE_NUMBER
+  R5RS_PROC_SRCS += number.c
+endif
+if USE_STRING
+  R5RS_PROC_SRCS += string.c
+endif
+if USE_VECTOR
+  R5RS_PROC_SRCS += vector.c
+endif
+if USE_PORT
+  R5RS_PROC_SRCS += port.c
+endif
+if USE_READER
+  R5RS_PROC_SRCS += read.c
+endif
+if USE_WRITER
+  R5RS_PROC_SRCS += write.c
+endif
+if USE_LOAD
+  R5RS_PROC_SRCS += load.c
+endif
 
-# FIXME: separate non-core R5RS features
-R5RS_PROC_SRCS = sigscheme.c procedure.c eval.c list.c number.c string.c \
-                 vector.c port.c read.c write.c load.c
-
 .PHONY: func-tables
 func-tables: $(FUNC_TABLES)
-functable-r5rs-syntax.c: syntax.c module.c $(BUILD_FUNCTBL_DEPS)
-	$(BUILD_FUNCTBL) $@ "scm_r5rs_syntax_func_info_table" syntax.c module.c
+functable-sscm-core.c: $(SSCM_PROC_SRCS) $(BUILD_FUNCTBL_DEPS)
+	$(BUILD_FUNCTBL) $@ "scm_sscm_core_func_info_table" $(SSCM_PROC_SRCS)
+functable-r5rs-syntax.c: syntax.c $(BUILD_FUNCTBL_DEPS)
+	$(BUILD_FUNCTBL) $@ "scm_r5rs_syntax_func_info_table" syntax.c
 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-error.c: error.c $(BUILD_FUNCTBL_DEPS)
-	$(BUILD_FUNCTBL) $@ "scm_error_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)

Modified: branches/r5rs/sigscheme/src/error.c
===================================================================
--- branches/r5rs/sigscheme/src/error.c	2006-02-02 05:26:08 UTC (rev 3067)
+++ branches/r5rs/sigscheme/src/error.c	2006-02-02 06:33:28 UTC (rev 3068)
@@ -61,8 +61,6 @@
 /*=======================================
   Variable Declarations
 =======================================*/
-#include "functable-error.c"
-
 #if (!HAVE_C99_VARIADIC_MACRO && !HAVE_GNU_VARIADIC_MACRO)
 const char *scm_err_funcname;
 #endif
@@ -101,8 +99,6 @@
 #if (!HAVE_C99_VARIADIC_MACRO && !HAVE_GNU_VARIADIC_MACRO)
     scm_err_funcname = NULL;
 #endif
-
-    scm_register_funcs(scm_error_func_info_table);
 }
 
 int

Modified: branches/r5rs/sigscheme/src/sigscheme.c
===================================================================
--- branches/r5rs/sigscheme/src/sigscheme.c	2006-02-02 05:26:08 UTC (rev 3067)
+++ branches/r5rs/sigscheme/src/sigscheme.c	2006-02-02 06:33:28 UTC (rev 3068)
@@ -61,6 +61,7 @@
 /*=======================================
   Variable Declarations
 =======================================*/
+#include "functable-sscm-core.c"
 #include "functable-r5rs-procedure.c"
 #if SCM_USE_DEEP_CADRS
 #include "functable-r5rs-deepcadrs.c"
@@ -122,6 +123,9 @@
     /*=======================================================================
       Register Built-in Functions
     =======================================================================*/
+    /* SigScheme-specific core syntaxes and procedures */
+    scm_register_funcs(scm_sscm_core_func_info_table);
+
     /* R5RS Syntaxes */
     scm_init_syntax();