Introduce a struct Lisp_Fwd

This contains the type and an union of Lisp_Objfwd, Lisp_Intfwd etc.
lispfwd is now a pointer to a struct Lisp_Fwd; the fwdptr field is gone.

* src/lisp.h (struct Lisp_Fwd): New.
(Lisp_Intfwd, Lisp_Boolfwd, Lisp_Objfwd, Lisp_Buffer_Objfwd)
(Lisp_Kboard_Objfwd): The type is in in Lisp_Fwd.
(lispwfd): Is now a pointer to struct Lisp_Fwd.
(SYMBOL_BLV, SET_SYMBOL_FWD, XFWDTYPE, BUFFER_OBJFWDP): Update
accordingly.
(defvar_lisp, defvar_lisp_nopro, defvar_bool, defvar_int)
(defvar_kboard): These all take now a Lisp_Fwd.
(DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_BOOL, DEFVAR_INT)
(DEFVAR_KBOARD): Update for new types.
* src/lread.c (defvar_int, defvar_bool, defvar_lisp_nopro)
(defvar_lisp, defvar_kboard): Update for new types.
* src/pdumper.c (dump_field_fwd, dump_blv): Update accordingly.
* src/buffer.c (DEFVAR_PER_BUFFER, defvar_per_buffer, buffer_local_value)
(set_buffer_internal_1): Update accordingly for new types.
* src/data.c (XBOOLFWD, XKBOARD_OBJFWD, XFIXNUMFWD, XOBJFWD, boundp)
(store_symval_forwarding, swap_in_global_binding)
(swap_in_symval_forwarding, find_symbol_value, set_internal)
(default_value, set_default_internal, make_blv, Fmake_local_variable):
Update accordingly.

1 files changed, 9 insertions, 8 deletions

diff --git a/src/buffer.c b/src/buffer.c
index d864560ec85..e55560b1cd9 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1366,7 +1366,7 @@ buffer_local_value (Lisp_Object variable, Lisp_Object buffer)
         result = assq_no_quit (variable, BVAR (buf, local_var_alist));
         if (!NILP (result))
           {
-            if (blv->fwd.fwdptr)
+            if (blv->fwd)
               { /* What binding is loaded right now?  */
                 Lisp_Object current_alist_element = blv->valcell;
 
@@ -2365,7 +2365,7 @@ void set_buffer_internal_2 (register struct buffer *b)
           Lisp_Object var = XCAR (XCAR (tail));
           struct Lisp_Symbol *sym = XSYMBOL (var);
           if (sym->u.s.redirect == SYMBOL_LOCALIZED /* Just to be sure.  */
-              && SYMBOL_BLV (sym)->fwd.fwdptr)
+              && SYMBOL_BLV (sym)->fwd)
             /* Just reference the variable
                to cause it to become set for this buffer.  */
             Fsymbol_value (var);
@@ -5023,24 +5023,25 @@ do									\
   {                                                                     \
     const Lisp_Object sym = TAG_PTR_INITIALLY (                         \
         Lisp_Symbol, (intptr_t)((i##predicate_) * sizeof *lispsym));    \
-    static const struct Lisp_Buffer_Objfwd bo_fwd = {                   \
+    static const struct Lisp_Fwd bo_fwd = {                             \
       .type = Lisp_Fwd_Buffer_Obj,                                      \
-      .offset = offsetof (struct buffer, vname##_),                     \
-      .predicate = sym,                                                 \
+      .u.bufobjfwd = { .offset = offsetof (struct buffer, vname##_),    \
+                       .predicate = sym },                              \
     };                                                                  \
     defvar_per_buffer (&bo_fwd, lname);                                 \
   }                                                                     \
 while (0)
 
 static void
-defvar_per_buffer (const struct Lisp_Buffer_Objfwd *bo_fwd,
-                   const char *namestring)
+defvar_per_buffer (const struct Lisp_Fwd *fwd, const char *namestring)
 {
+  eassert (fwd->type == Lisp_Fwd_Buffer_Obj);
+  const struct Lisp_Buffer_Objfwd *bo_fwd = XBUFFER_OBJFWD (fwd);
   struct Lisp_Symbol *sym = XSYMBOL (intern (namestring));
 
   sym->u.s.declared_special = true;
   sym->u.s.redirect = SYMBOL_FORWARDED;
-  SET_SYMBOL_FWD (sym, bo_fwd);
+  SET_SYMBOL_FWD (sym, fwd);
   XSETSYMBOL (PER_BUFFER_SYMBOL (bo_fwd->offset), sym);
 
   if (PER_BUFFER_IDX (bo_fwd->offset) == 0)