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

[kzk at freedesktop.org]

Author: kzk
Date: 2005-09-28 10:01:13 -0700 (Wed, 28 Sep 2005)
New Revision: 1673

Modified:
   branches/r5rs/sigscheme/operations-siod.c
   branches/r5rs/sigscheme/sigscheme.c
   branches/r5rs/sigscheme/sigscheme.h
Log:
* simplify "the-environment" and "verbose" with new FUNCTYPE scheme

* sigscheme/sigscheme.h
* sigscheme/operations-siod.c
  - (ScmOp_the_environment,
     ScmOp_verbose): change args
* sigscheme/sigscheme.c
  - (SigScm_Initialize_internal)
    - "the-environment": export by Scm_RegisterProcedureFixedTailRec0
    - "verbose": export by Scm_RegisterProcedureVariadic0



Modified: branches/r5rs/sigscheme/operations-siod.c
===================================================================
--- branches/r5rs/sigscheme/operations-siod.c	2005-09-28 16:49:48 UTC (rev 1672)
+++ branches/r5rs/sigscheme/operations-siod.c	2005-09-28 17:01:13 UTC (rev 1673)
@@ -142,9 +142,11 @@
     return SCM_FALSE;
 }
 
-ScmObj ScmOp_the_environment(ScmObj arg, ScmObj env)
+ScmObj ScmOp_the_environment(ScmEvalState *eval_state)
 {
-    return env;
+    eval_state->ret_type = SCM_RETTYPE_AS_IS;
+
+    return eval_state->env;
 }
 
 ScmObj ScmOp_closure_code(ScmObj closure)
@@ -164,7 +166,7 @@
     return CONS(CAR(exp), body);
 }
 
-ScmObj ScmOp_verbose(ScmObj args, ScmObj env)
+ScmObj ScmOp_verbose(ScmObj args)
 {
     if (!NULLP(args)) {
         if (!INTP(CAR(args)))

Modified: branches/r5rs/sigscheme/sigscheme.c
===================================================================
--- branches/r5rs/sigscheme/sigscheme.c	2005-09-28 16:49:48 UTC (rev 1672)
+++ branches/r5rs/sigscheme/sigscheme.c	2005-09-28 17:01:13 UTC (rev 1673)
@@ -439,9 +439,9 @@
     Scm_DefineAlias("bit-or"                , "logior");
     Scm_DefineAlias("bit-xor"               , "logxor");
     Scm_DefineAlias("bit-not"               , "lognot");
-    Scm_RegisterFuncEvaledList("the-environment" , ScmOp_the_environment);
-    Scm_RegisterFunc1("%%closure-code"           , ScmOp_closure_code);
-    Scm_RegisterFuncEvaledList("verbose"         , ScmOp_verbose);
+    Scm_RegisterProcedureFixedTailRec0("the-environment" , ScmOp_the_environment);
+    Scm_RegisterFunc1("%%closure-code"       , ScmOp_closure_code);
+    Scm_RegisterProcedureVariadic0("verbose" , ScmOp_verbose);
     /* datas.c */
     scm_return_value = SCM_NULL;
     SigScm_SetVerboseLevel(2);

Modified: branches/r5rs/sigscheme/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/sigscheme.h	2005-09-28 16:49:48 UTC (rev 1672)
+++ branches/r5rs/sigscheme/sigscheme.h	2005-09-28 17:01:13 UTC (rev 1673)
@@ -663,9 +663,9 @@
 ScmObj ScmOp_symbol_value(ScmObj var);
 ScmObj ScmOp_set_symbol_value(ScmObj var, ScmObj val);
 ScmObj ScmOp_siod_eql(ScmObj obj1, ScmObj obj2);
-ScmObj ScmOp_the_environment(ScmObj arg, ScmObj env);
+ScmObj ScmOp_the_environment(ScmEvalState *eval_state);
 ScmObj ScmOp_closure_code(ScmObj closure);
-ScmObj ScmOp_verbose(ScmObj args, ScmObj env);
+ScmObj ScmOp_verbose(ScmObj args);
 long   SigScm_GetVerboseLevel(void);
 void   SigScm_SetVerboseLevel(long level);
 #endif