comparison src/font-mgr.c @ 5307:c096d8051f89

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 b65692aa90d8
children 17c381a2f377
comparison
equal deleted inserted replaced
5306:cde1608596d0 5307:c096d8051f89
409 (pattern, property, id, type)) 409 (pattern, property, id, type))
410 { 410 {
411 Extbyte *fc_property; 411 Extbyte *fc_property;
412 FcResult fc_result; 412 FcResult fc_result;
413 FcValue fc_value; 413 FcValue fc_value;
414 int int_id = 0;
414 415
415 /* 416 /*
416 process arguments 417 process arguments
417 */ 418 */
418 CHECK_FC_PATTERN (pattern); 419 CHECK_FC_PATTERN (pattern);
433 list2 (Qsymbolp, Qobject))) 434 list2 (Qsymbolp, Qobject)))
434 or something like that? */ 435 or something like that? */
435 dead_wrong_type_argument (Qstringp, property); 436 dead_wrong_type_argument (Qstringp, property);
436 } 437 }
437 438
438 if (!NILP (id)) CHECK_NATNUM (id); 439 if (!NILP (id))
440 {
441 #ifdef HAVE_BIGNUM
442 check_integer_range (id, Qzero, make_integer (INT_MAX));
443 int_id = BIGNUMP (id) ? bignum_to_int (id) : XINT (id);
444 #else
445 check_integer_range (id, Qzero, make_integer (EMACS_INT_MAX));
446 int_id = XINT (id);
447 #endif
448 }
439 if (!NILP (type)) CHECK_SYMBOL (type); 449 if (!NILP (type)) CHECK_SYMBOL (type);
440 450
441 /* get property */ 451 /* get property */
442 fc_result = FcPatternGet (XFC_PATTERN_PTR (pattern), 452 fc_result = FcPatternGet (XFC_PATTERN_PTR (pattern),
443 fc_property, 453 fc_property, int_id, &fc_value);
444 NILP (id) ? 0 : XINT (id),
445 &fc_value);
446 454
447 switch (fc_result) 455 switch (fc_result)
448 { 456 {
449 case FcResultMatch: 457 case FcResultMatch:
450 /* wrap it and return */ 458 /* wrap it and return */