mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-02-24 07:40:40 -08:00
Code Issues Projects Releases Packages Wiki Activity

DIGIT-CHAR complains when passed an invalid radix.

Browse source
This commit is contained in:
jgarcia 2006-11-01 17:45:08 +00:00
parent 6c64794b43
commit 1277df09fd
2 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/CHANGELOG
View file

@ -145,8 +145,8 @@ ECL 1.0:
SCALE-FLOAT, FLOAT-RADIX, FLOAT-DIGITS, INTEGER-DECODE-FLOAT, REALPART,
IMAGPART, COMPLEX, etc
- DIGIT-CHAR-P will signal an error if the radix is not an integer value
between 2 and 36, both included.
- DIGIT-CHAR-P and DIGIT-CHAR will signal an error if the radix is not an
integer value between 2 and 36, both included.
- C functions which disappear: si_set_compiled_function_name(),
si_extended_string_concatenate(), assert_type_string(),

32
src/c/character.d
View file

@ -379,18 +379,30 @@ cl_char_downcase(cl_object c)
@(return (isupper(code) ? CODE_CHAR(tolower(code)) : c))
}
@(defun digit_char (w &optional (r MAKE_FIXNUM(10)))
cl_object output;
@
/* INV: fixnnint() checks the types of `w' and `r' */
if (type_of(w) == t_bignum) {
output = Cnil;
} else {
int dw = ecl_digit_char(fixnnint(w), fixnnint(r));
output = (dw < 0)? Cnil : CODE_CHAR(dw);
@(defun digit_char (weight &optional (radix MAKE_FIXNUM(10)))
@ {
cl_fixnum basis = ecl_fixnum_in_range(@'digit-char',"radix",radix,2,36);
cl_object output = Cnil;
AGAIN:
switch (type_of(weight)) {
case t_fixnum: {
cl_fixnum value = fix(weight);
if (value >= 0) {
int dw = ecl_digit_char(value, basis);
if (dw >= 0) {
output = CODE_CHAR(dw);
}
}
break;
}
case t_bignum:
break;
default:
weight = ecl_type_error(@'digit-char',"weight",weight,@'integer');
goto AGAIN;
}
@(return output)
@)
} @)
short
ecl_digit_char(cl_fixnum w, cl_fixnum r)