aboutsummaryrefslogtreecommitdiffstats
path: root/src/lread.c
diff options
context:
space:
mode:
authorPaul Eggert2019-01-09 09:52:38 -0800
committerPaul Eggert2019-01-09 09:59:10 -0800
commita84650334e30b2451bf4a8957bf2d57ade296d4e (patch)
treeb5642bb98eb89733def116fb6d864f74855023e2 /src/lread.c
parentf9d0fd6c1953138f7473a22917a1508740b2ce40 (diff)
downloademacs-a84650334e30b2451bf4a8957bf2d57ade296d4e.tar.gz
emacs-a84650334e30b2451bf4a8957bf2d57ade296d4e.zip
Use shortcuts for Flength
When calculating the length of a Lisp object whose type is known, use a specialized length operation on it to save a bit of runtime overhead. * src/callint.c (Fcall_interactively): * src/minibuf.c (read_minibuf_unwind): Use ASIZE rather than Flength on values that must be vectors. * src/charset.c (Fsort_charsets): * src/coding.c (detect_coding_sjis): (Fdefine_coding_system_internal): * src/data.c (wrong_choice): * src/eval.c (Flet, eval_sub, Fapply, apply_lambda): * src/fns.c (sort_list): * src/font.c (font_vconcat_entity_vectors) (font_find_for_lface): * src/frame.c (Fmodify_frame_parameters): * src/fringe.c (get_logical_fringe_bitmap): * src/ftfont.c (ftfont_get_open_type_spec): * src/gtkutil.c (xg_print_frames_dialog): * src/lread.c (read1, read_vector): * src/keymap.c (Fkey_description): * src/kqueue.c (Fkqueue_add_watch): * src/macfont.m (macfont_get_open_type_spec): * src/menu.c (parse_single_submenu, x_popup_menu_1): * src/minibuf.c (Finternal_complete_buffer): * src/nsfont.m (ns_findfonts, nsfont_list_family): * src/process.c (Fmake_process): * src/search.c (Fset_match_data): * src/xfaces.c (Fx_family_fonts): Use list_length rather than Flength on values that must be lists. * src/fns.c (list_length): New function. (Flength): Use it. * src/nsfont.m (ns_findfonts): Use !NILP (x) rather than XFIXNUM (Flength (x)) != 0. * src/xdisp.c (store_mode_line_string): Use SCHARS rather than Flength on values that must be strings.
Diffstat (limited to 'src/lread.c')
-rw-r--r--src/lread.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lread.c b/src/lread.c
index 02f7caadeda..5a595f2119b 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -2879,7 +2879,7 @@ read1 (Lisp_Object readcharfun, int *pch, bool first_in_list)
2879 /* Sub char-table can't be read as a regular 2879 /* Sub char-table can't be read as a regular
2880 vector because of a two C integer fields. */ 2880 vector because of a two C integer fields. */
2881 Lisp_Object tbl, tmp = read_list (1, readcharfun); 2881 Lisp_Object tbl, tmp = read_list (1, readcharfun);
2882 ptrdiff_t size = XFIXNUM (Flength (tmp)); 2882 ptrdiff_t size = list_length (tmp);
2883 int i, depth, min_char; 2883 int i, depth, min_char;
2884 struct Lisp_Cons *cell; 2884 struct Lisp_Cons *cell;
2885 2885
@@ -3846,8 +3846,7 @@ static Lisp_Object
3846read_vector (Lisp_Object readcharfun, bool bytecodeflag) 3846read_vector (Lisp_Object readcharfun, bool bytecodeflag)
3847{ 3847{
3848 Lisp_Object tem = read_list (1, readcharfun); 3848 Lisp_Object tem = read_list (1, readcharfun);
3849 Lisp_Object len = Flength (tem); 3849 ptrdiff_t size = list_length (tem);
3850 ptrdiff_t size = XFIXNAT (len);
3851 if (bytecodeflag && size <= COMPILED_STACK_DEPTH) 3850 if (bytecodeflag && size <= COMPILED_STACK_DEPTH)
3852 error ("Invalid byte code"); 3851 error ("Invalid byte code");
3853 Lisp_Object vector = make_nil_vector (size); 3852 Lisp_Object vector = make_nil_vector (size);