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/frame.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/frame.h')
| -rw-r--r-- | src/frame.h | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/src/frame.h b/src/frame.h index 80603ce5624..d1ed4d4a67e 100644 --- a/src/frame.h +++ b/src/frame.h | |||
| @@ -1095,11 +1095,6 @@ SET_FRAME_VISIBLE (struct frame *f, int v) | |||
| 1095 | (f)->iconified = (eassert (0 <= (i) && (i) <= 1), (i)) | 1095 | (f)->iconified = (eassert (0 <= (i) && (i) <= 1), (i)) |
| 1096 | 1096 | ||
| 1097 | extern Lisp_Object selected_frame; | 1097 | extern Lisp_Object selected_frame; |
| 1098 | extern Lisp_Object Qframep, Qframe_live_p; | ||
| 1099 | extern Lisp_Object Qtty, Qtty_type; | ||
| 1100 | extern Lisp_Object Qtty_color_mode; | ||
| 1101 | extern Lisp_Object Qterminal; | ||
| 1102 | extern Lisp_Object Qnoelisp; | ||
| 1103 | 1098 | ||
| 1104 | extern struct frame *decode_window_system_frame (Lisp_Object); | 1099 | extern struct frame *decode_window_system_frame (Lisp_Object); |
| 1105 | extern struct frame *decode_live_frame (Lisp_Object); | 1100 | extern struct frame *decode_live_frame (Lisp_Object); |
| @@ -1344,51 +1339,6 @@ extern Lisp_Object Vframe_list; | |||
| 1344 | Frame Parameters | 1339 | Frame Parameters |
| 1345 | ***********************************************************************/ | 1340 | ***********************************************************************/ |
| 1346 | 1341 | ||
| 1347 | extern Lisp_Object Qauto_raise, Qauto_lower; | ||
| 1348 | extern Lisp_Object Qborder_color, Qborder_width; | ||
| 1349 | extern Lisp_Object Qbuffer_predicate; | ||
| 1350 | extern Lisp_Object Qcursor_color, Qcursor_type; | ||
| 1351 | extern Lisp_Object Qfont; | ||
| 1352 | extern Lisp_Object Qicon, Qicon_name, Qicon_type, Qicon_left, Qicon_top; | ||
| 1353 | extern Lisp_Object Qinternal_border_width; | ||
| 1354 | extern Lisp_Object Qright_divider_width, Qbottom_divider_width; | ||
| 1355 | extern Lisp_Object Qtooltip; | ||
| 1356 | extern Lisp_Object Qmenu_bar_lines, Qtool_bar_lines, Qtool_bar_position; | ||
| 1357 | extern Lisp_Object Qmouse_color; | ||
| 1358 | extern Lisp_Object Qname, Qtitle; | ||
| 1359 | extern Lisp_Object Qparent_id; | ||
| 1360 | extern Lisp_Object Qunsplittable, Qvisibility; | ||
| 1361 | extern Lisp_Object Qscroll_bar_width, Qvertical_scroll_bars; | ||
| 1362 | extern Lisp_Object Qscroll_bar_height, Qhorizontal_scroll_bars; | ||
| 1363 | extern Lisp_Object Qscroll_bar_foreground, Qscroll_bar_background; | ||
| 1364 | extern Lisp_Object Qscreen_gamma; | ||
| 1365 | extern Lisp_Object Qline_spacing; | ||
| 1366 | extern Lisp_Object Qwait_for_wm; | ||
| 1367 | extern Lisp_Object Qfullscreen; | ||
| 1368 | extern Lisp_Object Qfullwidth, Qfullheight, Qfullboth, Qmaximized; | ||
| 1369 | extern Lisp_Object Qsticky; | ||
| 1370 | extern Lisp_Object Qfont_backend; | ||
| 1371 | extern Lisp_Object Qalpha; | ||
| 1372 | |||
| 1373 | extern Lisp_Object Qleft_fringe, Qright_fringe; | ||
| 1374 | extern Lisp_Object Qheight, Qwidth; | ||
| 1375 | extern Lisp_Object Qminibuffer, Qmodeline; | ||
| 1376 | extern Lisp_Object Qx, Qw32, Qpc, Qns; | ||
| 1377 | extern Lisp_Object Qvisible; | ||
| 1378 | extern Lisp_Object Qdisplay_type; | ||
| 1379 | |||
| 1380 | extern Lisp_Object Qx_resource_name; | ||
| 1381 | |||
| 1382 | extern Lisp_Object Qtop, Qbox, Qbottom; | ||
| 1383 | extern Lisp_Object Qdisplay; | ||
| 1384 | |||
| 1385 | extern Lisp_Object Qframe_position, Qframe_outer_size, Qframe_inner_size; | ||
| 1386 | extern Lisp_Object Qexternal_border_size, Qtitle_height; | ||
| 1387 | extern Lisp_Object Qmenu_bar_external, Qmenu_bar_size; | ||
| 1388 | extern Lisp_Object Qtool_bar_external, Qtool_bar_size; | ||
| 1389 | |||
| 1390 | extern Lisp_Object Qrun_hook_with_args; | ||
| 1391 | |||
| 1392 | #ifdef HAVE_WINDOW_SYSTEM | 1342 | #ifdef HAVE_WINDOW_SYSTEM |
| 1393 | 1343 | ||
| 1394 | /* The class of this X application. */ | 1344 | /* The class of this X application. */ |
| @@ -1399,7 +1349,6 @@ extern void x_set_scroll_bar_default_height (struct frame *); | |||
| 1399 | extern void x_set_offset (struct frame *, int, int, int); | 1349 | extern void x_set_offset (struct frame *, int, int, int); |
| 1400 | extern void x_wm_set_size_hint (struct frame *f, long flags, bool user_position); | 1350 | extern void x_wm_set_size_hint (struct frame *f, long flags, bool user_position); |
| 1401 | extern Lisp_Object x_new_font (struct frame *, Lisp_Object, int); | 1351 | extern Lisp_Object x_new_font (struct frame *, Lisp_Object, int); |
| 1402 | extern Lisp_Object Qface_set_after_frame_default; | ||
| 1403 | extern void x_set_frame_parameters (struct frame *, Lisp_Object); | 1352 | extern void x_set_frame_parameters (struct frame *, Lisp_Object); |
| 1404 | extern void x_set_fullscreen (struct frame *, Lisp_Object, Lisp_Object); | 1353 | extern void x_set_fullscreen (struct frame *, Lisp_Object, Lisp_Object); |
| 1405 | extern void x_set_line_spacing (struct frame *, Lisp_Object, Lisp_Object); | 1354 | extern void x_set_line_spacing (struct frame *, Lisp_Object, Lisp_Object); |