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

[kzk at freedesktop.org]

Author: kzk
Date: 2006-01-07 21:14:24 -0800 (Sat, 07 Jan 2006)
New Revision: 2837

Modified:
   branches/r5rs/sigscheme/sigschemeinternal.h
Log:
* sigscheme/sigschemeinternal.h
  - (MUST_POP_ARG): simplify


Modified: branches/r5rs/sigscheme/sigschemeinternal.h
===================================================================
--- branches/r5rs/sigscheme/sigschemeinternal.h	2006-01-07 12:02:34 UTC (rev 2836)
+++ branches/r5rs/sigscheme/sigschemeinternal.h	2006-01-08 05:14:24 UTC (rev 2837)
@@ -304,10 +304,8 @@
     (CONSP((_lst)) ? POP((_lst)) : SCM_INVALID)
 
 /* Like POP(), but signals an error if no argument is available. */
-#define MUST_POP_ARG(args)                                                   \
-     (CONSP(args)                                                            \
-      ? (SCM_MANGLE(tmp) = CAR(args), (args) = CDR(args), SCM_MANGLE(tmp))   \
-      : (ERR("missing argument(s)"), NULL))
+#define MUST_POP_ARG(_lst)                                              \
+    (CONSP(_lst) ? POP(_lst) : (ERR("missing argument(s)"), NULL))
 
 #define FOR_EACH_WHILE(_kar, _lst, _cond)       \
     while ((_cond) && ((_kar) = POP((_lst)), 1))