ref: 6c5612066944564cde6c4de8ff6e93a5759f08b5
parent: 76edead57b93fa867dd655c6fca3f759db1d0885
author: JeffBezanson <[email protected]>
date: Mon Feb 23 21:21:16 EST 2009
better solution for allowing an input stream to be relocated while reading from it improving prettyprinting of lists of short strings
--- a/femtolisp/flisp.c
+++ b/femtolisp/flisp.c
@@ -82,6 +82,7 @@
typedef struct _readstate_t {htable_t backrefs;
htable_t gensyms;
+ value_t source;
struct _readstate_t *prev;
} readstate_t;
static readstate_t *readstate = NULL;
@@ -470,6 +471,7 @@
rs->backrefs.table[i] = (void*)relocate((value_t)rs->backrefs.table[i]);
for(i=0; i < rs->gensyms.size; i++)
rs->gensyms.table[i] = (void*)relocate((value_t)rs->gensyms.table[i]);
+ rs->source = relocate(rs->source);
rs = rs->prev;
}
lasterror = relocate(lasterror);
@@ -1543,6 +1545,8 @@
int locale_is_utf8;
+extern value_t fl_file(value_t *args, uint32_t nargs);
+
int main(int argc, char *argv[])
{value_t e, v;
@@ -1559,17 +1563,20 @@
}
strcat(fname_buf, "system.lsp");
- ios_t fi; ios_t *f = &fi;
FL_TRY {// install toplevel exception handler
- f = ios_file(f, fname_buf, 1, 0, 0, 0);
- if (f == NULL) lerror(IOError, "file \"%s\" not found", fname_buf);
+ PUSH(cvalue_static_cstring(fname_buf));
+ PUSH(symbol(":read"));+ value_t f = fl_file(&Stack[SP-2], 2);
+ POPN(2);
+ PUSH(f);
while (1) {- e = read_sexpr(f);
- if (ios_eof(f)) break;
+ e = read_sexpr(Stack[SP-1]);
+ if (ios_eof(value2c(ios_t*,Stack[SP-1]))) break;
v = toplevel_eval(e);
}
- ios_close(f);
+ ios_close(value2c(ios_t*,Stack[SP-1]));
+ (void)POP();
PUSH(symbol_value(symbol("__start")));PUSH(argv_list(argc, argv));
--- a/femtolisp/flisp.h
+++ b/femtolisp/flisp.h
@@ -120,7 +120,7 @@
extern value_t NIL, FL_T, FL_F;
/* read, eval, print main entry points */
-value_t read_sexpr(ios_t *f);
+value_t read_sexpr(value_t f);
void print(ios_t *f, value_t v, int princ);
value_t toplevel_eval(value_t expr);
value_t apply(value_t f, value_t l);
--- a/femtolisp/iostream.c
+++ b/femtolisp/iostream.c
@@ -85,15 +85,8 @@
PUSH(symbol_value(instrsym));
args = &Stack[SP-1];
}
- ios_t *s = toiostream(args[0], "read");
- // temporarily pin the stream while reading
- ios_t temp = *s;
- if (s->buf == &s->local[0])
- temp.buf = &temp.local[0];
- value_t v = read_sexpr(&temp);
- s = value2c(ios_t*, args[0]);
- *s = temp;
- return v;
+ (void)toiostream(args[0], "read");
+ return read_sexpr(args[0]);
}
value_t fl_iogetc(value_t *args, u_int32_t nargs)
--- a/femtolisp/print.c
+++ b/femtolisp/print.c
@@ -139,10 +139,13 @@
pathological or deeply-nested expressions, but those are difficult
to print anyway.
*/
+#define SMALL_STR_LEN 20
static inline int tinyp(value_t v)
{if (issymbol(v))
- return (u8_strwidth(symbol_name(v)) < 20);
+ return (u8_strwidth(symbol_name(v)) < SMALL_STR_LEN);
+ if (isstring(v))
+ return (cv_len((cvalue_t*)ptr(v)) < SMALL_STR_LEN);
return (isfixnum(v) || isbuiltinish(v));
}
--- a/femtolisp/read.c
+++ b/femtolisp/read.c
@@ -6,6 +6,8 @@
TOK_SHARPSEMI
};
+#define F value2c(ios_t*,readstate->source)
+
// defines which characters are ordinary symbol characters.
// exceptions are '.', which is an ordinary symbol character
// unless it's the only character in the symbol, and '#', which is
@@ -85,13 +87,13 @@
static value_t tokval;
static char buf[256];
-static char nextchar(ios_t *f)
+static char nextchar()
{int ch;
char c;
do {- ch = ios_getc(f);
+ ch = ios_getc(F);
if (ch == IOS_EOF)
return 0;
c = (char)ch;
@@ -98,7 +100,7 @@
if (c == ';') {// single-line comment
do {- ch = ios_getc(f);
+ ch = ios_getc(F);
if (ch == IOS_EOF)
return 0;
} while ((char)ch != '\n');
@@ -121,13 +123,13 @@
}
// return: 1 if escaped (forced to be symbol)
-static int read_token(ios_t *f, char c, int digits)
+static int read_token(char c, int digits)
{int i=0, ch, escaped=0, issym=0, first=1;
while (1) { if (!first) {- ch = ios_getc(f);
+ ch = ios_getc(F);
if (ch == IOS_EOF)
goto terminate;
c = (char)ch;
@@ -139,7 +141,7 @@
}
else if (c == '\\') {issym = 1;
- ch = ios_getc(f);
+ ch = ios_getc(F);
if (ch == IOS_EOF)
goto terminate;
accumchar((char)ch, &i);
@@ -151,13 +153,13 @@
accumchar(c, &i);
}
}
- ios_ungetc(c, f);
+ ios_ungetc(c, F);
terminate:
buf[i++] = '\0';
return issym;
}
-static u_int32_t peek(ios_t *f)
+static u_int32_t peek()
{char c, *end;
fixnum_t x;
@@ -165,8 +167,8 @@
if (toktype != TOK_NONE)
return toktype;
- c = nextchar(f);
- if (ios_eof(f)) return TOK_NONE;
+ c = nextchar();
+ if (ios_eof(F)) return TOK_NONE;
if (c == '(') {toktype = TOK_OPEN;
}
@@ -189,7 +191,7 @@
toktype = TOK_DOUBLEQUOTE;
}
else if (c == '#') {- ch = ios_getc(f); c = (char)ch;
+ ch = ios_getc(F); c = (char)ch;
if (ch == IOS_EOF)
lerror(ParseError, "read: invalid read macro");
if (c == '.') {@@ -200,7 +202,7 @@
}
else if (c == '\\') {uint32_t cval;
- if (ios_getutf8(f, &cval) == IOS_EOF)
+ if (ios_getutf8(F, &cval) == IOS_EOF)
lerror(ParseError, "read: end of input in character constant");
toktype = TOK_NUM;
tokval = mk_wchar(cval);
@@ -212,8 +214,8 @@
lerror(ParseError, "read: unreadable object");
}
else if (isdigit(c)) {- read_token(f, c, 1);
- c = (char)ios_getc(f);
+ read_token(c, 1);
+ c = (char)ios_getc(F);
if (c == '#')
toktype = TOK_BACKREF;
else if (c == '=')
@@ -229,20 +231,20 @@
else if (c == '!') {// #! single line comment for shbang script support
do {- ch = ios_getc(f);
+ ch = ios_getc(F);
} while (ch != IOS_EOF && (char)ch != '\n');
- return peek(f);
+ return peek();
}
else if (c == '|') {// multiline comment
int commentlevel=1;
while (1) {- ch = ios_getc(f);
+ ch = ios_getc(F);
hashpipe_gotc:
if (ch == IOS_EOF)
lerror(ParseError, "read: eof within comment");
if ((char)ch == '|') {- ch = ios_getc(f);
+ ch = ios_getc(F);
if ((char)ch == '#') {commentlevel--;
if (commentlevel == 0)
@@ -253,7 +255,7 @@
goto hashpipe_gotc;
}
else if ((char)ch == '#') {- ch = ios_getc(f);
+ ch = ios_getc(F);
if ((char)ch == '|')
commentlevel++;
else
@@ -261,7 +263,7 @@
}
}
// this was whitespace, so keep peeking
- return peek(f);
+ return peek();
}
else if (c == ';') {toktype = TOK_SHARPSEMI;
@@ -268,10 +270,10 @@
}
else if (c == ':') {// gensym
- ch = ios_getc(f);
+ ch = ios_getc(F);
if ((char)ch == 'g')
- ch = ios_getc(f);
- read_token(f, (char)ch, 0);
+ ch = ios_getc(F);
+ read_token((char)ch, 0);
errno = 0;
x = strtol(buf, &end, 10);
if (*end != '\0' || buf[0] == '\0' || errno)
@@ -280,7 +282,7 @@
tokval = fixnum(x);
}
else if (symchar(c)) {- read_token(f, ch, 0);
+ read_token(ch, 0);
if (((c == 'b' && (base= 2)) ||
(c == 'o' && (base= 8)) ||
@@ -300,7 +302,7 @@
}
else if (c == ',') {toktype = TOK_COMMA;
- ch = ios_getc(f);
+ ch = ios_getc(F);
if (ch == IOS_EOF)
return toktype;
if ((char)ch == '@')
@@ -308,10 +310,10 @@
else if ((char)ch == '.')
toktype = TOK_COMMADOT;
else
- ios_ungetc((char)ch, f);
+ ios_ungetc((char)ch, F);
}
else {- if (!read_token(f, c, 0)) {+ if (!read_token(c, 0)) { if (buf[0]=='.' && buf[1]=='\0') {return (toktype=TOK_DOT);
}
@@ -326,9 +328,9 @@
return toktype;
}
-static value_t do_read_sexpr(ios_t *f, value_t label);
+static value_t do_read_sexpr(value_t label);
-static value_t read_vector(ios_t *f, value_t label, u_int32_t closer)
+static value_t read_vector(value_t label, u_int32_t closer)
{value_t v=alloc_vector(4, 1), elt;
u_int32_t i=0;
@@ -335,12 +337,12 @@
PUSH(v);
if (label != UNBOUND)
ptrhash_put(&readstate->backrefs, (void*)label, (void*)v);
- while (peek(f) != closer) {- if (ios_eof(f))
+ while (peek() != closer) {+ if (ios_eof(F))
lerror(ParseError, "read: unexpected end of input");
if (i >= vector_size(v))
Stack[SP-1] = vector_grow(v);
- elt = do_read_sexpr(f, UNBOUND);
+ elt = do_read_sexpr(UNBOUND);
v = Stack[SP-1];
vector_elt(v,i) = elt;
i++;
@@ -350,7 +352,7 @@
return POP();
}
-static value_t read_string(ios_t *f)
+static value_t read_string()
{char *buf, *temp;
char eseq[10];
@@ -370,7 +372,7 @@
}
buf = temp;
}
- c = ios_getc(f);
+ c = ios_getc(F);
if (c == IOS_EOF) {free(buf);
lerror(ParseError, "read: unexpected end of input in string");
@@ -378,7 +380,7 @@
if (c == '"')
break;
else if (c == '\\') {- c = ios_getc(f);
+ c = ios_getc(F);
if (c == IOS_EOF) {free(buf);
lerror(ParseError, "read: end of input in escape sequence");
@@ -387,9 +389,9 @@
if (octal_digit(c)) { do {eseq[j++] = c;
- c = ios_getc(f);
+ c = ios_getc(F);
} while (octal_digit(c) && j<3 && (c!=IOS_EOF));
- if (c!=IOS_EOF) ios_ungetc(c, f);
+ if (c!=IOS_EOF) ios_ungetc(c, F);
eseq[j] = '\0';
wc = strtol(eseq, NULL, 8);
// \DDD and \xXX read bytes, not characters
@@ -398,12 +400,12 @@
else if ((c=='x' && (ndig=2)) ||
(c=='u' && (ndig=4)) ||
(c=='U' && (ndig=8))) {- c = ios_getc(f);
+ c = ios_getc(F);
while (hex_digit(c) && j<ndig && (c!=IOS_EOF)) {eseq[j++] = c;
- c = ios_getc(f);
+ c = ios_getc(F);
}
- if (c!=IOS_EOF) ios_ungetc(c, f);
+ if (c!=IOS_EOF) ios_ungetc(c, F);
eseq[j] = '\0';
if (j) wc = strtol(eseq, NULL, 16);
else {@@ -432,7 +434,7 @@
// build a list of conses. this is complicated by the fact that all conses
// can move whenever a new cons is allocated. we have to refer to every cons
// through a handle to a relocatable pointer (i.e. a pointer on the stack).
-static void read_list(ios_t *f, value_t *pval, value_t label)
+static void read_list(value_t *pval, value_t label)
{value_t c, *pc;
u_int32_t t;
@@ -439,9 +441,9 @@
PUSH(NIL);
pc = &Stack[SP-1]; // to keep track of current cons cell
- t = peek(f);
+ t = peek();
while (t != TOK_CLOSE) {- if (ios_eof(f))
+ if (ios_eof(F))
lerror(ParseError, "read: unexpected end of input");
c = mk_cons(); car_(c) = cdr_(c) = NIL;
if (iscons(*pc)) {@@ -453,16 +455,16 @@
ptrhash_put(&readstate->backrefs, (void*)label, (void*)c);
}
*pc = c;
- c = do_read_sexpr(f,UNBOUND); // must be on separate lines due to
+ c = do_read_sexpr(UNBOUND); // must be on separate lines due to
car_(*pc) = c; // undefined evaluation order
- t = peek(f);
+ t = peek();
if (t == TOK_DOT) {take();
- c = do_read_sexpr(f,UNBOUND);
+ c = do_read_sexpr(UNBOUND);
cdr_(*pc) = c;
- t = peek(f);
- if (ios_eof(f))
+ t = peek();
+ if (ios_eof(F))
lerror(ParseError, "read: unexpected end of input");
if (t != TOK_CLOSE)
lerror(ParseError, "read: expected ')'");
@@ -473,7 +475,7 @@
}
// label is the backreference we'd like to fix up with this read
-static value_t do_read_sexpr(ios_t *f, value_t label)
+static value_t do_read_sexpr(value_t label)
{value_t v, sym, oldtokval, *head;
value_t *pv;
@@ -480,7 +482,7 @@
u_int32_t t;
char c;
- t = peek(f);
+ t = peek();
take();
switch (t) {case TOK_CLOSE:
@@ -510,19 +512,19 @@
PUSH(v);
if (label != UNBOUND)
ptrhash_put(&readstate->backrefs, (void*)label, (void*)v);
- v = do_read_sexpr(f,UNBOUND);
+ v = do_read_sexpr(UNBOUND);
car_(cdr_(Stack[SP-1])) = v;
return POP();
case TOK_SHARPQUOTE:
// femtoLisp doesn't need symbol-function, so #' does nothing
- return do_read_sexpr(f, label);
+ return do_read_sexpr(label);
case TOK_SHARPSEMI:
// datum comment
- (void)do_read_sexpr(f, UNBOUND); // skip one
- return do_read_sexpr(f, label);
+ (void)do_read_sexpr(UNBOUND); // skip one
+ return do_read_sexpr(label);
case TOK_OPEN:
PUSH(NIL);
- read_list(f, &Stack[SP-1], label);
+ read_list(&Stack[SP-1], label);
return POP();
case TOK_SHARPSYM:
sym = tokval;
@@ -531,7 +533,7 @@
else if (sym == fsym || sym == Fsym)
return FL_F;
// constructor notation
- c = nextchar(f);
+ c = nextchar();
if (c != '(') {take();
lerror(ParseError, "read: expected argument list for %s",
@@ -538,13 +540,13 @@
symbol_name(tokval));
}
PUSH(NIL);
- read_list(f, &Stack[SP-1], UNBOUND);
+ read_list(&Stack[SP-1], UNBOUND);
v = POP();
return apply(toplevel_eval(sym), v);
case TOK_OPENB:
- return read_vector(f, label, TOK_CLOSEB);
+ return read_vector(label, TOK_CLOSEB);
case TOK_SHARPOPEN:
- return read_vector(f, label, TOK_CLOSE);
+ return read_vector(label, TOK_CLOSE);
case TOK_SHARPDOT:
// eval-when-read
// evaluated expressions can refer to existing backreferences, but they
@@ -551,7 +553,7 @@
// cannot see pending labels. in other words:
// (... #2=#.#0# ... ) OK
// (... #2=#.(#2#) ... ) DO NOT WANT
- v = do_read_sexpr(f,UNBOUND);
+ v = do_read_sexpr(UNBOUND);
return toplevel_eval(v);
case TOK_LABEL:
// create backreference label
@@ -558,7 +560,7 @@
if (ptrhash_has(&readstate->backrefs, (void*)tokval))
lerror(ParseError, "read: label %ld redefined", numval(tokval));
oldtokval = tokval;
- v = do_read_sexpr(f, tokval);
+ v = do_read_sexpr(tokval);
ptrhash_put(&readstate->backrefs, (void*)oldtokval, (void*)v);
return v;
case TOK_BACKREF:
@@ -573,12 +575,12 @@
*pv = gensym(NULL, 0);
return *pv;
case TOK_DOUBLEQUOTE:
- return read_string(f);
+ return read_string();
}
return NIL;
}
-value_t read_sexpr(ios_t *f)
+value_t read_sexpr(value_t f)
{value_t v;
readstate_t state;
@@ -585,9 +587,10 @@
state.prev = readstate;
htable_new(&state.backrefs, 8);
htable_new(&state.gensyms, 8);
+ state.source = f;
readstate = &state;
- v = do_read_sexpr(f, UNBOUND);
+ v = do_read_sexpr(UNBOUND);
readstate = state.prev;
free_readstate(&state);
--- a/femtolisp/todo
+++ b/femtolisp/todo
@@ -109,7 +109,7 @@
. not great, since then it can't be CPS converted
* represent lambda environment as a vector (in lispv)
x setq builtin (didn't help)
-(- list builtin, to use cons_reserve)
+* list builtin, to use cons_reserve
(- let builtin, to further avoid env consing)
unconventional interpreter builtins that can be used as a compilation
target without moving away from s-expressions:
@@ -939,7 +939,7 @@
* make raising a memory error non-consing
- eliminate string copy in lerror() when possible
-- fix printing lists of short strings
+* fix printing lists of short strings
- remaining c types
- remaining cvalues functions