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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-09-30 08:11:00 -0700 (Fri, 30 Sep 2005)
New Revision: 1699

Modified:
   branches/r5rs/sigscheme/eval.c
   branches/r5rs/sigscheme/sigscheme.c
   branches/r5rs/sigscheme/sigscheme.h
Log:
* r5rs/sigscheme/sigscheme.c
* r5rs/sigscheme/sigscheme.h
* r5rs/sigscheme/eval.c
  - Revert r1698 which is my misunderstanding about the syntax
    evaluation scheme


Modified: branches/r5rs/sigscheme/eval.c
===================================================================
--- branches/r5rs/sigscheme/eval.c	2005-09-30 15:05:27 UTC (rev 1698)
+++ branches/r5rs/sigscheme/eval.c	2005-09-30 15:11:00 UTC (rev 1699)
@@ -820,12 +820,12 @@
 /*===========================================================================
   R5RS : 4.1 Primitive expression types : 4.1.4 Procedures
 ===========================================================================*/
-ScmObj ScmExp_lambda(ScmObj args , ScmEvalState *eval_state)
+ScmObj ScmExp_lambda(ScmObj args, ScmObj env)
 {
     if (CHECK_2_ARGS(args))
         SigScm_ErrorObj("lambda : bad form : ", args);
 
-    return Scm_NewClosure(args, eval_state->env);
+    return Scm_NewClosure(args, env);
 }
 
 /*===========================================================================

Modified: branches/r5rs/sigscheme/sigscheme.c
===================================================================
--- branches/r5rs/sigscheme/sigscheme.c	2005-09-30 15:05:27 UTC (rev 1698)
+++ branches/r5rs/sigscheme/sigscheme.c	2005-09-30 15:11:00 UTC (rev 1699)
@@ -157,7 +157,7 @@
     Scm_RegisterProcedureFixed2("eval"                     , ScmOp_eval);
     Scm_RegisterProcedureVariadicTailRec2("apply"           , ScmOp_apply);
     Scm_RegisterSyntaxFixed1("quote"              , ScmOp_quote);
-    Scm_RegisterSyntaxFixedTailRec1("lambda"      , ScmExp_lambda);
+    Scm_RegisterSyntaxVariadic0("lambda"             , ScmExp_lambda);
     Scm_RegisterSyntaxFixed2("set!"               , ScmExp_set);
     Scm_RegisterSyntaxFixed1("delay"              , ScmOp_delay);
     Scm_RegisterSyntaxFixed1("quasiquote"         , ScmOp_quasiquote);

Modified: branches/r5rs/sigscheme/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/sigscheme.h	2005-09-30 15:05:27 UTC (rev 1698)
+++ branches/r5rs/sigscheme/sigscheme.h	2005-09-30 15:11:00 UTC (rev 1699)
@@ -364,7 +364,7 @@
 ScmObj ScmOp_eval(ScmObj obj, ScmObj env);
 ScmObj ScmOp_apply(ScmObj proc, ScmObj arg0, ScmObj rest, ScmEvalState *eval_state);
 ScmObj ScmOp_quote(ScmObj datum, ScmObj env);
-ScmObj ScmExp_lambda(ScmObj args, ScmEvalState *eval_state);
+ScmObj ScmExp_lambda(ScmObj args, ScmObj env);
 ScmObj ScmExp_if(ScmObj test, ScmObj conseq, ScmObj rest, ScmEvalState *eval_state);
 ScmObj ScmExp_set(ScmObj var, ScmObj val, ScmObj env);
 ScmObj ScmExp_cond(ScmObj args, ScmEvalState *eval_state);