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

Allowing arbitrary length #\xNNNN char literals.

Browse source
This commit is contained in:
Alex Shinn 2012-06-10 17:50:42 +09:00
parent 8d5ea4cdf4
commit dc70094472
1 changed files with 33 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sexp.c
View file

@ -2683,6 +2683,15 @@ sexp sexp_read_raw (sexp ctx, sexp in) {
goto scan_loop; goto scan_loop;
case '\\': case '\\':
c1 = sexp_read_char(ctx, in); c1 = sexp_read_char(ctx, in);
c2 = sexp_read_char(ctx, in);
sexp_push_char(ctx, c2, in);
if ((c1 == 'x' || c1 == 'X') && (sexp_isxdigit(c2))) {
res = sexp_read_number(ctx, in, 16);
if (sexp_fixnump(res) && sexp_unbox_fixnum(res) >= 0 && sexp_unbox_fixnum(res) <= 0x10FFFF)
res = sexp_make_character(sexp_unbox_fixnum(res));
else if (!sexp_exceptionp(res))
res = sexp_read_error(ctx, "bad character #\\x literal", res, in);
} else {
res = sexp_read_symbol(ctx, in, c1, 0); res = sexp_read_symbol(ctx, in, c1, 0);
if (sexp_stringp(res)) { if (sexp_stringp(res)) {
str = sexp_string_data(res); str = sexp_string_data(res);
@ -2692,11 +2701,6 @@ sexp sexp_read_raw (sexp ctx, sexp in) {
SEXP_NULL, in); SEXP_NULL, in);
if (sexp_string_length(res) == 1) { if (sexp_string_length(res) == 1) {
res = sexp_make_character(c1); res = sexp_make_character(c1);
} else if ((c1 == 'x' || c1 == 'X') &&
sexp_isxdigit((unsigned char)(str[1]))
&& sexp_isxdigit((unsigned char)(str[2])) && str[3] == '\0') {
res = sexp_make_character(16 * digit_value(str[1])
+ digit_value(str[2]));
} else { } else {
res = 0; res = 0;
for (c2=0; c2 < sexp_num_char_names; c2++) { for (c2=0; c2 < sexp_num_char_names; c2++) {
@ -2717,6 +2721,7 @@ sexp sexp_read_raw (sexp ctx, sexp in) {
} }
} }
} }
}
break; break;
case '(': case '(':
sexp_push_char(ctx, c1, in); sexp_push_char(ctx, c1, in);