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

potential_number_p() did not use the fact that potential numbers must contain one digit

Browse source
This commit is contained in:
Juan Jose Garcia Ripoll 2012-11-27 22:03:47 +01:00
parent 9e0d6e50b0
commit 04bcc1414d
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/c/printer/write_symbol.d
View file

@ -24,6 +24,8 @@ potential_number_p(cl_object s, int base)
/* See ANSI 2.3.1.1 */
static cl_index i, l;
ecl_character c;
/* A potential number must contain at least one digit */
bool some_digit = FALSE;
l = s->base_string.fillp;
if (l == 0)
@ -32,7 +34,9 @@ potential_number_p(cl_object s, int base)
/* A potential number must begin with a digit, sign or
extension character (^ _) */
if ((ecl_digitp(c, base) < 0) && c != '+' && c != '-' && c != '^' && c != '_')
if (ecl_digitp(c,base) >= 0)
some_digit = TRUE;
else if (c != '+' && c != '-' && c != '^' && c != '_')
return FALSE;
/* A potential number cannot end with a sign */
@ -46,17 +50,19 @@ potential_number_p(cl_object s, int base)
* extension characters and number markers. Number
* markers are letters, but two adjacent letters fail
* to be a number marker. */
if (ecl_digitp(c, base) >= 0 || c == '+' || c == '-' ||
c == '/' || c == '.' || c == '^' || c == '_') {
if (ecl_digitp(c, base) >= 0) {
some_digit = TRUE;
} else if (c == '+' || c == '-' ||
c == '/' || c == '.' || c == '^' || c == '_') {
continue;
}
if (ecl_alpha_char_p(c) &&
(((i+1) >= l) || !ecl_alpha_char_p(ecl_char(s, i+1)))) {
} else if (ecl_alpha_char_p(c) &&
(((i+1) >= l) || !ecl_alpha_char_p(ecl_char(s, i+1)))) {
continue;
} else {
return FALSE;
}
return FALSE;
}
return TRUE;
return some_digit;
}
#define needs_to_be_inverted(s) (ecl_string_case(s) != 0)