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/textprop.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/textprop.c')
| -rw-r--r-- | src/textprop.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/textprop.c b/src/textprop.c index 27ab08f628c..35f22bf454e 100644 --- a/src/textprop.c +++ b/src/textprop.c | |||
| @@ -44,21 +44,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 44 | is enforced by the subrs installing properties onto the intervals. */ | 44 | is enforced by the subrs installing properties onto the intervals. */ |
| 45 | 45 | ||
| 46 | 46 | ||
| 47 | /* Types of hooks. */ | ||
| 48 | static Lisp_Object Qmouse_left; | ||
| 49 | static Lisp_Object Qmouse_entered; | ||
| 50 | Lisp_Object Qpoint_left; | ||
| 51 | Lisp_Object Qpoint_entered; | ||
| 52 | Lisp_Object Qcategory; | ||
| 53 | Lisp_Object Qlocal_map; | ||
| 54 | |||
| 55 | /* Visual properties text (including strings) may have. */ | ||
| 56 | static Lisp_Object Qforeground, Qbackground, Qunderline; | ||
| 57 | Lisp_Object Qfont; | ||
| 58 | static Lisp_Object Qstipple; | ||
| 59 | Lisp_Object Qinvisible, Qintangible, Qmouse_face; | ||
| 60 | static Lisp_Object Qread_only; | ||
| 61 | Lisp_Object Qminibuffer_prompt; | ||
| 62 | 47 | ||
| 63 | enum property_set_type | 48 | enum property_set_type |
| 64 | { | 49 | { |
| @@ -67,9 +52,6 @@ enum property_set_type | |||
| 67 | TEXT_PROPERTY_APPEND | 52 | TEXT_PROPERTY_APPEND |
| 68 | }; | 53 | }; |
| 69 | 54 | ||
| 70 | /* Sticky properties. */ | ||
| 71 | Lisp_Object Qfront_sticky, Qrear_nonsticky; | ||
| 72 | |||
| 73 | /* If o1 is a cons whose cdr is a cons, return non-zero and set o2 to | 55 | /* If o1 is a cons whose cdr is a cons, return non-zero and set o2 to |
| 74 | the o1's cdr. Otherwise, return zero. This is handy for | 56 | the o1's cdr. Otherwise, return zero. This is handy for |
| 75 | traversing plists. */ | 57 | traversing plists. */ |
| @@ -2383,7 +2365,7 @@ inherits it if NONSTICKINESS is nil. The `front-sticky' and | |||
| 2383 | interval_insert_in_front_hooks = Qnil; | 2365 | interval_insert_in_front_hooks = Qnil; |
| 2384 | 2366 | ||
| 2385 | 2367 | ||
| 2386 | /* Common attributes one might give text */ | 2368 | /* Common attributes one might give text. */ |
| 2387 | 2369 | ||
| 2388 | DEFSYM (Qforeground, "foreground"); | 2370 | DEFSYM (Qforeground, "foreground"); |
| 2389 | DEFSYM (Qbackground, "background"); | 2371 | DEFSYM (Qbackground, "background"); |
| @@ -2401,7 +2383,7 @@ inherits it if NONSTICKINESS is nil. The `front-sticky' and | |||
| 2401 | DEFSYM (Qmouse_face, "mouse-face"); | 2383 | DEFSYM (Qmouse_face, "mouse-face"); |
| 2402 | DEFSYM (Qminibuffer_prompt, "minibuffer-prompt"); | 2384 | DEFSYM (Qminibuffer_prompt, "minibuffer-prompt"); |
| 2403 | 2385 | ||
| 2404 | /* Properties that text might use to specify certain actions */ | 2386 | /* Properties that text might use to specify certain actions. */ |
| 2405 | 2387 | ||
| 2406 | DEFSYM (Qmouse_left, "mouse-left"); | 2388 | DEFSYM (Qmouse_left, "mouse-left"); |
| 2407 | DEFSYM (Qmouse_entered, "mouse-entered"); | 2389 | DEFSYM (Qmouse_entered, "mouse-entered"); |