emacs: src/lisp.h comparison

comparison src/lisp.h @ 91056:1251cabc40b7

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 890-898) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 122-128) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 257-258) - Merge from emacs--rel--22 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-270

author	Miles Bader <miles@gnu.org>
date	Fri, 19 Oct 2007 00:00:21 +0000
parents	a0e466c4d599 35d2f0abc597
children	5e056bb0109f

comparison

equal deleted inserted replaced

-:46bc3a01b2fa
+:1251cabc40b7
 Lisp_Misc_Intfwd,
 Lisp_Misc_Boolfwd,
 Lisp_Misc_Objfwd,
 Lisp_Misc_Buffer_Objfwd,
 Lisp_Misc_Buffer_Local_Value,
-Lisp_Misc_Some_Buffer_Local_Value,
 Lisp_Misc_Overlay,
 Lisp_Misc_Kboard_Objfwd,
 Lisp_Misc_Save_Value,
 /* Currently floats are not a misc type,
 but let's define this in case we want to change that.  */
 #define XFLOAT(a) (eassert (FLOATP(a)),(struct Lisp_Float *) XPNTR(a))
 /* Misc types.  */
 #define XMISC(a)   ((union Lisp_Misc *) XPNTR(a))
-#define XMISCTYPE(a)   (XMARKER (a)->type)
+#define XMISCANY(a)	(eassert (MISCP (a)), &(XMISC(a)->u_any))
-#define XMARKER(a) (&(XMISC(a)->u_marker))
+#define XMISCTYPE(a)   (XMISCANY (a)->type)
-#define XINTFWD(a) (&(XMISC(a)->u_intfwd))
+#define XMARKER(a)	(eassert (MARKERP (a)), &(XMISC(a)->u_marker))
-#define XBOOLFWD(a) (&(XMISC(a)->u_boolfwd))
+#define XINTFWD(a)	(eassert (INTFWDP (a)), &(XMISC(a)->u_intfwd))
-#define XOBJFWD(a) (&(XMISC(a)->u_objfwd))
+#define XBOOLFWD(a)	(eassert (BOOLFWDP (a)), &(XMISC(a)->u_boolfwd))
-#define XBUFFER_OBJFWD(a) (&(XMISC(a)->u_buffer_objfwd))
+#define XOBJFWD(a)	(eassert (OBJFWDP (a)), &(XMISC(a)->u_objfwd))
-#define XBUFFER_LOCAL_VALUE(a) (&(XMISC(a)->u_buffer_local_value))
+#define XOVERLAY(a)	(eassert (OVERLAYP (a)), &(XMISC(a)->u_overlay))
-#define XOVERLAY(a) (&(XMISC(a)->u_overlay))
+#define XSAVE_VALUE(a)	(eassert (SAVE_VALUEP (a)), &(XMISC(a)->u_save_value))
-#define XKBOARD_OBJFWD(a) (&(XMISC(a)->u_kboard_objfwd))
+#define XBUFFER_OBJFWD(a) \
-#define XSAVE_VALUE(a) (&(XMISC(a)->u_save_value))
+(eassert (BUFFER_OBJFWDP (a)), &(XMISC(a)->u_buffer_objfwd))
+#define XBUFFER_LOCAL_VALUE(a) \
+(eassert (BUFFER_LOCAL_VALUEP (a)), &(XMISC(a)->u_buffer_local_value))
+#define XKBOARD_OBJFWD(a) \
+(eassert (KBOARD_OBJFWDP (a)), &(XMISC(a)->u_kboard_objfwd))
 /* Pseudovector types.  */
 #define XPROCESS(a) (eassert (PROCESSP(a)),(struct Lisp_Process *) XPNTR(a))
 #define XWINDOW(a) (eassert (WINDOWP(a)),(struct window *) XPNTR(a))
 #define DEFAULT_REHASH_SIZE 1.5
 /* These structures are used for various misc types.  */
+struct Lisp_Misc_Any		/* Supertype of all Misc types.  */
+{
+int type : 16;		/* = Lisp_Misc_Marker */
+unsigned gcmarkbit : 1;
+int spacer : 15;
+};
 struct Lisp_Marker
 {
 int type : 16;		/* = Lisp_Misc_Marker */
 unsigned gcmarkbit : 1;
 the current buffer and selected frame, then load it.  To load it,
 first unload the previous binding, then copy the value of the new
 binding into `realvalue' (or through it).  Also update
 LOADED-BINDING to point to the newly loaded binding.
-Lisp_Misc_Buffer_Local_Value and Lisp_Misc_Some_Buffer_Local_Value
+`local_if_set' indicates that merely setting the variable creates a local
-both use this kind of structure.  With the former, merely setting
+binding for the current buffer.  Otherwise the latter, setting the
-the variable creates a local binding for the current buffer.  With
+variable does not do that; only make-local-variable does that.  */
-the latter, setting the variable does not do that; only
-make-local-variable does that.  */
 struct Lisp_Buffer_Local_Value
 {
-int type : 16;      /* = Lisp_Misc_Buffer_Local_Value
+int type : 16;      /* = Lisp_Misc_Buffer_Local_Value  */
-			   or Lisp_Misc_Some_Buffer_Local_Value */
 unsigned gcmarkbit : 1;
-int spacer : 12;
+int spacer : 11;
+/* 1 means that merely setting the variable creates a local
+binding for the current buffer */
+unsigned int local_if_set : 1;
 /* 1 means this variable is allowed to have frame-local bindings,
 so check for them when looking for the proper binding.  */
 unsigned int check_frame : 1;
 /* 1 means that the binding now loaded was found
 as a local binding for the buffer in the `buffer' slot.  */
 /* To get the type field of a union Lisp_Misc, use XMISCTYPE.
 It uses one of these struct subtypes to get the type field.  */
 union Lisp_Misc
 {
-struct Lisp_Free u_free;
+struct Lisp_Misc_Any u_any;	   /* Supertype of all Misc types.  */
+struct Lisp_Free u_free;	   /* Includes padding to force alignment.  */
 struct Lisp_Marker u_marker;
 struct Lisp_Intfwd u_intfwd;
 struct Lisp_Boolfwd u_boolfwd;
 struct Lisp_Objfwd u_objfwd;
 struct Lisp_Buffer_Objfwd u_buffer_objfwd;
 #define INTFWDP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Intfwd)
 #define BOOLFWDP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Boolfwd)
 #define OBJFWDP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Objfwd)
 #define BUFFER_OBJFWDP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Buffer_Objfwd)
 #define BUFFER_LOCAL_VALUEP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Buffer_Local_Value)
+<<<<<<< TREE
 #define SOME_BUFFER_LOCAL_VALUEP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Some_Buffer_Local_Value)
+=======
+#define GC_BUFFER_LOCAL_VALUEP(x) (GC_MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Buffer_Local_Value)
+>>>>>>> MERGE-SOURCE
 #define KBOARD_OBJFWDP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Kboard_Objfwd)
+<<<<<<< TREE
+=======
+#define GC_KBOARD_OBJFWDP(x) (GC_MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Kboard_Objfwd)
+#define SAVE_VALUEP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Save_Value)
+>>>>>>> MERGE-SOURCE
 /* True if object X is a pseudovector whose code is CODE.  */
 #define PSEUDOVECTORP(x, code)					\
 (VECTORLIKEP (x)						\

Mercurial > emacs

comparison src/lisp.h @ 91056:1251cabc40b7