diff options
| author | Karl Heuer <kwzh@gnu.org> | 1994-11-09 23:13:31 +0000 |
|---|---|---|
| committer | Karl Heuer <kwzh@gnu.org> | 1994-11-09 23:13:31 +0000 |
| commit | 860b247477eded98df16d3d898b36a8e0d45b309 (patch) | |
| tree | 13ee7003a40af492e597f335e32db0ae22cd8570 /src/data.c | |
| parent | 0cdcd5e57eed5918209500c26b070e533d4cb1d2 (diff) | |
| download | emacs-860b247477eded98df16d3d898b36a8e0d45b309.tar.gz | |
(Fboundp, find_symbol_value): Use type test macros instead of checking XTYPE
directly.
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/src/data.c b/src/data.c index 545756c18a1..9414f3df2ec 100644 --- a/src/data.c +++ b/src/data.c @@ -464,16 +464,9 @@ DEFUN ("boundp", Fboundp, Sboundp, 1, 1, 0, "T if SYMBOL's value is not void.") valcontents = XSYMBOL (sym)->value; -#ifdef SWITCH_ENUM_BUG - switch ((int) XTYPE (valcontents)) -#else - switch (XTYPE (valcontents)) -#endif - { - case Lisp_Buffer_Local_Value: - case Lisp_Some_Buffer_Local_Value: - valcontents = swap_in_symval_forwarding (sym, valcontents); - } + if (LISP_BUFFER_LOCAL_VALUEP (valcontents) + || LISP_SOME_BUFFER_LOCAL_VALUEP (valcontents)) + valcontents = swap_in_symval_forwarding (sym, valcontents); return (EQ (valcontents, Qunbound) ? Qnil : Qt); } @@ -765,19 +758,12 @@ find_symbol_value (sym) CHECK_SYMBOL (sym, 0); valcontents = XSYMBOL (sym)->value; - retry: -#ifdef SWITCH_ENUM_BUG - switch ((int) XTYPE (valcontents)) -#else - switch (XTYPE (valcontents)) -#endif - { - case Lisp_Buffer_Local_Value: - case Lisp_Some_Buffer_Local_Value: - valcontents = swap_in_symval_forwarding (sym, valcontents); - goto retry; + if (LISP_BUFFER_LOCAL_VALUEP (valcontents) + || LISP_SOME_BUFFER_LOCAL_VALUEP (valcontents)) + valcontents = swap_in_symval_forwarding (sym, valcontents); - case Lisp_Misc: + if (MISCP (valcontents)) + { switch (XMISC (valcontents)->type) { case Lisp_Misc_Intfwd: |