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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2006-01-02 22:52:00 -0800 (Mon, 02 Jan 2006)
New Revision: 2744

Modified:
   branches/r5rs/sigscheme/TODO
   branches/r5rs/sigscheme/eval.c
   branches/r5rs/sigscheme/sigschemeinternal.h
Log:
* sigscheme/sigschemeinternal.h
  - (ENSURE_NO_MORE_ARG, ENSURE_PROPER_ARG_LIST): Remove the FIXME
    comment. I've checked all ASSERT_*() and no one need to be
    replaced with these
* sigscheme/eval.c
  - (scm_s_define): Remove useless error check. Since it cannot
    prevent that possible SCM_INVALID passing to define_internal() if
    the !LIST_1_P() check does not exist, surely useless
* sigscheme/TODO
  - Update


Modified: branches/r5rs/sigscheme/TODO
===================================================================
--- branches/r5rs/sigscheme/TODO	2006-01-03 06:17:26 UTC (rev 2743)
+++ branches/r5rs/sigscheme/TODO	2006-01-03 06:52:00 UTC (rev 2744)
@@ -93,9 +93,6 @@
 ==============================================================================
 Assigned to YamaKen:
 
-* Separate SCM_ASSERT into required validation (SCM_ENSURE) and optional
-  assertion (SCM_ASSERT)
-
 * [uim] Validate all uim_scm_gc_protect() invocation
 
 * Write tests for SRFI-75

Modified: branches/r5rs/sigscheme/eval.c
===================================================================
--- branches/r5rs/sigscheme/eval.c	2006-01-03 06:17:26 UTC (rev 2743)
+++ branches/r5rs/sigscheme/eval.c	2006-01-03 06:52:00 UTC (rev 2744)
@@ -1622,8 +1622,7 @@
         if (!LIST_1_P(rest))
             ERR_OBJ("exactly 1 arg required but got", rest);
 
-        define_internal(var, POP_ARG(rest), env);
-        ASSERT_NO_MORE_ARG(rest);
+        define_internal(var, CAR(rest), env);
     }
 
     /*========================================================================

Modified: branches/r5rs/sigscheme/sigschemeinternal.h
===================================================================
--- branches/r5rs/sigscheme/sigschemeinternal.h	2006-01-03 06:17:26 UTC (rev 2743)
+++ branches/r5rs/sigscheme/sigschemeinternal.h	2006-01-03 06:52:00 UTC (rev 2744)
@@ -291,8 +291,6 @@
  * prematurely, e.g. if an argument to "and" evaluates to #f.  Both
  * macros expand to no-ops #if !SCM_STRICT_ARGCHECK.
  */
-/* FIXME: replace ASSERT_NO_MORE_ARG() and ASSERT_PROPER_ARG_LIST() with these
-   appropriately */
 #define ENSURE_NO_MORE_ARG(args)                                             \
     (NO_MORE_ARG(args) || (ERR_OBJ("superfluous argument(s)", (args)), 1))
 #define ENSURE_PROPER_ARG_LIST(args)                                         \