diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2018-12-09 00:18:36 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-12-09 00:23:55 -0800 |
commit | d79bb75683ceb4eee2f753eb38fa8db99aff4568 (patch) | |
tree | b0b20c25387c2eb11b2c79e87898bec2c39b14ea /src/composite.c | |
parent | c2fdd50c3cb0b03d2414370c58c1aa2a6ec3311d (diff) | |
download | emacs-d79bb75683ceb4eee2f753eb38fa8db99aff4568.tar.gz |
Add make_vector and make_nil_vector
This makes the callers a bit easier to read, and doubtless
improves efficiency very slightly. It also simplifies
possible future changes to allow bignum indexes to buffers.
* src/alloc.c (allocate_vectorlike):
Prefer ptrdiff_t to size_t when either will do.
(make_vector): New function.
(Fmake_vector): Use it.
* src/buffer.c (syms_of_buffer):
* src/bytecode.c (syms_of_bytecode):
* src/category.c (Fmake_category_table, init_category_once):
* src/ccl.c (syms_of_ccl):
* src/character.c (syms_of_character):
* src/charset.c (Fdefine_charset_internal)
(Ffind_charset_region, Ffind_charset_string):
* src/chartab.c (copy_char_table):
* src/coding.c (Fdefine_coding_system_internal, syms_of_coding):
* src/composite.c (get_composition_id, Fcomposition_get_gstring):
* src/composite.h (LGLYPH_NEW):
* src/fns.c (concat, Flocale_info, make_hash_table):
* src/font.c (font_otf_ValueRecord, font_otf_anchor)
(build_style_table, syms_of_font):
* src/fontset.c (RFONT_DEF_NEW, fontset_find_font)
(dump_fontset, syms_of_fontset):
* src/image.c (xpm_make_color_table_v):
* src/keyboard.c (modify_event_symbol, menu_bar_items)
(parse_menu_item, parse_tool_bar_item, init_tool_bar_items)
(syms_of_keyboard):
* src/keymap.c (Fdefine_key, describe_map, describe_vector):
* src/lread.c (read_vector):
* src/macfont.m (macfont_shape):
* src/menu.c (init_menu_items):
* src/nsfns.m (ns_make_monitor_attribute_list):
* src/process.c (conv_sockaddr_to_lisp, network_interface_info):
* src/profiler.c (make_log):
* src/window.c (Fcurrent_window_configuration):
* src/xdisp.c (with_echo_area_buffer_unwind_data)
(format_mode_line_unwind_data):
* src/xfaces.c (Finternal_make_lisp_face)
(Fface_attributes_as_vector):
* src/xfns.c (x_make_monitor_attribute_list)
(Fx_display_monitor_attributes_list):
* src/xfont.c (syms_of_xfont):
* src/xselect.c (x_handle_dnd_message):
* src/xwidget.c (save_script_callback):
Prefer make_nil_vector (N) to Fmake_vector (make_fixnum (N), Qnil).
* src/callint.c (Fcall_interactively):
* src/charset.c (load_charset_map):
* src/chartab.c (Fmake_char_table, uniprop_encode_value_numeric):
* src/composite.c (get_composition_id)
* src/dispnew.c (Fframe_or_buffer_changed_p)
(syms_of_display):
* src/fns.c (make_hash_table, maybe_resize_hash_table):
* src/font.c (font_style_to_value):
* src/fontset.c (FONTSET_ADD, fontset_add):
* src/json.c (json_to_lisp):
* src/keymap.c (syms_of_keymap):
* src/lread.c (init_obarray):
* src/profiler.c (make_log, Fprofiler_cpu_log):
* src/term.c (term_get_fkeys_1):
Prefer make_vector (N, V) to Fmake_vector (make_fixnum (N), V).
* src/font.c (build_style_table):
* src/macfont.m (macfont_shape):
* src/process.c (conv_sockaddr_to_lisp, network_interface_info):
Prefer make_uninit_vector if the vector will be initialized soon.
* src/lisp.h (make_nil_vector): New function.
Diffstat (limited to 'src/composite.c')
-rw-r--r-- | src/composite.c | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/src/composite.c b/src/composite.c index 39c54fcfab3..9819805c399 100644 --- a/src/composite.c +++ b/src/composite.c @@ -216,7 +216,7 @@ get_composition_id (ptrdiff_t charpos, ptrdiff_t bytepos, ptrdiff_t nchars, COMPONENTS (converted to a vector COMPONENTS-VEC) or, if it is nil, vector of characters in the composition range. */ if (FIXNUMP (components)) - key = Fmake_vector (make_fixnum (1), components); + key = make_vector (1, components); else if (STRINGP (components) || CONSP (components)) key = Fvconcat (1, &components); else if (VECTORP (components)) @@ -654,27 +654,22 @@ Lisp_Object composition_gstring_put_cache (Lisp_Object gstring, ptrdiff_t len) { struct Lisp_Hash_Table *h = XHASH_TABLE (gstring_hash_table); - EMACS_UINT hash; - Lisp_Object header, copy; - ptrdiff_t i; - - header = LGSTRING_HEADER (gstring); - hash = h->test.hashfn (&h->test, header); + Lisp_Object header = LGSTRING_HEADER (gstring); + EMACS_UINT hash = h->test.hashfn (&h->test, header); if (len < 0) { - ptrdiff_t j, glyph_len = LGSTRING_GLYPH_LEN (gstring); - for (j = 0; j < glyph_len; j++) - if (NILP (LGSTRING_GLYPH (gstring, j))) + ptrdiff_t glyph_len = LGSTRING_GLYPH_LEN (gstring); + for (len = 0; len < glyph_len; len++) + if (NILP (LGSTRING_GLYPH (gstring, len))) break; - len = j; } - copy = Fmake_vector (make_fixnum (len + 2), Qnil); + Lisp_Object copy = make_nil_vector (len + 2); LGSTRING_SET_HEADER (copy, Fcopy_sequence (header)); - for (i = 0; i < len; i++) + for (ptrdiff_t i = 0; i < len; i++) LGSTRING_SET_GLYPH (copy, i, Fcopy_sequence (LGSTRING_GLYPH (gstring, i))); - i = hash_put (h, LGSTRING_HEADER (copy), copy, hash); - LGSTRING_SET_ID (copy, make_fixnum (i)); + ptrdiff_t id = hash_put (h, LGSTRING_HEADER (copy), copy, hash); + LGSTRING_SET_ID (copy, make_fixnum (id)); return copy; } @@ -1759,7 +1754,7 @@ should be ignored. */) return gstring; if (LGSTRING_GLYPH_LEN (gstring_work) < topos - frompos) - gstring_work = Fmake_vector (make_fixnum (topos - frompos + 2), Qnil); + gstring_work = make_nil_vector (topos - frompos + 2); LGSTRING_SET_HEADER (gstring_work, header); LGSTRING_SET_ID (gstring_work, Qnil); fill_gstring_body (gstring_work); @@ -1917,9 +1912,9 @@ syms_of_composite (void) staticpro (&gstring_work_headers); gstring_work_headers = make_uninit_vector (8); for (i = 0; i < 8; i++) - ASET (gstring_work_headers, i, Fmake_vector (make_fixnum (i + 2), Qnil)); + ASET (gstring_work_headers, i, make_nil_vector (i + 2)); staticpro (&gstring_work); - gstring_work = Fmake_vector (make_fixnum (10), Qnil); + gstring_work = make_nil_vector (10); /* Text property `composition' should be nonsticky by default. */ Vtext_property_default_nonsticky |