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

[kzk at freedesktop.org]

Author: kzk
Date: 2005-11-01 12:04:46 -0800 (Tue, 01 Nov 2005)
New Revision: 1938

Modified:
   branches/r5rs/sigscheme/eval.c
   branches/r5rs/sigscheme/sigscheme.c
Log:
* fix to build issue wrongly committed in r1937
* use ASSERT_*P

* sigscheme/sigscheme.c
  - (SigScm_Initialize_internal): change ScmExp_quote from ScmOp_quote
* sigscheme/eval.c
  - (ScmExp_quasiquote): restore "ret" variable
  - (ScmOp_scheme_report_environment):
    - use ASSERT_INTP instead of !INTP
  - (ScmOp_null_environment):
    - use ASSERT_INTP instead of !INTP



Modified: branches/r5rs/sigscheme/eval.c
===================================================================
--- branches/r5rs/sigscheme/eval.c	2005-11-01 19:56:52 UTC (rev 1937)
+++ branches/r5rs/sigscheme/eval.c	2005-11-01 20:04:46 UTC (rev 1938)
@@ -1383,9 +1383,10 @@
 ===========================================================================*/
 ScmObj ScmExp_quasiquote(ScmObj datum, ScmObj env)
 {
+    ScmObj ret = qquote_internal(datum, env, 1);
     DECLARE_FUNCTION("quasiquote", SyntaxFixed1);
 
-    if (QQUOTE_IS_VERBATIM(qquote_internal(datum, env, 1)))
+    if (QQUOTE_IS_VERBATIM(ret))
         return datum;
     return ret;
 }
@@ -1478,8 +1479,7 @@
     DECLARE_FUNCTION("scheme-report-environment", ProcedureFixed1);
 
     /* sanity check */
-    if (!INTP(version))
-        SigScm_ErrorObj("scheme-report-environment : int required but got ", version);
+    ASSERT_INTP(version);
     if (SCM_INT_VALUE(version) != 5)
         SigScm_ErrorObj("scheme-report-environment : version must be 5 but got ", version);
 
@@ -1498,8 +1498,7 @@
     DECLARE_FUNCTION("null-environment", ProcedureFixed1);
 
     /* sanity check */
-    if (!INTP(version))
-        SigScm_ErrorObj("null-environment : int required but got ", version);
+    ASSERT_INTP(version);
     if (SCM_INT_VALUE(version) != 5)
         SigScm_ErrorObj("null-environment : version must be 5 but got ", version);
 

Modified: branches/r5rs/sigscheme/sigscheme.c
===================================================================
--- branches/r5rs/sigscheme/sigscheme.c	2005-11-01 19:56:52 UTC (rev 1937)
+++ branches/r5rs/sigscheme/sigscheme.c	2005-11-01 20:04:46 UTC (rev 1938)
@@ -185,7 +185,7 @@
     /* eval.c */
     Scm_RegisterProcedureFixed2("eval"                     , ScmOp_eval);
     Scm_RegisterProcedureVariadicTailRec2("apply"           , ScmOp_apply);
-    Scm_RegisterSyntaxFixed1("quote"                 , ScmOp_quote);
+    Scm_RegisterSyntaxFixed1("quote"                 , ScmExp_quote);
     Scm_RegisterSyntaxVariadic2("lambda"             , ScmExp_lambda);
     Scm_RegisterSyntaxFixed2("set!"                  , ScmExp_setd);
     Scm_RegisterSyntaxFixed1("delay"                 , ScmExp_delay);