Mercurial > hg > xemacs-beta

comparison src/data.c @ 4990:8f0cf4fd3d2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automatic merge
author Ben Wing <ben@xemacs.org>
date Sat, 06 Feb 2010 04:01:46 -0600
parents 16112448d484
children b46c89ccbed3
comparison
equal deleted inserted replaced
4989:d2ec55325515 4990:8f0cf4fd3d2c
79 if (debug_issue_ebola_notices 79 if (debug_issue_ebola_notices
80 && ((CHARP (obj1) && INTP (obj2)) || (CHARP (obj2) && INTP (obj1)))) 80 && ((CHARP (obj1) && INTP (obj2)) || (CHARP (obj2) && INTP (obj1))))
81 { 81 {
82 /* #### It would be really nice if this were a proper warning 82 /* #### It would be really nice if this were a proper warning
83 instead of brain-dead print to Qexternal_debugging_output. */ 83 instead of brain-dead print to Qexternal_debugging_output. */
84 write_c_string 84 write_msg_string
85 (Qexternal_debugging_output, 85 (Qexternal_debugging_output,
86 "Comparison between integer and character is constant nil ("); 86 "Comparison between integer and character is constant nil (");
87 Fprinc (obj1, Qexternal_debugging_output); 87 Fprinc (obj1, Qexternal_debugging_output);
88 write_c_string (Qexternal_debugging_output, " and "); 88 write_msg_string (Qexternal_debugging_output, " and ");
89 Fprinc (obj2, Qexternal_debugging_output); 89 Fprinc (obj2, Qexternal_debugging_output);
90 write_c_string (Qexternal_debugging_output, ")\n"); 90 write_msg_string (Qexternal_debugging_output, ")\n");
91 debug_short_backtrace (debug_ebola_backtrace_length); 91 debug_short_backtrace (debug_ebola_backtrace_length);
92 } 92 }
93 return EQ (obj1, obj2); 93 return EQ (obj1, obj2);
94 } 94 }
95 95
363 (subr)) 363 (subr))
364 { 364 {
365 const CIbyte *prompt; 365 const CIbyte *prompt;
366 CHECK_SUBR (subr); 366 CHECK_SUBR (subr);
367 prompt = XSUBR (subr)->prompt; 367 prompt = XSUBR (subr)->prompt;
368 return prompt ? list2 (Qinteractive, build_msg_string (prompt)) : Qnil; 368 return prompt ? list2 (Qinteractive, build_msg_cistring (prompt)) : Qnil;
369 } 369 }
370 370
371 371
372 DEFUN ("characterp", Fcharacterp, 1, 1, 0, /* 372 DEFUN ("characterp", Fcharacterp, 1, 1, 0, /*
373 Return t if OBJECT is a character. 373 Return t if OBJECT is a character.
1222 { 1222 {
1223 CHECK_NUMBER (number); 1223 CHECK_NUMBER (number);
1224 1224
1225 if (FLOATP (number)) 1225 if (FLOATP (number))
1226 { 1226 {
1227 char pigbuf[350]; /* see comments in float_to_string */ 1227 Ascbyte pigbuf[350]; /* see comments in float_to_string */
1228 1228
1229 float_to_string (pigbuf, XFLOAT_DATA (number)); 1229 float_to_string (pigbuf, XFLOAT_DATA (number));
1230 return build_string (pigbuf); 1230 return build_ascstring (pigbuf);
1231 } 1231 }
1232 #ifdef HAVE_BIGNUM 1232 #ifdef HAVE_BIGNUM
1233 if (BIGNUMP (number)) 1233 if (BIGNUMP (number))
1234 { 1234 {
1235 char *str = bignum_to_string (XBIGNUM_DATA (number), 10); 1235 Ascbyte *str = bignum_to_string (XBIGNUM_DATA (number), 10);
1236 Lisp_Object retval = build_string (str); 1236 Lisp_Object retval = build_ascstring (str);
1237 xfree (str, char *); 1237 xfree (str);
1238 return retval; 1238 return retval;
1239 } 1239 }
1240 #endif 1240 #endif
1241 #ifdef HAVE_RATIO 1241 #ifdef HAVE_RATIO
1242 if (RATIOP (number)) 1242 if (RATIOP (number))
1243 { 1243 {
1244 char *str = ratio_to_string (XRATIO_DATA (number), 10); 1244 Ascbyte *str = ratio_to_string (XRATIO_DATA (number), 10);
1245 Lisp_Object retval = build_string (str); 1245 Lisp_Object retval = build_ascstring (str);
1246 xfree (str, char *); 1246 xfree (str);
1247 return retval; 1247 return retval;
1248 } 1248 }
1249 #endif 1249 #endif
1250 #ifdef HAVE_BIGFLOAT 1250 #ifdef HAVE_BIGFLOAT
1251 if (BIGFLOATP (number)) 1251 if (BIGFLOATP (number))
1252 { 1252 {
1253 char *str = bigfloat_to_string (XBIGFLOAT_DATA (number), 10); 1253 Ascbyte *str = bigfloat_to_string (XBIGFLOAT_DATA (number), 10);
1254 Lisp_Object retval = build_string (str); 1254 Lisp_Object retval = build_ascstring (str);
1255 xfree (str, char *); 1255 xfree (str);
1256 return retval; 1256 return retval;
1257 } 1257 }
1258 #endif 1258 #endif
1259 1259
1260 { 1260 {
1261 char buffer[DECIMAL_PRINT_SIZE (long)]; 1261 Ascbyte buffer[DECIMAL_PRINT_SIZE (long)];
1262 1262
1263 long_to_string (buffer, XINT (number)); 1263 long_to_string (buffer, XINT (number));
1264 return build_string (buffer); 1264 return build_ascstring (buffer);
1265 } 1265 }
1266 } 1266 }
1267 1267
1268 #ifndef HAVE_BIGNUM 1268 #ifndef HAVE_BIGNUM
1269 static int 1269 static int