Mercurial > hg > xemacs-beta

comparison src/data.c @ 5307:c096d8051f89

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Have NATNUMP give t for positive bignums; check limits appropriately. src/ChangeLog addition: 2010-11-20 Aidan Kehoe <kehoea@parhasard.net> * abbrev.c (Fexpand_abbrev): * alloc.c: * alloc.c (Fmake_list): * alloc.c (Fmake_vector): * alloc.c (Fmake_bit_vector): * alloc.c (Fmake_byte_code): * alloc.c (Fmake_string): * alloc.c (vars_of_alloc): * bytecode.c (UNUSED): * bytecode.c (Fbyte_code): * chartab.c (decode_char_table_range): * cmds.c (Fself_insert_command): * data.c (check_integer_range): * data.c (Fnatnump): * data.c (Fnonnegativep): * data.c (Fstring_to_number): * elhash.c (hash_table_size_validate): * elhash.c (decode_hash_table_size): * eval.c (Fbacktrace_frame): * event-stream.c (lisp_number_to_milliseconds): * event-stream.c (Faccept_process_output): * event-stream.c (Frecent_keys): * event-stream.c (Fdispatch_event): * events.c (Fmake_event): * events.c (Fevent_timestamp): * events.c (Fevent_timestamp_lessp): * events.h: * events.h (struct command_builder): * file-coding.c (gzip_putprop): * fns.c: * fns.c (check_sequence_range): * fns.c (Frandom): * fns.c (Fnthcdr): * fns.c (Flast): * fns.c (Fnbutlast): * fns.c (Fbutlast): * fns.c (Fmember): * fns.c (Ffill): * fns.c (Freduce): * fns.c (replace_string_range_1): * fns.c (Freplace): * font-mgr.c (Ffc_pattern_get): * frame-msw.c (msprinter_set_frame_properties): * glyphs.c (check_valid_xbm_inline): * indent.c (Fmove_to_column): * intl-win32.c (mswindows_multibyte_to_unicode_putprop): * lisp.h: * lisp.h (ARRAY_DIMENSION_LIMIT): * lread.c (decode_mode_1): * mule-ccl.c (ccl_get_compiled_code): * number.h: * process-unix.c (unix_open_multicast_group): * process.c (Fset_process_window_size): * profile.c (Fstart_profiling): * unicode.c (Funicode_to_char): Change NATNUMP to return 1 for positive bignums; changes uses of it and of CHECK_NATNUM appropriately, usually by checking for an integer in an appropriate range. Add array-dimension-limit and use it in #'make-vector, #'make-string. Add array-total-size-limit, array-rank-limit while we're at it, for the sake of any Common Lisp-oriented code that uses these limits. Rename check_int_range to check_integer_range, have it take Lisp_Objects (and thus bignums) instead. Remove bignum_butlast(), just set int_n to an appropriately large integer if N is a bignum. Accept bignums in check_sequence_range(), change the functions that use check_sequence_range() appropriately. Move the definition of NATNUMP() to number.h; document why it's a reasonable name, contradicting an old comment. tests/ChangeLog addition: 2010-11-20 Aidan Kehoe <kehoea@parhasard.net> * automated/lisp-tests.el: * automated/lisp-tests.el (featurep): * automated/lisp-tests.el (wrong-type-argument): * automated/mule-tests.el (featurep): Check for args-out-of-range errors instead of wrong-type-argument errors in various places when code is handed a large bignum instead of a fixnum. Also check for the wrong-type-argument errors when giving the same code a non-integer value.
author Aidan Kehoe <kehoea@parhasard.net>
date Sat, 20 Nov 2010 16:49:11 +0000
parents 1096ef427b56
children 47298dcf2e8f 8d29f1c4bb98
comparison
equal deleted inserted replaced
5306:cde1608596d0 5307:c096d8051f89
156 { 156 {
157 signal_error_1 (Qargs_out_of_range, list3 (a1, a2, a3)); 157 signal_error_1 (Qargs_out_of_range, list3 (a1, a2, a3));
158 } 158 }
159 159
160 void 160 void
161 check_int_range (EMACS_INT val, EMACS_INT min, EMACS_INT max) 161 check_integer_range (Lisp_Object val, Lisp_Object min, Lisp_Object max)
162 { 162 {
163 if (val < min || val > max) 163 Lisp_Object args[] = { min, val, max };
164 args_out_of_range_3 (make_int (val), make_int (min), make_int (max)); 164 int ii;
165
166 for (ii = 0; ii < countof (args); ii++)
167 {
168 CHECK_INTEGER (args[ii]);
169 }
170
171 if (NILP (Fleq (countof (args), args)))
172 args_out_of_range_3 (val, min, max);
165 } 173 }
166 174
167 175
168 /* Data type predicates */ 176 /* Data type predicates */
169 177
502 DEFUN ("natnump", Fnatnump, 1, 1, 0, /* 510 DEFUN ("natnump", Fnatnump, 1, 1, 0, /*
503 Return t if OBJECT is a nonnegative integer. 511 Return t if OBJECT is a nonnegative integer.
504 */ 512 */
505 (object)) 513 (object))
506 { 514 {
507 return NATNUMP (object) 515 return NATNUMP (object) ? Qt : Qnil;
508 #ifdef HAVE_BIGNUM
509 || (BIGNUMP (object) && bignum_sign (XBIGNUM_DATA (object)) >= 0)
510 #endif
511 ? Qt : Qnil;
512 } 516 }
513 517
514 DEFUN ("nonnegativep", Fnonnegativep, 1, 1, 0, /* 518 DEFUN ("nonnegativep", Fnonnegativep, 1, 1, 0, /*
515 Return t if OBJECT is a nonnegative number. 519 Return t if OBJECT is a nonnegative number.
516 */ 520 */
517 (object)) 521 (object))
518 { 522 {
519 return NATNUMP (object) 523 return NATNUMP (object)
520 #ifdef HAVE_BIGNUM
521 || (BIGNUMP (object) && bignum_sign (XBIGNUM_DATA (object)) >= 0)
522 #endif
523 #ifdef HAVE_RATIO 524 #ifdef HAVE_RATIO
524 || (RATIOP (object) && ratio_sign (XRATIO_DATA (object)) >= 0) 525 || (RATIOP (object) && ratio_sign (XRATIO_DATA (object)) >= 0)
525 #endif 526 #endif
526 #ifdef HAVE_BIGFLOAT 527 #ifdef HAVE_BIGFLOAT
527 || (BIGFLOATP (object) && bigfloat_sign (XBIGFLOAT_DATA (object)) >= 0) 528 || (BIGFLOATP (object) && bigfloat_sign (XBIGFLOAT_DATA (object)) >= 0)
1293 1294
1294 if (NILP (base)) 1295 if (NILP (base))
1295 b = 10; 1296 b = 10;
1296 else 1297 else
1297 { 1298 {
1298 CHECK_INT (base); 1299 check_integer_range (base, make_int (2), make_int (16));
1299 b = XINT (base); 1300 b = XINT (base);
1300 check_int_range (b, 2, 16);
1301 } 1301 }
1302 1302
1303 p = XSTRING_DATA (string); 1303 p = XSTRING_DATA (string);
1304 1304
1305 /* Skip any whitespace at the front of the number. Some versions of 1305 /* Skip any whitespace at the front of the number. Some versions of