Mercurial > hg > xemacs-beta
comparison src/frame-msw.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 | 71ee43b8a74d |
children | 8d29f1c4bb98 |
comparison
equal
deleted
inserted
replaced
5306:cde1608596d0 | 5307:c096d8051f89 |
---|---|
1091 if (EQ (prop, Qwidth)) | 1091 if (EQ (prop, Qwidth)) |
1092 { | 1092 { |
1093 maybe_error_if_job_active (f); | 1093 maybe_error_if_job_active (f); |
1094 if (!NILP (val)) | 1094 if (!NILP (val)) |
1095 { | 1095 { |
1096 CHECK_NATNUM (val); | 1096 #ifdef HAVE_BIGNUM |
1097 FRAME_MSPRINTER_CHARWIDTH (f) = XINT (val); | 1097 check_integer_range (val, Qzero, make_integer (INT_MAX)); |
1098 FRAME_MSPRINTER_CHARWIDTH (f) = | |
1099 BIGNUMP (val) ? bignum_to_int (XBIGNUM_DATA (val)) : | |
1100 XINT (val); | |
1101 #else | |
1102 CHECK_NATNUM (val); | |
1103 FRAME_MSPRINTER_CHARWIDTH (f) = XINT (val); | |
1104 #endif | |
1098 } | 1105 } |
1099 } | 1106 } |
1100 if (EQ (prop, Qheight)) | 1107 if (EQ (prop, Qheight)) |
1101 { | 1108 { |
1102 maybe_error_if_job_active (f); | 1109 maybe_error_if_job_active (f); |
1103 if (!NILP (val)) | 1110 if (!NILP (val)) |
1104 { | 1111 { |
1112 #ifdef HAVE_BIGNUM | |
1113 check_integer_range (val, Qzero, make_integer (INT_MAX)); | |
1114 FRAME_MSPRINTER_CHARHEIGHT (f) = | |
1115 BIGNUMP (val) ? bignum_to_int (XBIGNUM_DATA (val)) : | |
1116 XINT (val); | |
1117 #else | |
1105 CHECK_NATNUM (val); | 1118 CHECK_NATNUM (val); |
1106 FRAME_MSPRINTER_CHARHEIGHT (f) = XINT (val); | 1119 FRAME_MSPRINTER_CHARHEIGHT (f) = XINT (val); |
1120 #endif | |
1107 } | 1121 } |
1108 } | 1122 } |
1109 else if (EQ (prop, Qleft_margin)) | 1123 else if (EQ (prop, Qleft_margin)) |
1110 { | 1124 { |
1111 maybe_error_if_job_active (f); | 1125 maybe_error_if_job_active (f); |
1126 #ifdef HAVE_BIGNUM | |
1127 check_integer_range (val, Qzero, make_integer (INT_MAX)); | |
1128 FRAME_MSPRINTER_LEFT_MARGIN (f) = | |
1129 BIGNUMP (val) ? bignum_to_int (XBIGNUM_DATA (val)) : | |
1130 XINT (val); | |
1131 #else | |
1112 CHECK_NATNUM (val); | 1132 CHECK_NATNUM (val); |
1113 FRAME_MSPRINTER_LEFT_MARGIN (f) = XINT (val); | 1133 FRAME_MSPRINTER_LEFT_MARGIN (f) = XINT (val); |
1134 #endif | |
1114 } | 1135 } |
1115 else if (EQ (prop, Qtop_margin)) | 1136 else if (EQ (prop, Qtop_margin)) |
1116 { | 1137 { |
1117 maybe_error_if_job_active (f); | 1138 maybe_error_if_job_active (f); |
1139 #ifdef HAVE_BIGNUM | |
1140 check_integer_range (val, Qzero, make_integer (INT_MAX)); | |
1141 FRAME_MSPRINTER_TOP_MARGIN (f) = | |
1142 BIGNUMP (val) ? bignum_to_int (XBIGNUM_DATA (val)) : | |
1143 XINT (val); | |
1144 #else | |
1118 CHECK_NATNUM (val); | 1145 CHECK_NATNUM (val); |
1119 FRAME_MSPRINTER_TOP_MARGIN (f) = XINT (val); | 1146 FRAME_MSPRINTER_TOP_MARGIN (f) = XINT (val); |
1147 #endif | |
1120 } | 1148 } |
1121 else if (EQ (prop, Qright_margin)) | 1149 else if (EQ (prop, Qright_margin)) |
1122 { | 1150 { |
1123 maybe_error_if_job_active (f); | 1151 maybe_error_if_job_active (f); |
1152 #ifdef HAVE_BIGNUM | |
1153 check_integer_range (val, Qzero, make_integer (INT_MAX)); | |
1154 FRAME_MSPRINTER_RIGHT_MARGIN (f) = | |
1155 BIGNUMP (val) ? bignum_to_int (XBIGNUM_DATA (val)) : | |
1156 XINT (val); | |
1157 #else | |
1124 CHECK_NATNUM (val); | 1158 CHECK_NATNUM (val); |
1125 FRAME_MSPRINTER_RIGHT_MARGIN (f) = XINT (val); | 1159 FRAME_MSPRINTER_RIGHT_MARGIN (f) = XINT (val); |
1160 #endif | |
1126 } | 1161 } |
1127 else if (EQ (prop, Qbottom_margin)) | 1162 else if (EQ (prop, Qbottom_margin)) |
1128 { | 1163 { |
1129 maybe_error_if_job_active (f); | 1164 maybe_error_if_job_active (f); |
1165 #ifdef HAVE_BIGNUM | |
1166 check_integer_range (val, Qzero, make_integer (INT_MAX)); | |
1167 FRAME_MSPRINTER_BOTTOM_MARGIN (f) = | |
1168 BIGNUMP (val) ? bignum_to_int (XBIGNUM_DATA (val)) : | |
1169 XINT (val); | |
1170 #else | |
1130 CHECK_NATNUM (val); | 1171 CHECK_NATNUM (val); |
1131 FRAME_MSPRINTER_BOTTOM_MARGIN (f) = XINT (val); | 1172 FRAME_MSPRINTER_BOTTOM_MARGIN (f) = XINT (val); |
1173 #endif | |
1132 } | 1174 } |
1133 } | 1175 } |
1134 } | 1176 } |
1135 } | 1177 } |
1136 | 1178 |