aboutsummaryrefslogtreecommitdiffstats
path: root/src/data.c
diff options
context:
space:
mode:
authorPaul Eggert2013-04-01 18:54:56 -0700
committerPaul Eggert2013-04-01 18:54:56 -0700
commit7216e43b329303146455bb1dace88f8c61b1cd20 (patch)
tree900c267701eccb66398b6514816e153fb50b6a26 /src/data.c
parent4b725a70efa7ed781b6d5e466c8acc246f68f49d (diff)
downloademacs-7216e43b329303146455bb1dace88f8c61b1cd20.tar.gz
emacs-7216e43b329303146455bb1dace88f8c61b1cd20.zip
Prefer < to > in range checks such as 0 <= i && i < N.
This makes it easier to visualize quantities on a number line. This patch doesn't apply to all such range checks, only to the range checks affected by the 2013-03-24 change. This patch reverts most of the 2013-03-24 change. * alloc.c (xpalloc, Fgarbage_collect): * ccl.c (ccl_driver, resolve_symbol_ccl_program): * character.c (string_escape_byte8): * charset.c (read_hex): * data.c (cons_to_unsigned): * dispnew.c (update_frame_1): * doc.c (Fsubstitute_command_keys): * doprnt.c (doprnt): * editfns.c (hi_time, decode_time_components): * fileio.c (file_offset): * fns.c (larger_vector, make_hash_table, Fmake_hash_table): * font.c (font_intern_prop): * frame.c (x_set_alpha): * gtkutil.c (get_utf8_string): * indent.c (check_display_width): * keymap.c (Fkey_description): * lisp.h (FIXNUM_OVERFLOW_P, vcopy): * lread.c (read1): * minibuf.c (read_minibuf_noninteractive): * process.c (wait_reading_process_output): * search.c (Freplace_match): * window.c (get_phys_cursor_glyph): * xdisp.c (redisplay_internal): * xsmfns.c (smc_save_yourself_CB): Prefer < to > for range checks. * dispnew.c (sit_for): Don't mishandle NaNs. This fixes a bug introduced in the 2013-03-24 change. * editfns.c (decode_time_components): Don't hoist comparison. This fixes another bug introduced in the 2013-03-24 change.
Diffstat (limited to 'src/data.c')
-rw-r--r--src/data.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/data.c b/src/data.c
index b20d1b4c8af..6622088b648 100644
--- a/src/data.c
+++ b/src/data.c
@@ -2337,13 +2337,13 @@ cons_to_unsigned (Lisp_Object c, uintmax_t max)
2337 uintmax_t val IF_LINT (= 0); 2337 uintmax_t val IF_LINT (= 0);
2338 if (INTEGERP (c)) 2338 if (INTEGERP (c))
2339 { 2339 {
2340 valid = XINT (c) >= 0; 2340 valid = 0 <= XINT (c);
2341 val = XINT (c); 2341 val = XINT (c);
2342 } 2342 }
2343 else if (FLOATP (c)) 2343 else if (FLOATP (c))
2344 { 2344 {
2345 double d = XFLOAT_DATA (c); 2345 double d = XFLOAT_DATA (c);
2346 if (d >= 0 2346 if (0 <= d
2347 && d < (max == UINTMAX_MAX ? (double) UINTMAX_MAX + 1 : max + 1)) 2347 && d < (max == UINTMAX_MAX ? (double) UINTMAX_MAX + 1 : max + 1))
2348 { 2348 {
2349 val = d; 2349 val = d;