diff options
| author | Paul Eggert | 2015-01-05 09:07:45 -0800 |
|---|---|---|
| committer | Paul Eggert | 2015-01-05 10:14:58 -0800 |
| commit | 58f2d6ef32b28a787fcc4e0d98b3f331ceb2a68c (patch) | |
| tree | d6d79ad7b7cceafc78c5a9c54f5be1ac441a8ed7 /src/dispextern.h | |
| parent | d2cf05d1bac19d8564d0806f515b9f40fe57f4df (diff) | |
| download | emacs-58f2d6ef32b28a787fcc4e0d98b3f331ceb2a68c.tar.gz emacs-58f2d6ef32b28a787fcc4e0d98b3f331ceb2a68c.zip | |
Compute C decls for DEFSYMs automatically
Fixes Bug#15880.
This patch also makes Q constants (e.g., Qnil) constant addresses
from the C point of view.
* make-docfile.c: Revamp to generate table of symbols, too.
Include <stdbool.h>.
(xstrdup): New function.
(main): Don't process the same file twice.
(SYMBOL): New constant in enum global_type.
(struct symbol): Turn 'value' member into a union, either v.value
for int or v.svalue for string. All uses changed.
(add_global): New arg svalue, which overrides value, so that globals
can have a string value.
(close_emacs_global): New arg num_symbols; all uses changed.
Output lispsym decl.
(write_globals): Output symbol globals too. Output more
ATTRIBUTE_CONST, now that Qnil etc. are C constants.
Output defsym_name table.
(scan_c_file): Move most of guts into ...
(scan_c_stream): ... new function. Scan for DEFSYMs and
record symbols found. Don't read past EOF if file doesn't
end in newline.
* alloc.c, bidi.c, buffer.c, bytecode.c, callint.c, casefiddle:
* casetab.c, category.c, ccl.c, charset.c, chartab.c, cmds.c, coding.c:
* composite.c, data.c, dbusbind.c, decompress.c, dired.c, dispnew.c:
* doc.c, editfns.c, emacs.c, eval.c, fileio.c, fns.c, font.c, fontset.c:
* frame.c, fringe.c, ftfont.c, ftxfont.c, gfilenotify.c, gnutls.c:
* image.c, inotify.c, insdel.c, keyboard.c, keymap.c, lread.c:
* macfont.m, macros.c, minibuf.c, nsfns.m, nsfont.m, nsimage.m:
* nsmenu.m, nsselect.m, nsterm.m, print.c, process.c, profiler.c:
* search.c, sound.c, syntax.c, term.c, terminal.c, textprop.c, undo.c:
* window.c, xdisp.c, xfaces.c, xfns.c, xftfont.c, xmenu.c, xml.c:
* xselect.c, xsettings.c, xterm.c:
Remove Q vars that represent symbols (e.g., Qnil, Qt, Qemacs).
These names are now defined automatically by make-docfile.
* alloc.c (init_symbol): New function.
(Fmake_symbol): Use it.
(c_symbol_p): New function.
(valid_lisp_object_p, purecopy): Use it.
* alloc.c (marked_pinned_symbols):
Use make_lisp_symbol instead of make_lisp_ptr.
(garbage_collect_1): Mark lispsym symbols.
(CHECK_ALLOCATED_AND_LIVE_SYMBOL): New macro.
(mark_object): Use it.
(sweep_symbols): Sweep lispsym symbols.
(symbol_uses_obj): New function.
(which_symbols): Use it. Work for lispsym symbols, too.
(init_alloc_once): Initialize Vpurify_flag here; no need to wait,
since Qt's address is already known now.
(syms_of_alloc): Add lispsym count to symbols_consed.
* buffer.c (init_buffer_once): Compare to Qnil, not to make_number (0),
when testing whether storage is all bits zero.
* dispextern (struct image_type):
* font.c (font_property_table):
* frame.c (struct frame_parm_table, frame_parms):
* keyboard.c (scroll_bar_parts, struct event_head):
* xdisp.c (struct props):
Use XSYMBOL_INIT (Qfoo) and struct Lisp_Symbol * rather than &Qfoo and
Lisp_Object *, since Qfoo is no longer an object whose address can be
taken. All uses changed.
* eval.c (run_hook): New function. Most uses of Frun_hooks changed to
use it, so that they no longer need to take the address of a Lisp sym.
(syms_of_eval): Don't use DEFSYM on Vrun_hooks, as it's a variable.
* frame.c (syms_of_frame): Add defsyms for the frame_parms table.
* keyboard.c (syms_of_keyboard): Don't DEFSYM Qmenu_bar here.
DEFSYM Qdeactivate_mark before the corresponding var.
* keymap.c (syms_of_keymap): Use DEFSYM for Qmenu_bar and Qmode_line
instead of interning their symbols; this avoids duplicates.
(LISP_INITIALLY, TAG_PTR)
(DEFINE_LISP_SYMBOL_BEGIN, DEFINE_LISP_SYMBOL_END, XSYMBOL_INIT):
New macros.
(LISP_INITIALLY_ZERO): Use it.
(enum symbol_interned, enum symbol_redirect, struct Lisp_Symbol)
(EXFUN, DEFUN_ARGS_MANY, DEFUN_ARGS_UNEVALLED, DEFUN_ARGS_*):
Move decls up, to avoid forward uses. Include globals.h earlier, too.
(make_lisp_symbol): New function.
(XSETSYMBOL): Use it.
(DEFSYM): Now just a placeholder for make-docfile.
* lread.c (DEFINE_SYMBOLS): Define, for globals.h.
(intern_sym): New function, with body taken from old intern_driver.
(intern_driver): Use it. Last arg is now Lisp integer, not ptrdiff_t.
All uses changed.
(define_symbol): New function.
(init_obarray): Define the C symbols taken from lispsym.
Use plain DEFSYM for Qt and Qnil.
* syntax.c (init_syntax_once): No need to worry about
Qchar_table_extra_slots.
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index ba8524d624c..d717473f8c2 100644 --- a/src/dispextern.h +++ b/src/dispextern.h | |||
| @@ -2907,8 +2907,8 @@ struct redisplay_interface | |||
| 2907 | 2907 | ||
| 2908 | struct image_type | 2908 | struct image_type |
| 2909 | { | 2909 | { |
| 2910 | /* A symbol uniquely identifying the image type, .e.g `jpeg'. */ | 2910 | /* A symbol uniquely identifying the image type, e.g., 'jpeg'. */ |
| 2911 | Lisp_Object *type; | 2911 | struct Lisp_Symbol *type; |
| 2912 | 2912 | ||
| 2913 | /* Check that SPEC is a valid image specification for the given | 2913 | /* Check that SPEC is a valid image specification for the given |
| 2914 | image type. Value is true if SPEC is valid. */ | 2914 | image type. Value is true if SPEC is valid. */ |
| @@ -3222,7 +3222,6 @@ void move_it_in_display_line (struct it *it, | |||
| 3222 | enum move_operation_enum op); | 3222 | enum move_operation_enum op); |
| 3223 | bool in_display_vector_p (struct it *); | 3223 | bool in_display_vector_p (struct it *); |
| 3224 | int frame_mode_line_height (struct frame *); | 3224 | int frame_mode_line_height (struct frame *); |
| 3225 | extern Lisp_Object Qtool_bar; | ||
| 3226 | extern bool redisplaying_p; | 3225 | extern bool redisplaying_p; |
| 3227 | extern bool help_echo_showing_p; | 3226 | extern bool help_echo_showing_p; |
| 3228 | extern Lisp_Object help_echo_string, help_echo_window; | 3227 | extern Lisp_Object help_echo_string, help_echo_window; |
| @@ -3402,7 +3401,6 @@ int face_at_string_position (struct window *w, Lisp_Object string, | |||
| 3402 | int merge_faces (struct frame *, Lisp_Object, int, int); | 3401 | int merge_faces (struct frame *, Lisp_Object, int, int); |
| 3403 | int compute_char_face (struct frame *, int, Lisp_Object); | 3402 | int compute_char_face (struct frame *, int, Lisp_Object); |
| 3404 | void free_all_realized_faces (Lisp_Object); | 3403 | void free_all_realized_faces (Lisp_Object); |
| 3405 | extern Lisp_Object Qforeground_color, Qbackground_color; | ||
| 3406 | extern char unspecified_fg[], unspecified_bg[]; | 3404 | extern char unspecified_fg[], unspecified_bg[]; |
| 3407 | 3405 | ||
| 3408 | /* Defined in xfns.c. */ | 3406 | /* Defined in xfns.c. */ |
| @@ -3492,7 +3490,6 @@ void do_pending_window_change (bool); | |||
| 3492 | void change_frame_size (struct frame *, int, int, bool, bool, bool, bool); | 3490 | void change_frame_size (struct frame *, int, int, bool, bool, bool, bool); |
| 3493 | void init_display (void); | 3491 | void init_display (void); |
| 3494 | void syms_of_display (void); | 3492 | void syms_of_display (void); |
| 3495 | extern Lisp_Object Qredisplay_dont_pause; | ||
| 3496 | extern void spec_glyph_lookup_face (struct window *, GLYPH *); | 3493 | extern void spec_glyph_lookup_face (struct window *, GLYPH *); |
| 3497 | extern void fill_up_frame_row_with_spaces (struct glyph_row *, int); | 3494 | extern void fill_up_frame_row_with_spaces (struct glyph_row *, int); |
| 3498 | 3495 | ||