comparison src/data.c @ 171:929b76928fce r20-3b12

Import from CVS: tag r20-3b12
author cvs
date Mon, 13 Aug 2007 09:47:52 +0200
parents 15872534500d
children 8eaf7971accc
comparison
equal deleted inserted replaced
170:98a42ee61975 171:929b76928fce
958 (XCOMPILED_FUNCTION (function)))); 958 (XCOMPILED_FUNCTION (function))));
959 } 959 }
960 960
961 DEFUN ("compiled-function-doc-string", Fcompiled_function_doc_string, 1, 1, 0, /* 961 DEFUN ("compiled-function-doc-string", Fcompiled_function_doc_string, 1, 1, 0, /*
962 Return the doc string of the compiled-function object, if available. 962 Return the doc string of the compiled-function object, if available.
963 Functions that had their doc strings snarfed into the DOC file will have
964 an integer returned instead of a string.
963 */ 965 */
964 (function)) 966 (function))
965 { 967 {
966 CHECK_COMPILED_FUNCTION (function); 968 CHECK_COMPILED_FUNCTION (function);
967 if (!XCOMPILED_FUNCTION (function)->flags.interactivep) 969
968 return Qnil; 970 return compiled_function_documentation (XCOMPILED_FUNCTION (function));
969 return (list2 (Qinteractive,
970 compiled_function_interactive
971 (XCOMPILED_FUNCTION (function))));
972 } 971 }
973 972
974 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK 973 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK
975 974
976 DEFUN ("compiled-function-annotation", Fcompiled_function_annotation, 1, 1, 0, /* 975 DEFUN ("compiled-function-annotation", Fcompiled_function_annotation, 1, 1, 0, /*
1284 b = 10; 1283 b = 10;
1285 else 1284 else
1286 { 1285 {
1287 CHECK_INT (base); 1286 CHECK_INT (base);
1288 b = XINT (base); 1287 b = XINT (base);
1289 if (b < 2 || b > 16) 1288 check_int_range (b, 2, 16);
1290 Fsignal (Qargs_out_of_range, Fcons (base, Qnil));
1291 } 1289 }
1292 1290
1293 p = (char *) XSTRING_DATA (string); 1291 p = (char *) XSTRING_DATA (string);
1294 1292
1295 /* Skip any whitespace at the front of the number. Some versions of 1293 /* Skip any whitespace at the front of the number. Some versions of
1300 #ifdef LISP_FLOAT_TYPE 1298 #ifdef LISP_FLOAT_TYPE
1301 if (isfloat_string (p)) 1299 if (isfloat_string (p))
1302 return make_float (atof (p)); 1300 return make_float (atof (p));
1303 #endif /* LISP_FLOAT_TYPE */ 1301 #endif /* LISP_FLOAT_TYPE */
1304 1302
1305 if (XINT(base) == 10) 1303 if (b == 10)
1306 { 1304 {
1307 /* Use the system-provided functions for base 10. */ 1305 /* Use the system-provided functions for base 10. */
1308 Lisp_Object value; 1306 Lisp_Object value;
1309 if (sizeof (int) == sizeof (EMACS_INT)) 1307 if (sizeof (int) == sizeof (EMACS_INT))
1310 XSETINT (value, atoi (p)); 1308 XSETINT (value, atoi (p));