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

[kzk at freedesktop.org]

Author: kzk
Date: 2005-08-02 07:48:29 -0700 (Tue, 02 Aug 2005)
New Revision: 1104

Modified:
   branches/r5rs/sigscheme/eval.c
Log:
* sigscheme/eval.c 
  - (add_environment): val can be SCM_NIL
  - (ScmOp_eval): fix error function to use
  - (ScmExp_cond): fix error function to use


Modified: branches/r5rs/sigscheme/eval.c
===================================================================
--- branches/r5rs/sigscheme/eval.c	2005-08-02 14:32:26 UTC (rev 1103)
+++ branches/r5rs/sigscheme/eval.c	2005-08-02 14:48:29 UTC (rev 1104)
@@ -113,7 +113,7 @@
     ScmObj new_varlist, new_vallist;
 
     /* sanity check */
-    if (SCM_NULLP(var) && SCM_NULLP(val))
+    if (SCM_NULLP(var))
 	return env;
 
     /* add (var val) pair to the newest frame in env */
@@ -442,7 +442,7 @@
 			return tmp;
                     default:
                         /* What? */
-                        SigScm_Error("eval : What type of function? ", tmp);
+                        SigScm_ErrorObj("eval : What type of function? ", tmp);
                 }
 
             }
@@ -860,7 +860,7 @@
 	    if (SCM_EQ(Scm_Intern("=>"), SCM_CAR(exps))) {
 		proc = ScmOp_eval(SCM_CAR(SCM_CDR(exps)), env);
 		if (EQ(ScmOp_procedurep(proc), SCM_FALSE))
-		    SigScm_Error("cond : the value of exp after => must be the procedure but got ", proc);
+		    SigScm_ErrorObj("cond : the value of exp after => must be the procedure but got ", proc);
 		
 		return ScmOp_apply(Scm_NewCons(proc,
 					       Scm_NewCons(Scm_NewCons(test, SCM_NIL),