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

supporting |...| symbol literal syntax

Browse source
This commit is contained in:
Alex Shinn 2011-10-31 00:30:31 +09:00
parent 0bc3c74422
commit ed76df654d
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/chibi/sexp.h
View file

@ -1154,7 +1154,7 @@ SEXP_API sexp sexp_make_cpointer (sexp ctx, sexp_uint_t type_id, void* value, se
SEXP_API sexp sexp_write_op (sexp ctx sexp_api_params(self, n), sexp obj, sexp out); SEXP_API sexp sexp_write_op (sexp ctx sexp_api_params(self, n), sexp obj, sexp out);
SEXP_API sexp sexp_display_op (sexp ctx sexp_api_params(self, n), sexp obj, sexp out); SEXP_API sexp sexp_display_op (sexp ctx sexp_api_params(self, n), sexp obj, sexp out);
SEXP_API sexp sexp_flush_output_op (sexp ctx sexp_api_params(self, n), sexp out); SEXP_API sexp sexp_flush_output_op (sexp ctx sexp_api_params(self, n), sexp out);
SEXP_API sexp sexp_read_string (sexp ctx, sexp in); SEXP_API sexp sexp_read_string (sexp ctx, sexp in, int sentinel);
SEXP_API sexp sexp_read_symbol (sexp ctx, sexp in, int init, int internp); SEXP_API sexp sexp_read_symbol (sexp ctx, sexp in, int init, int internp);
SEXP_API sexp sexp_read_number (sexp ctx, sexp in, int base); SEXP_API sexp sexp_read_number (sexp ctx, sexp in, int base);
SEXP_API sexp sexp_read_raw (sexp ctx, sexp in); SEXP_API sexp sexp_read_raw (sexp ctx, sexp in);

27
sexp.c
View file

@ -1001,9 +1001,10 @@ sexp sexp_intern(sexp ctx, const char *str, sexp_sint_t len) {
#if SEXP_USE_HUFF_SYMS #if SEXP_USE_HUFF_SYMS
res = 0; res = 0;
if (len == 0) goto normal_intern;
for ( ; i<len; i++, p++) { for ( ; i<len; i++, p++) {
c = *p; c = *p;
if ((unsigned char)c > 127) if ((unsigned char)c <= 32 || (unsigned char)c > 127 || c == '\\')
goto normal_intern; goto normal_intern;
he = huff_table[(unsigned char)c]; he = huff_table[(unsigned char)c];
newbits = he.len; newbits = he.len;
@ -1493,13 +1494,16 @@ sexp sexp_write_one (sexp ctx, sexp obj, sexp out) {
sexp_write_char(ctx, '"', out); sexp_write_char(ctx, '"', out);
break; break;
case SEXP_SYMBOL: case SEXP_SYMBOL:
i = sexp_symbol_length(obj);
str = sexp_symbol_data(obj); str = sexp_symbol_data(obj);
for ( ; i>0; str++, i--) { c = sexp_symbol_length(obj) > 0 ? EOF : '|';
if ((str[0] == '\\') || is_separator(str[0])) for (i=sexp_symbol_length(obj)-1; i>=0; i--)
sexp_write_char(ctx, '\\', out); if (str[i] <= ' ' || str[i] == '\\' || is_separator(str[i])) c = '|';
if (c!=EOF) sexp_write_char(ctx, c, out);
for (i=sexp_symbol_length(obj); i>0; str++, i--) {
if (str[0] == '\\') sexp_write_char(ctx, '\\', out);
sexp_write_char(ctx, str[0], out); sexp_write_char(ctx, str[0], out);
} }
if (c!=EOF) sexp_write_char(ctx, c, out);
break; break;
#if SEXP_USE_BIGNUMS #if SEXP_USE_BIGNUMS
case SEXP_BIGNUM: case SEXP_BIGNUM:
@ -1663,14 +1667,14 @@ sexp sexp_flush_output_op (sexp ctx sexp_api_params(self, n), sexp out) {
#define INIT_STRING_BUFFER_SIZE 128 #define INIT_STRING_BUFFER_SIZE 128
sexp sexp_read_string (sexp ctx, sexp in) { sexp sexp_read_string (sexp ctx, sexp in, int sentinel) {
int c, i=0; int c, i=0;
sexp_sint_t size=INIT_STRING_BUFFER_SIZE; sexp_sint_t size=INIT_STRING_BUFFER_SIZE;
char initbuf[INIT_STRING_BUFFER_SIZE]; char initbuf[INIT_STRING_BUFFER_SIZE];
char *buf=initbuf, *tmp; char *buf=initbuf, *tmp;
sexp res = SEXP_FALSE; sexp res = SEXP_FALSE;
for (c = sexp_read_char(ctx, in); c != '"'; c = sexp_read_char(ctx, in)) { for (c = sexp_read_char(ctx, in); c != sentinel; c = sexp_read_char(ctx, in)) {
if (c == '\\') { if (c == '\\') {
c = sexp_read_char(ctx, in); c = sexp_read_char(ctx, in);
switch (c) { switch (c) {
@ -2095,7 +2099,7 @@ sexp sexp_read_raw (sexp ctx, sexp in) {
} }
break; break;
case '"': case '"':
res = sexp_read_string(ctx, in); res = sexp_read_string(ctx, in, '"');
break; break;
case '(': case '(':
line = (sexp_port_sourcep(in) ? sexp_port_line(in) : -1); line = (sexp_port_sourcep(in) ? sexp_port_line(in) : -1);
@ -2163,7 +2167,7 @@ sexp sexp_read_raw (sexp ctx, sexp in) {
else if (!sexp_fixnump(tmp)) else if (!sexp_fixnump(tmp))
tmp = sexp_read_error(ctx, "invalid type identifier", tmp, in); tmp = sexp_read_error(ctx, "invalid type identifier", tmp, in);
} else if (c1=='"') { } else if (c1=='"') {
tmp = sexp_read_string(ctx, in); tmp = sexp_read_string(ctx, in, '"');
} else { } else {
tmp = sexp_read_error(ctx, "brace literal missing type identifier", sexp_make_character(c1), in); tmp = sexp_read_error(ctx, "brace literal missing type identifier", sexp_make_character(c1), in);
} }
@ -2389,6 +2393,11 @@ sexp sexp_read_raw (sexp ctx, sexp in) {
res = SEXP_CLOSE_BRACE; res = SEXP_CLOSE_BRACE;
break; break;
#endif #endif
case '|':
res = sexp_read_string(ctx, in, '|');
if (sexp_stringp(res))
res = sexp_intern(ctx, sexp_string_data(res), sexp_string_length(res));
break;
case '+': case '+':
case '-': case '-':
c2 = sexp_read_char(ctx, in); c2 = sexp_read_char(ctx, in);