diff options
| author | Paul Eggert | 2018-08-27 21:27:50 -0700 |
|---|---|---|
| committer | Paul Eggert | 2018-08-27 21:45:23 -0700 |
| commit | d77d01d22902acdc45c2c7059de4f1b158ab5806 (patch) | |
| tree | 35f2b77594dc43e824852bb29598430945c5e6a4 /src/image.c | |
| parent | 9abaf5f3581ecb76f30e8a6e7ee0e9633c133d1c (diff) | |
| download | emacs-d77d01d22902acdc45c2c7059de4f1b158ab5806.tar.gz emacs-d77d01d22902acdc45c2c7059de4f1b158ab5806.zip | |
Improve bignum support for system types
Use bignums when Emacs converts to and from system types like
off_t for file sizes whose values can exceed fixnum range.
Formerly, Emacs sometimes generted floats and sometimes ad-hoc
conses of integers. Emacs still accepts floats and conses for
these system types, in case some stray Lisp code is generating
them, though this usage is obsolescent.
* doc/lispref/files.texi (File Attributes):
* doc/lispref/hash.texi (Defining Hash):
* doc/lispref/nonascii.texi (Character Sets):
* doc/lispref/os.texi (User Identification):
* doc/lispref/processes.texi (System Processes):
* etc/NEWS:
Document changes.
* src/bignum.c (mpz_set_uintmax, make_biguint)
(mpz_set_uintmax_slow, bignum_to_intmax, bignum_to_uintmax):
New functions.
(mpz_set_intmax_slow): Implement via mpz_limbs_write,
to avoid the need for an extra pass through a negative number.
* src/charset.c (Fencode_char):
* src/composite.h (LGLYPH_SET_CODE):
* src/dired.c (file_attributes):
* src/dosfns.c, src/w32.c (list_system_processes)
(system_process_attributes):
* src/editfns.c (init_editfns, Fuser_uid, Fuser_real_uid)
(Fgroup_gid, Fgroup_real_gid, Femacs_pid):
* src/emacs-module.c (check_vec_index):
* src/fns.c (Fsafe_length):
* src/process.c (record_deleted_pid, Fprocess_id):
* src/sysdep.c (list_system_processes, system_process_attributes):
* src/xselect.c (x_own_selection, selection_data_to_lisp_data):
* src/xterm.c (set_wm_state):
* src/inotify.c (inotifyevent_to_event, add_watch)
(inotify_callback):
If an integer is out of fixnum range, use a bignum
instead of converting it to a float or a cons of integers.
* src/coding.c (Fdefine_coding_system_internal):
* src/frame.c (frame_windows_min_size)
(x_set_frame_parameters):
* src/fringe.c (Fdefine_fringe_bitmap):
* src/nsterm.m (mouseDown:):
* src/syntax.c (find_defun_start):
* src/w32fns.c (x_set_undecorated, w32_createwindow)
(w32_wnd_proc, Fx_create_frame, Fx_show_tip)
(w32_console_toggle_lock_key):
* src/w32inevt.c (key_event):
* src/w32proc.c (Fw32_get_locale_info):
Do not mishandle floats by treating their addresses as their
values.
* src/data.c (store_symval_forwarding):
* src/gnutls.c (Fgnutls_error_fatalp, Fgnutls_error_string):
* src/keyboard.c (command_loop_1, make_lispy_event):
* src/lread.c (read_filtered_event, read1)
(substitute_object_recurse):
* src/window.c (Fcoordinates_in_window_p, Fwindow_at)
(window_resize_apply, Fset_window_vscroll):
* src/xdisp.c (handle_single_display_spec, try_scrolling)
(redisplay_window, calc_pixel_width_or_height)
(calc_line_height_property, on_hot_spot_p):
* src/xfaces.c (check_lface_attrs):
* src/xselect.c (x_get_local_selection, cons_to_x_long)
(lisp_data_to_selection_data, clean_local_selection_data)
(x_check_property_data, x_fill_property_data):
(x_send_client_event):
Do not reject bignums.
* src/data.c (INTBIG_TO_LISP, intbig_to_lisp)
(uintbig_to_lisp):
Remove. All uses removed.
* src/data.c (cons_to_unsigned, cons_to_signed):
* src/dbusbind.c (xd_signature, xd_extract_signed)
(xd_extract_unsigned):
* src/dispnew.c (sit_for):
* src/dosfns.c, src/w32.c (system_process_attributes):
* src/editfns.c (Fuser_full_name):
* src/fileio.c (file_offset):
* src/fileio.c (write_region):
* src/font.c (font_unparse_xlfd, font_open_for_lface, Fopen_font):
* src/frame.c (x_set_screen_gamma):
* src/frame.h (NUMVAL, FRAME_PIXEL_X_FROM_CANON_X)
(FRAME_PIXEL_Y_FROM_CANON_Y):
* src/image.c (parse_image_spec, x_edge_detection)
(compute_image_size):
* src/json.c (json_to_lisp):
* src/lcms.c (PARSE_LAB_LIST_FIELD, Flcms_cie_de2000)
(PARSE_XYZ_LIST_FIELD, PARSE_JCH_LIST_FIELD)
(PARSE_JAB_LIST_FIELD, PARSE_VIEW_CONDITION_FLOAT)
(Flcms_temp_to_white_point):
* src/nsimage.m (ns_load_image, setSizeFromSpec):
* src/process.c (Fsignal_process, handle_child_signal):
* src/sysdep.c (system_process_attributes):
* src/xdisp.c (calc_line_height_property):
Handle bignums.
* src/data.c (Fnumber_to_string): Use proper predicate name in
signal if the argument is not a number.
* src/lisp.h (make_uint): New function.
(INT_TO_INTEGER): New macro.
(FIXED_OR_FLOATP, CHECK_FIXNUM_OR_FLOAT)
(CHECK_FIXNUM_OR_FLOAT_COERCE_MARKER, INTEGER_TO_CONS)
(make_fixnum_or_float): Remove; no longer used.
* src/nsfns.m, src/w32fns.c, src/xfns.c (Fx_create_frame):
Reject floating-point min-width or min-height.
* src/process.c (handle_child_signal): Do not worry
about floating-point pids, as they are no longer generated.
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/image.c b/src/image.c index 36a909ba053..69aeab5d657 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -800,7 +800,7 @@ parse_image_spec (Lisp_Object spec, struct image_keyword *keywords, | |||
| 800 | return 0; | 800 | return 0; |
| 801 | 801 | ||
| 802 | case IMAGE_NUMBER_VALUE: | 802 | case IMAGE_NUMBER_VALUE: |
| 803 | if (! FIXED_OR_FLOATP (value)) | 803 | if (! NUMBERP (value)) |
| 804 | return 0; | 804 | return 0; |
| 805 | break; | 805 | break; |
| 806 | 806 | ||
| @@ -4929,20 +4929,20 @@ x_edge_detection (struct frame *f, struct image *img, Lisp_Object matrix, | |||
| 4929 | if (CONSP (matrix)) | 4929 | if (CONSP (matrix)) |
| 4930 | { | 4930 | { |
| 4931 | for (i = 0; | 4931 | for (i = 0; |
| 4932 | i < 9 && CONSP (matrix) && FIXED_OR_FLOATP (XCAR (matrix)); | 4932 | i < 9 && CONSP (matrix) && NUMBERP (XCAR (matrix)); |
| 4933 | ++i, matrix = XCDR (matrix)) | 4933 | ++i, matrix = XCDR (matrix)) |
| 4934 | trans[i] = XFLOATINT (XCAR (matrix)); | 4934 | trans[i] = XFLOATINT (XCAR (matrix)); |
| 4935 | } | 4935 | } |
| 4936 | else if (VECTORP (matrix) && ASIZE (matrix) >= 9) | 4936 | else if (VECTORP (matrix) && ASIZE (matrix) >= 9) |
| 4937 | { | 4937 | { |
| 4938 | for (i = 0; i < 9 && FIXED_OR_FLOATP (AREF (matrix, i)); ++i) | 4938 | for (i = 0; i < 9 && NUMBERP (AREF (matrix, i)); ++i) |
| 4939 | trans[i] = XFLOATINT (AREF (matrix, i)); | 4939 | trans[i] = XFLOATINT (AREF (matrix, i)); |
| 4940 | } | 4940 | } |
| 4941 | 4941 | ||
| 4942 | if (NILP (color_adjust)) | 4942 | if (NILP (color_adjust)) |
| 4943 | color_adjust = make_fixnum (0xffff / 2); | 4943 | color_adjust = make_fixnum (0xffff / 2); |
| 4944 | 4944 | ||
| 4945 | if (i == 9 && FIXED_OR_FLOATP (color_adjust)) | 4945 | if (i == 9 && NUMBERP (color_adjust)) |
| 4946 | x_detect_edges (f, img, trans, XFLOATINT (color_adjust)); | 4946 | x_detect_edges (f, img, trans, XFLOATINT (color_adjust)); |
| 4947 | } | 4947 | } |
| 4948 | 4948 | ||
| @@ -8103,7 +8103,7 @@ compute_image_size (size_t width, size_t height, | |||
| 8103 | double scale = 1; | 8103 | double scale = 1; |
| 8104 | 8104 | ||
| 8105 | value = image_spec_value (spec, QCscale, NULL); | 8105 | value = image_spec_value (spec, QCscale, NULL); |
| 8106 | if (FIXED_OR_FLOATP (value)) | 8106 | if (NUMBERP (value)) |
| 8107 | scale = XFLOATINT (value); | 8107 | scale = XFLOATINT (value); |
| 8108 | 8108 | ||
| 8109 | value = image_spec_value (spec, QCmax_width, NULL); | 8109 | value = image_spec_value (spec, QCmax_width, NULL); |