Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-07-07 13:16:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

allowing alternate exponent markers d, f, s, l

Browse source
This commit is contained in:
Alex Shinn 2012-07-11 21:55:10 +09:00
parent 6adeccf173
commit d45ecf42ca
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sexp.c
View file

@ -39,6 +39,11 @@ static int hex_digit (int n) {
return ((n<=9) ? ('0' + n) : ('A' + n - 10)); return ((n<=9) ? ('0' + n) : ('A' + n - 10));
} }
static int is_precision_indicator(int c) {
return c=='d' || c=='D' || c=='e' || c=='E' || c=='f' || c=='F'
|| c=='l' || c=='L' || c=='s' || c=='S';
}
int sexp_is_separator(int c) { int sexp_is_separator(int c) {
return 0<c && c<0x80 && sexp_separators[c]; return 0<c && c<0x80 && sexp_separators[c];
} }
@ -2243,7 +2248,7 @@ sexp sexp_read_float_tail (sexp ctx, sexp in, double whole, int negp) {
for (; c==SEXP_PLACEHOLDER_DIGIT; c=sexp_read_char(ctx, in), scale*=0.1) for (; c==SEXP_PLACEHOLDER_DIGIT; c=sexp_read_char(ctx, in), scale*=0.1)
val += sexp_placeholder_digit_value(10)*scale; val += sexp_placeholder_digit_value(10)*scale;
#endif #endif
if (c=='e' || c=='E') { if (is_precision_indicator(c)) {
c2 = sexp_read_char(ctx, in); c2 = sexp_read_char(ctx, in);
if (c2 != '+') sexp_push_char(ctx, c2, in); if (c2 != '+') sexp_push_char(ctx, c2, in);
exponent = sexp_read_number(ctx, in, 10); exponent = sexp_read_number(ctx, in, 10);
@ -2258,7 +2263,7 @@ sexp sexp_read_float_tail (sexp ctx, sexp in, double whole, int negp) {
#else #else
res = sexp_make_fixnum((sexp_uint_t)val); res = sexp_make_fixnum((sexp_uint_t)val);
#endif #endif
if (!(c=='e' || c=='E')) { if (!is_precision_indicator(c)) {
#if SEXP_USE_COMPLEX #if SEXP_USE_COMPLEX
if (c=='i' || c=='i' || c=='+' || c=='-') { if (c=='i' || c=='i' || c=='+' || c=='-') {
sexp_push_char(ctx, c, in); sexp_push_char(ctx, c, in);
@ -2353,13 +2358,13 @@ sexp sexp_read_number (sexp ctx, sexp in, int base) {
whole = val; whole = val;
for ( ; sexp_placeholder_digit_p(c); c=sexp_read_char(ctx, in)) for ( ; sexp_placeholder_digit_p(c); c=sexp_read_char(ctx, in))
whole = whole*10 + sexp_placeholder_digit_value(base); whole = whole*10 + sexp_placeholder_digit_value(base);
if ((c=='.' || c=='e' || c=='E') && (base != 10)) if ((c=='.' || is_precision_indicator(c)) && (base != 10))
return sexp_read_error(ctx, "found non-base 10 float", SEXP_NULL, in); return sexp_read_error(ctx, "found non-base 10 float", SEXP_NULL, in);
if (c=='.') if (c=='.')
for (c=sexp_read_char(ctx, in); sexp_placeholder_digit_p(c); for (c=sexp_read_char(ctx, in); sexp_placeholder_digit_p(c);
c=sexp_read_char(ctx, in), scale*=0.1) c=sexp_read_char(ctx, in), scale*=0.1)
whole += sexp_placeholder_digit_value(10)*scale; whole += sexp_placeholder_digit_value(10)*scale;
if (c=='e' || c=='E') { if (is_precision_indicator(c)) {
sexp_push_char(ctx, c, in); sexp_push_char(ctx, c, in);
return sexp_read_float_tail(ctx, in, whole, negativep); return sexp_read_float_tail(ctx, in, whole, negativep);
} else if ((c!=EOF) && !sexp_is_separator(c)) { } else if ((c!=EOF) && !sexp_is_separator(c)) {
@ -2371,7 +2376,7 @@ sexp sexp_read_number (sexp ctx, sexp in, int base) {
} }
#endif #endif
if (c=='.' || c=='e' || c=='E') { if (c=='.' || is_precision_indicator(c)) {
if (base != 10) if (base != 10)
return sexp_read_error(ctx, "found non-base 10 float", SEXP_NULL, in); return sexp_read_error(ctx, "found non-base 10 float", SEXP_NULL, in);
if (c!='.') sexp_push_char(ctx, c, in); if (c!='.') sexp_push_char(ctx, c, in);