Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-05-18 21:29:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make write/display output bytevectors with hex constants (issue #483)

Browse source
This commit is contained in:
Marc Nieper-Wisskirchen 2018-11-06 14:22:38 +01:00
parent 3f9dfb7837
commit f9be5c8d46
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/chibi/features.h
View file

@ -568,6 +568,11 @@
#define SEXP_USE_BYTEVECTOR_LITERALS ! SEXP_USE_NO_FEATURES #define SEXP_USE_BYTEVECTOR_LITERALS ! SEXP_USE_NO_FEATURES
#endif #endif
#ifndef SEXP_BYTEVECTOR_HEX_LITERALS
#define SEXP_BYTEVECTOR_HEX_LITERALS SEXP_USE_BYTEVECTOR_LITERALS
#endif
#ifndef SEXP_USE_SELF_PARAMETER #ifndef SEXP_USE_SELF_PARAMETER
#define SEXP_USE_SELF_PARAMETER 1 #define SEXP_USE_SELF_PARAMETER 1
#endif #endif

10
sexp.c
View file

@ -1884,6 +1884,9 @@ sexp sexp_write_one (sexp ctx, sexp obj, sexp out) {
sexp_sint_t i=0; sexp_sint_t i=0;
#if SEXP_USE_FLONUMS #if SEXP_USE_FLONUMS
double f, ftmp; double f, ftmp;
#endif
#if SEXP_USE_BYTEVECTOR_LITERALS && SEXP_BYTEVECTOR_HEX_LITERALS
char buf[5];
#endif #endif
sexp x, *elts; sexp x, *elts;
char *str=NULL, numbuf[NUMBUF_LEN]; char *str=NULL, numbuf[NUMBUF_LEN];
@ -2065,7 +2068,12 @@ sexp sexp_write_one (sexp ctx, sexp obj, sexp out) {
len = sexp_bytes_length(obj); len = sexp_bytes_length(obj);
for (i=0; i<(sexp_sint_t)len; i++) { for (i=0; i<(sexp_sint_t)len; i++) {
if (i!=0) sexp_write_char(ctx, ' ', out); if (i!=0) sexp_write_char(ctx, ' ', out);
#if SEXP_BYTEVECTOR_HEX_LITERALS
sprintf(buf, "#x%02hhX", ((unsigned char*) str)[i]);
sexp_write_string(ctx, buf, out);
#else
sexp_write(ctx, sexp_make_fixnum(((unsigned char*)str)[i]), out); sexp_write(ctx, sexp_make_fixnum(((unsigned char*)str)[i]), out);
#endif
} }
sexp_write_char(ctx, ')', out); sexp_write_char(ctx, ')', out);
break; break;
@ -2254,7 +2262,7 @@ sexp sexp_read_string (sexp ctx, sexp in, int sentinel) {
case 'a': c = '\a'; break; case 'a': c = '\a'; break;
case 'b': c = '\b'; break; case 'b': c = '\b'; break;
case 'n': c = '\n'; break; case 'n': c = '\n'; break;
case 'r': c = '\r'; break; case 'r': c = '\r'; break;
case 't': c = '\t'; break; case 't': c = '\t'; break;
case 'x': case 'X': case 'x': case 'X':
res = sexp_read_number(ctx, in, 16, 0); res = sexp_read_number(ctx, in, 16, 0);