# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1202613640 0
# Node ID 23bd9edca21f03485c598ae67a316bb4445082e7
# Parent  5bb2c18b80343af81820baba47a5ecee2bd758ab
(ASET): Check bounds.

diff -r 5bb2c18b8034 -r 23bd9edca21f src/ChangeLog
--- a/src/ChangeLog	Sun Feb 10 03:16:06 2008 +0000
+++ b/src/ChangeLog	Sun Feb 10 03:20:40 2008 +0000
@@ -1,3 +1,7 @@
+2008-02-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp.h (ASET): Check bounds.
+
 2008-02-10  Glenn Morris  <rgm@gnu.org>
 
 	* buffer.c (mode-name): Doc fix.
diff -r 5bb2c18b8034 -r 23bd9edca21f src/lisp.h
--- a/src/lisp.h	Sun Feb 10 03:16:06 2008 +0000
+++ b/src/lisp.h	Sun Feb 10 03:20:40 2008 +0000
@@ -589,8 +589,12 @@
 /* Convenience macros for dealing with Lisp arrays.  */
 
 #define AREF(ARRAY, IDX)	XVECTOR ((ARRAY))->contents[IDX]
-#define ASET(ARRAY, IDX, VAL)	(AREF ((ARRAY), (IDX)) = (VAL))
 #define ASIZE(ARRAY)		XVECTOR ((ARRAY))->size
+/* The IDX==IDX tries to detect when the macro argument is side-effecting.  */
+#define ASET(ARRAY, IDX, VAL)	\
+  (eassert ((IDX) == (IDX)),				\
+   eassert ((IDX) >= 0 && (IDX) < ASIZE (ARRAY)),	\
+   ASLOT ((ARRAY), (IDX)) = (VAL))
 
 /* Convenience macros for dealing with Lisp strings.  */