[uim-commit] r1811 - branches/r5rs/sigscheme

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-10-04 15:35:21 -0700 (Tue, 04 Oct 2005)
New Revision: 1811

Modified:
   branches/r5rs/sigscheme/sigscheme.c
Log:
* sigscheme/sigscheme.c
  - (SigScm_Initialize_internal):
    * Remove obsolete and unnecessary codes
    * Add some FIXME comments


Modified: branches/r5rs/sigscheme/sigscheme.c
===================================================================
--- branches/r5rs/sigscheme/sigscheme.c	2005-10-04 22:24:03 UTC (rev 1810)
+++ branches/r5rs/sigscheme/sigscheme.c	2005-10-04 22:35:21 UTC (rev 1811)
@@ -147,26 +147,18 @@
     SigScm_quasiquote       = Scm_Intern("quasiquote");
     SigScm_unquote          = Scm_Intern("unquote");
     SigScm_unquote_splicing = Scm_Intern("unquote-splicing");
-#if SCM_USE_NONSTD_FEATURES
-    SigScm_features         = Scm_Intern("*features*");
-    SCM_SYMBOL_SET_VCELL(SigScm_features, SCM_NULL);
-#endif
-
 #if 0
-    /* FIXME: really required? */
-    SCM_SYMBOL_SET_VCELL(Scm_Intern("#t"),   SCM_TRUE);
-    SCM_SYMBOL_SET_VCELL(Scm_Intern("#f"),   SCM_FALSE);
-#endif
-#if 1
-    /* FIXME: don't set SCM_TRUE and rely on the value */
+    /* FIXME: Rewrite ScmExp_cond() and ScmExp_case(), and enable this */
+    SigScm_else             = Scm_Intern("else");
+    SigScm_foo              = Scm_Intern("=>");
+#else
+    /* FIXME: obsolete this. don't set SCM_TRUE and rely on the value */
     SCM_SYMBOL_SET_VCELL(Scm_Intern("else"), SCM_TRUE);
     SCM_SYMBOL_SET_VCELL(Scm_Intern("=>"),   SCM_TRUE);
-#else
-    SigScm_foo              = Scm_Intern("=>");
-    SigScm_else             = Scm_Intern("else");
 #endif
 
 #if SCM_USE_VALUECONS
+    /* FIXME: hide into datas.c */
     /*
      * To keep storage model abstract, the cell is allocated from a heap
      * instead of directly construct ScmCell
@@ -176,6 +168,11 @@
     SigScm_GC_Protect(&SigScm_null_values);
 #endif
 
+#if SCM_USE_NONSTD_FEATURES
+    SigScm_features         = Scm_Intern("*features*");
+    SCM_SYMBOL_SET_VCELL(SigScm_features, SCM_NULL);
+#endif
+
     /*=======================================================================
       Preallocated Ports
     =======================================================================*/
@@ -379,18 +376,6 @@
     Scm_DefineAlias("call/cc", "call-with-current-continuation");
 #endif
 
-#if 0
-    /* enable all features as backward compatibility */
-    ScmExp_use(Scm_Intern("srfi-1"), SCM_INTERACTION_ENV);
-    ScmExp_use(Scm_Intern("srfi-2"), SCM_INTERACTION_ENV);
-    ScmExp_use(Scm_Intern("srfi-8"), SCM_INTERACTION_ENV);
-    ScmExp_use(Scm_Intern("srfi-23"), SCM_INTERACTION_ENV);
-    ScmExp_use(Scm_Intern("srfi-34"), SCM_INTERACTION_ENV);
-    ScmExp_use(Scm_Intern("srfi-38"), SCM_INTERACTION_ENV);
-    ScmExp_use(Scm_Intern("srfi-60"), SCM_INTERACTION_ENV);
-    ScmExp_use(Scm_Intern("siod"), SCM_INTERACTION_ENV);
-#endif
-
 #if SCM_EXCEPTION_HANDLING
     ScmExp_use(Scm_Intern("srfi-34"), SCM_INTERACTION_ENV);
 #endif