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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-10-03 15:33:22 -0700 (Mon, 03 Oct 2005)
New Revision: 1784

Modified:
   branches/r5rs/sigscheme/main.c
   branches/r5rs/sigscheme/sigscheme.c
Log:
* sigscheme/sigscheme.c
  - (ScmExp_use): Follow the specification change of 'provide' and
    'provided?'
* sigscheme/main.c
  - (repl): Ditto


Modified: branches/r5rs/sigscheme/main.c
===================================================================
--- branches/r5rs/sigscheme/main.c	2005-10-03 22:25:25 UTC (rev 1783)
+++ branches/r5rs/sigscheme/main.c	2005-10-03 22:33:22 UTC (rev 1784)
@@ -71,9 +71,9 @@
     ScmObj s_exp  = SCM_NULL;
     ScmObj result = SCM_NULL;
 #if SCM_COMPAT_SIOD
-    ScmObj siod_sym = SCM_FALSE;
+    ScmObj siod_str = SCM_FALSE;
 
-    siod_sym = Scm_Intern("siod");
+    siod_str = Scm_NewStringCopying("siod");
 #endif
 
 #if !SCM_GCC4_READY_GC
@@ -82,7 +82,7 @@
 #endif
 
 #if SCM_COMPAT_SIOD
-    if (FALSEP(ScmOp_providedp(siod_sym))
+    if (FALSEP(ScmOp_providedp(siod_str))
         || SigScm_GetVerboseLevel() >= 2)
 #endif
         printf("sscm> ");
@@ -90,7 +90,7 @@
     while (s_exp = SigScm_Read(scm_std_input_port), !EOFP(s_exp)) {
         result = EVAL(s_exp, SCM_INTERACTION_ENV);
 #if SCM_COMPAT_SIOD
-        if (FALSEP(ScmOp_providedp(siod_sym))
+        if (FALSEP(ScmOp_providedp(siod_str))
             || SigScm_GetVerboseLevel() >= 1)
 #endif
         {
@@ -103,7 +103,7 @@
         }
 
 #if SCM_COMPAT_SIOD
-        if (FALSEP(ScmOp_providedp(siod_sym))
+        if (FALSEP(ScmOp_providedp(siod_str))
             || SigScm_GetVerboseLevel() >= 2)
 #endif
             printf("sscm> ");

Modified: branches/r5rs/sigscheme/sigscheme.c
===================================================================
--- branches/r5rs/sigscheme/sigscheme.c	2005-10-03 22:25:25 UTC (rev 1783)
+++ branches/r5rs/sigscheme/sigscheme.c	2005-10-03 22:33:22 UTC (rev 1784)
@@ -416,15 +416,17 @@
 ScmObj ScmExp_use(ScmObj feature, ScmObj env)
 {
     struct module_info *mod = NULL;
+    ScmObj feature_str = SCM_FALSE;
     DECLARE_FUNCTION("use", SyntaxFixed1);
 
     ASSERT_SYMBOLP(feature);
 
     for (mod = module_info_table; mod->name; mod++) {
         if (EQ(feature, Scm_Intern(mod->name))) {
-            if (FALSEP(ScmOp_providedp(feature))) {
+            feature_str = ScmOp_symbol2string(feature);
+            if (FALSEP(ScmOp_providedp(feature_str))) {
                 (*mod->initializer)();
-                ScmOp_provide(feature);
+                ScmOp_provide(feature_str);
             }
             return SCM_TRUE;
         }