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/charset.c | |
| 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/charset.c')
| -rw-r--r-- | src/charset.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/charset.c b/src/charset.c index 33436d53f63..ea1480e806a 100644 --- a/src/charset.c +++ b/src/charset.c | |||
| @@ -66,16 +66,7 @@ struct charset *charset_table; | |||
| 66 | static ptrdiff_t charset_table_size; | 66 | static ptrdiff_t charset_table_size; |
| 67 | static int charset_table_used; | 67 | static int charset_table_used; |
| 68 | 68 | ||
| 69 | Lisp_Object Qcharsetp; | 69 | /* Special charsets corresponding to symbols. */ |
| 70 | |||
| 71 | /* Special charset symbols. */ | ||
| 72 | Lisp_Object Qascii; | ||
| 73 | static Lisp_Object Qeight_bit; | ||
| 74 | static Lisp_Object Qiso_8859_1; | ||
| 75 | static Lisp_Object Qunicode; | ||
| 76 | static Lisp_Object Qemacs; | ||
| 77 | |||
| 78 | /* The corresponding charsets. */ | ||
| 79 | int charset_ascii; | 70 | int charset_ascii; |
| 80 | int charset_eight_bit; | 71 | int charset_eight_bit; |
| 81 | static int charset_iso_8859_1; | 72 | static int charset_iso_8859_1; |
| @@ -88,9 +79,6 @@ int charset_jisx0208_1978; | |||
| 88 | int charset_jisx0208; | 79 | int charset_jisx0208; |
| 89 | int charset_ksc5601; | 80 | int charset_ksc5601; |
| 90 | 81 | ||
| 91 | /* Value of charset attribute `charset-iso-plane'. */ | ||
| 92 | static Lisp_Object Qgl, Qgr; | ||
| 93 | |||
| 94 | /* Charset of unibyte characters. */ | 82 | /* Charset of unibyte characters. */ |
| 95 | int charset_unibyte; | 83 | int charset_unibyte; |
| 96 | 84 | ||
| @@ -2344,12 +2332,14 @@ syms_of_charset (void) | |||
| 2344 | { | 2332 | { |
| 2345 | DEFSYM (Qcharsetp, "charsetp"); | 2333 | DEFSYM (Qcharsetp, "charsetp"); |
| 2346 | 2334 | ||
| 2335 | /* Special charset symbols. */ | ||
| 2347 | DEFSYM (Qascii, "ascii"); | 2336 | DEFSYM (Qascii, "ascii"); |
| 2348 | DEFSYM (Qunicode, "unicode"); | 2337 | DEFSYM (Qunicode, "unicode"); |
| 2349 | DEFSYM (Qemacs, "emacs"); | 2338 | DEFSYM (Qemacs, "emacs"); |
| 2350 | DEFSYM (Qeight_bit, "eight-bit"); | 2339 | DEFSYM (Qeight_bit, "eight-bit"); |
| 2351 | DEFSYM (Qiso_8859_1, "iso-8859-1"); | 2340 | DEFSYM (Qiso_8859_1, "iso-8859-1"); |
| 2352 | 2341 | ||
| 2342 | /* Value of charset attribute `charset-iso-plane'. */ | ||
| 2353 | DEFSYM (Qgl, "gl"); | 2343 | DEFSYM (Qgl, "gl"); |
| 2354 | DEFSYM (Qgr, "gr"); | 2344 | DEFSYM (Qgr, "gr"); |
| 2355 | 2345 | ||
| @@ -2362,10 +2352,6 @@ syms_of_charset (void) | |||
| 2362 | staticpro (&Vemacs_mule_charset_list); | 2352 | staticpro (&Vemacs_mule_charset_list); |
| 2363 | Vemacs_mule_charset_list = Qnil; | 2353 | Vemacs_mule_charset_list = Qnil; |
| 2364 | 2354 | ||
| 2365 | /* Don't staticpro them here. It's done in syms_of_fns. */ | ||
| 2366 | QCtest = intern_c_string (":test"); | ||
| 2367 | Qeq = intern_c_string ("eq"); | ||
| 2368 | |||
| 2369 | staticpro (&Vcharset_hash_table); | 2355 | staticpro (&Vcharset_hash_table); |
| 2370 | { | 2356 | { |
| 2371 | Lisp_Object args[2]; | 2357 | Lisp_Object args[2]; |