X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/294180317b6417c54618d4822c19bc0809c2bc7a..efdd2e5c64957ecd43765763ab59edda56127b08:/src/lisp.h diff --git a/src/lisp.h b/src/lisp.h index ca44ab9810..38d5d3cdd0 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -297,13 +297,14 @@ DEFINE_GDB_SYMBOL_END (USE_LSB_TAG) #define lisp_h_INTEGERP(x) (SCM_I_INUMP (x)) #define lisp_h_MARKERP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Marker) #define lisp_h_MISCP(x) (SMOB_TYPEP (x, lisp_misc_tag)) -#define lisp_h_NILP(x) EQ (x, Qnil) +#define lisp_h_NILP(x) (scm_is_lisp_false (x)) #define lisp_h_SET_SYMBOL_VAL(sym, v) \ (eassert ((sym)->redirect == SYMBOL_PLAINVAL), (sym)->val.value = (v)) #define lisp_h_SYMBOL_CONSTANT_P(sym) (XSYMBOL (sym)->constant) #define lisp_h_SYMBOL_VAL(sym) \ (eassert ((sym)->redirect == SYMBOL_PLAINVAL), (sym)->val.value) -#define lisp_h_SYMBOLP(x) (x && scm_is_symbol (x)) +#define lisp_h_SYMBOLP(x) \ + (x && (scm_is_symbol (x) || EQ (x, Qnil) || EQ (x, Qt))) #define lisp_h_VECTORLIKEP(x) (SMOB_TYPEP (x, lisp_vectorlike_tag)) #define lisp_h_XCAR(c) (scm_car (c)) #define lisp_h_XCDR(c) (scm_cdr (c)) @@ -439,7 +440,6 @@ enum pvec_type PVEC_HASH_TABLE, PVEC_TERMINAL, PVEC_WINDOW_CONFIGURATION, - PVEC_SUBR, PVEC_OTHER, /* These should be last, check internal_equal to see why. */ PVEC_COMPILED, @@ -565,7 +565,6 @@ INLINE void set_sub_char_table_contents (Lisp_Object, ptrdiff_t, Lisp_Object); INLINE bool STRINGP (Lisp_Object); INLINE bool SUB_CHAR_TABLE_P (Lisp_Object); -INLINE bool SUBRP (Lisp_Object); INLINE bool (SYMBOLP) (Lisp_Object); INLINE bool (VECTORLIKEP) (Lisp_Object); INLINE bool WINDOWP (Lisp_Object); @@ -649,11 +648,14 @@ INLINE Lisp_Object build_string (const char *); extern Lisp_Object symbol_module; extern Lisp_Object function_module; extern Lisp_Object plist_module; +extern Lisp_Object Qt, Qnil, Qt_, Qnil_; INLINE struct Lisp_Symbol * XSYMBOL (Lisp_Object a) { Lisp_Object tem; + if (EQ (a, Qt)) a = Qt_; + if (EQ (a, Qnil)) a = Qnil_; eassert (SYMBOLP (a)); tem = scm_variable_ref (scm_module_lookup (symbol_module, a)); return scm_to_pointer (tem); @@ -681,13 +683,6 @@ XTERMINAL (Lisp_Object a) return SMOB_PTR (a); } -INLINE struct Lisp_Subr * -XSUBR (Lisp_Object a) -{ - eassert (SUBRP (a)); - return SMOB_PTR (a); -} - INLINE struct buffer * XBUFFER (Lisp_Object a) { @@ -1236,32 +1231,6 @@ CHAR_TABLE_SET (Lisp_Object ct, int idx, Lisp_Object val) char_table_set (ct, idx, val); } -/* This structure describes a built-in function. - It is generated by the DEFUN macro only. - defsubr makes it into a Lisp object. */ - -struct Lisp_Subr - { - struct vectorlike_header header; - union { - Lisp_Object (*a0) (void); - Lisp_Object (*a1) (Lisp_Object); - Lisp_Object (*a2) (Lisp_Object, Lisp_Object); - Lisp_Object (*a3) (Lisp_Object, Lisp_Object, Lisp_Object); - Lisp_Object (*a4) (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); - Lisp_Object (*a5) (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); - Lisp_Object (*a6) (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); - Lisp_Object (*a7) (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); - Lisp_Object (*a8) (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); - Lisp_Object (*aUNEVALLED) (Lisp_Object args); - Lisp_Object (*aMANY) (ptrdiff_t, Lisp_Object *); - } function; - short min_args, max_args; - const char *symbol_name; - const char *intspec; - const char *doc; - }; - /* This is the number of slots that every char table must have. This counts the ordinary slots and the top, defalt, parent, and purpose slots. */ @@ -1284,15 +1253,6 @@ CHAR_TABLE_EXTRA_SLOTS (struct Lisp_Char_Table *ct) Symbols ***********************************************************************/ -/* Interned state of a symbol. */ - -enum symbol_interned -{ - SYMBOL_UNINTERNED = 0, - SYMBOL_INTERNED = 1, - SYMBOL_INTERNED_IN_INITIAL_OBARRAY = 2 -}; - enum symbol_redirect { SYMBOL_PLAINVAL = 4, @@ -1317,10 +1277,6 @@ struct Lisp_Symbol can be changed, but only by `defconst'. */ unsigned constant : 2; - /* Interned state of the symbol. This is an enumerator from - enum symbol_interned. */ - unsigned interned : 2; - /* True means that this variable has been explicitly declared special (with `defvar' etc), and shouldn't be lexically bound. */ bool_bf declared_special : 1; @@ -1328,9 +1284,6 @@ struct Lisp_Symbol /* True if pointed to from purespace and hence can't be GC'd. */ bool_bf pinned : 1; - /* The symbol's name, as a Lisp string. */ - Lisp_Object name; - /* Value of the symbol or Qunbound if unbound. Which alternative of the union is used depends on the `redirect' field above. */ union { @@ -1389,7 +1342,9 @@ SET_SYMBOL_FWD (struct Lisp_Symbol *sym, union Lisp_Fwd *v) INLINE Lisp_Object SYMBOL_NAME (Lisp_Object sym) { - return XSYMBOL (sym)->name; + if (EQ (sym, Qnil)) sym = Qnil_; + if (EQ (sym, Qt)) sym = Qt_; + return build_string (scm_to_locale_string (scm_symbol_to_string (sym))); } /* Value is true if SYM is an interned symbol. */ @@ -1397,20 +1352,16 @@ SYMBOL_NAME (Lisp_Object sym) INLINE bool SYMBOL_INTERNED_P (Lisp_Object sym) { - return XSYMBOL (sym)->interned != SYMBOL_UNINTERNED; -} - -/* Value is true if SYM is interned in initial_obarray. */ - -INLINE bool -SYMBOL_INTERNED_IN_INITIAL_OBARRAY_P (Lisp_Object sym) -{ - return XSYMBOL (sym)->interned == SYMBOL_INTERNED_IN_INITIAL_OBARRAY; + if (EQ (sym, Qnil)) sym = Qnil_; + if (EQ (sym, Qt)) sym = Qt_; + return scm_is_true (scm_symbol_interned_p (sym)); } INLINE Lisp_Object SYMBOL_FUNCTION (Lisp_Object sym) { + if (EQ (sym, Qnil)) sym = Qnil_; + if (EQ (sym, Qt)) sym = Qt_; return scm_variable_ref (scm_module_lookup (function_module, sym)); } @@ -2148,12 +2099,6 @@ TERMINALP (Lisp_Object a) return PSEUDOVECTORP (a, PVEC_TERMINAL); } -INLINE bool -SUBRP (Lisp_Object a) -{ - return PSEUDOVECTORP (a, PVEC_SUBR); -} - INLINE bool COMPILEDP (Lisp_Object a) { @@ -2364,28 +2309,71 @@ CHECK_NUMBER_CDR (Lisp_Object x) /* This version of DEFUN declares a function prototype with the right arguments, so we can catch errors with maxargs at compile-time. */ -#ifdef _MSC_VER -#define DEFUN(lname, fnname, sname, minargs, maxargs, intspec, doc) \ - SCM_SNARF_INIT (defsubr (&sname);) \ - Lisp_Object fnname DEFUN_ARGS_ ## maxargs ; \ - static struct Lisp_Subr alignas (GCALIGNMENT) sname = \ - { { NULL, \ - (PVEC_SUBR << PSEUDOVECTOR_AREA_BITS) \ - | (sizeof (struct Lisp_Subr) / sizeof (EMACS_INT)) }, \ - { (Lisp_Object (__cdecl *)(void))fnname }, \ - minargs, maxargs, lname, intspec, 0}; \ - Lisp_Object fnname -#else /* not _MSC_VER */ #define DEFUN(lname, fnname, sname, minargs, maxargs, intspec, doc) \ - SCM_SNARF_INIT (defsubr (&sname);) \ + SCM_SNARF_INIT (defsubr (lname, gsubr_ ## fnname, minargs, maxargs, intspec)) \ Lisp_Object fnname DEFUN_ARGS_ ## maxargs ; \ - static struct Lisp_Subr alignas (GCALIGNMENT) sname = \ - { { .self = NULL, \ - .size = PVEC_SUBR << PSEUDOVECTOR_AREA_BITS }, \ - { .a ## maxargs = fnname }, \ - minargs, maxargs, lname, intspec, 0}; \ + DEFUN_GSUBR_ ## maxargs (lname, fnname, minargs, maxargs) \ Lisp_Object fnname -#endif + +#define GSUBR_ARGS_1(f) f (arg1) +#define GSUBR_ARGS_2(f) GSUBR_ARGS_1 (f), f (arg2) +#define GSUBR_ARGS_3(f) GSUBR_ARGS_2 (f), f (arg3) +#define GSUBR_ARGS_4(f) GSUBR_ARGS_3 (f), f (arg4) +#define GSUBR_ARGS_5(f) GSUBR_ARGS_4 (f), f (arg5) +#define GSUBR_ARGS_6(f) GSUBR_ARGS_5 (f), f (arg6) +#define GSUBR_ARGS_7(f) GSUBR_ARGS_6 (f), f (arg7) +#define GSUBR_ARGS_8(f) GSUBR_ARGS_7 (f), f (arg8) + +#define GSUBR_ARGS(n) GSUBR_ARGS_PASTE (GSUBR_ARGS_, n) +#define GSUBR_ARGS_PASTE(a, b) a ## b + +#define DEFUN_GSUBR_N(fn, maxargs) \ + Lisp_Object \ + gsubr_ ## fn \ + (GSUBR_ARGS (maxargs) (Lisp_Object)) \ + { \ + return fn (GSUBR_ARGS (maxargs) (GSUBR_ARG)); \ + } +#define GSUBR_ARG(x) (SCM_UNBNDP (x) ? Qnil : x) + +#define DEFUN_GSUBR_0(lname, fn, minargs, maxargs) \ + Lisp_Object gsubr_ ## fn (void) { return fn (); } +#define DEFUN_GSUBR_1(lname, fn, min, max) DEFUN_GSUBR_N(fn, max) +#define DEFUN_GSUBR_2(lname, fn, min, max) DEFUN_GSUBR_N(fn, max) +#define DEFUN_GSUBR_3(lname, fn, min, max) DEFUN_GSUBR_N(fn, max) +#define DEFUN_GSUBR_4(lname, fn, min, max) DEFUN_GSUBR_N(fn, max) +#define DEFUN_GSUBR_5(lname, fn, min, max) DEFUN_GSUBR_N(fn, max) +#define DEFUN_GSUBR_6(lname, fn, min, max) DEFUN_GSUBR_N(fn, max) +#define DEFUN_GSUBR_7(lname, fn, min, max) DEFUN_GSUBR_N(fn, max) +#define DEFUN_GSUBR_8(lname, fn, min, max) DEFUN_GSUBR_N(fn, max) + +#define DEFUN_GSUBR_UNEVALLED(lname, fn, minargs, maxargs) \ + Lisp_Object \ + gsubr_ ## fn (Lisp_Object rest) \ + { \ + Lisp_Object len = Flength (rest); \ + if (XINT (len) < minargs) \ + xsignal2 (Qwrong_number_of_arguments, \ + intern (lname), len); \ + return fn (rest); \ + } +#define DEFUN_GSUBR_MANY(lname, fn, minargs, maxargs) \ + Lisp_Object \ + gsubr_ ## fn (Lisp_Object rest) \ + { \ + int len = scm_to_int (scm_length (rest)); \ + Lisp_Object *args; \ + SAFE_ALLOCA_LISP (args, len); \ + int i; \ + for (i = 0; \ + i < len && scm_is_pair (rest); \ + i++, rest = SCM_CDR (rest)) \ + args[i] = SCM_CAR (rest); \ + if (i < minargs) \ + xsignal2 (Qwrong_number_of_arguments, \ + intern (lname), make_number (i)); \ + return fn (i, args); \ + } /* Note that the weird token-substitution semantics of ANSI C makes this work for MANY and UNEVALLED. */ @@ -2414,7 +2402,7 @@ FUNCTIONP (Lisp_Object obj) /* defsubr (Sname); is how we define the symbol for function `name' at start-up time. */ -extern void defsubr (struct Lisp_Subr *); +extern void defsubr (const char *, scm_t_subr, short, short, const char *); enum maxargs { @@ -2612,7 +2600,6 @@ struct handler Lisp_Object body; struct handler *next; EMACS_INT lisp_eval_depth; - int poll_suppress_count; int interrupt_input_blocked; }; @@ -2758,18 +2745,24 @@ set_hash_value_slot (struct Lisp_Hash_Table *h, ptrdiff_t idx, Lisp_Object val) INLINE void set_symbol_function (Lisp_Object sym, Lisp_Object function) { + if (EQ (sym, Qnil)) sym = Qnil_; + if (EQ (sym, Qt)) sym = Qt_; scm_variable_set_x (scm_module_lookup (function_module, sym), function); } INLINE Lisp_Object symbol_plist (Lisp_Object sym) { + if (EQ (sym, Qnil)) sym = Qnil_; + if (EQ (sym, Qt)) sym = Qt_; return scm_variable_ref (scm_module_lookup (plist_module, sym)); } INLINE void set_symbol_plist (Lisp_Object sym, Lisp_Object plist) { + if (EQ (sym, Qnil)) sym = Qnil_; + if (EQ (sym, Qt)) sym = Qt_; scm_variable_set_x (scm_module_lookup (plist_module, sym), plist); } @@ -2843,6 +2836,7 @@ set_sub_char_table_contents (Lisp_Object table, ptrdiff_t idx, Lisp_Object val) } /* Defined in data.c. */ +extern Lisp_Object Qnil_, Qt_; extern Lisp_Object Qquote, Qunbound; extern Lisp_Object Qerror_conditions, Qerror_message, Qtop_level; extern Lisp_Object Qerror, Qquit, Qargs_out_of_range; @@ -2857,6 +2851,7 @@ extern Lisp_Object Qcircular_list; extern Lisp_Object Qsequencep; extern Lisp_Object Qchar_or_string_p, Qinteger_or_marker_p; extern Lisp_Object Qfboundp; +extern Lisp_Object Qspecial_operator; extern Lisp_Object Qcdr; @@ -4003,8 +3998,8 @@ functionp (Lisp_Object object) } } - if (SUBRP (object)) - return XSUBR (object)->max_args != UNEVALLED; + if (scm_is_true (scm_procedure_p (object))) + return 1; else if (COMPILEDP (object)) return true; else if (CONSP (object)) @@ -4012,8 +4007,6 @@ functionp (Lisp_Object object) Lisp_Object car = XCAR (object); return EQ (car, Qlambda) || EQ (car, Qclosure); } - else - return false; } INLINE_HEADER_END