conservatory
/
femtolisp
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

adding #; datum comment 

allowing #||# comments to nest
This commit is contained in:
JeffBezanson 2009-01-26 02:03:37 +00:00
parent 808d92dfb6
commit 38cf75733e
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
femtolisp/read.c
View File

@ -2,7 +2,8 @@ enum {
TOK_NONE, TOK_OPEN, TOK_CLOSE, TOK_DOT, TOK_QUOTE, TOK_SYM, TOK_NUM, TOK_NONE, TOK_OPEN, TOK_CLOSE, TOK_DOT, TOK_QUOTE, TOK_SYM, TOK_NUM,
TOK_BQ, TOK_COMMA, TOK_COMMAAT, TOK_COMMADOT, TOK_BQ, TOK_COMMA, TOK_COMMAAT, TOK_COMMADOT,
TOK_SHARPDOT, TOK_LABEL, TOK_BACKREF, TOK_SHARPQUOTE, TOK_SHARPOPEN, TOK_SHARPDOT, TOK_LABEL, TOK_BACKREF, TOK_SHARPQUOTE, TOK_SHARPOPEN,
TOK_OPENB, TOK_CLOSEB, TOK_SHARPSYM, TOK_GENSYM, TOK_DOUBLEQUOTE TOK_OPENB, TOK_CLOSEB, TOK_SHARPSYM, TOK_GENSYM, TOK_DOUBLEQUOTE,
TOK_SHARPSEMI
}; };
// defines which characters are ordinary symbol characters. // defines which characters are ordinary symbol characters.
@ -221,21 +222,37 @@ static u_int32_t peek(ios_t *f)
} }
else if ((char)ch == '|') { else if ((char)ch == '|') {
// multiline comment // multiline comment
int commentlevel=1;
while (1) { while (1) {
ch = ios_getc(f); ch = ios_getc(f);
hashpipe_got: hashpipe_gotc:
if (ch == IOS_EOF) if (ch == IOS_EOF)
lerror(ParseError, "read: eof within comment"); lerror(ParseError, "read: eof within comment");
if ((char)ch == '|') { if ((char)ch == '|') {
ch = ios_getc(f); ch = ios_getc(f);
if ((char)ch == '#') if ((char)ch == '#') {
break; commentlevel--;
goto hashpipe_got; if (commentlevel == 0)
break;
else
continue;
}
goto hashpipe_gotc;
}
else if ((char)ch == '#') {
ch = ios_getc(f);
if ((char)ch == '|')
commentlevel++;
else
goto hashpipe_gotc;
} }
} }
// this was whitespace, so keep peeking // this was whitespace, so keep peeking
return peek(f); return peek(f);
} }
else if ((char)ch == ';') {
toktype = TOK_SHARPSEMI;
}
else if ((char)ch == ':') { else if ((char)ch == ':') {
// gensym // gensym
ch = ios_getc(f); ch = ios_getc(f);
@ -485,6 +502,10 @@ static value_t do_read_sexpr(ios_t *f, value_t label)
case TOK_SHARPQUOTE: case TOK_SHARPQUOTE:
// femtoLisp doesn't need symbol-function, so #' does nothing // femtoLisp doesn't need symbol-function, so #' does nothing
return do_read_sexpr(f, label); return do_read_sexpr(f, label);
case TOK_SHARPSEMI:
// datum comment
(void)do_read_sexpr(f, UNBOUND); // skip one
return do_read_sexpr(f, label);
case TOK_OPEN: case TOK_OPEN:
PUSH(NIL); PUSH(NIL);
read_list(f, &Stack[SP-1], label); read_list(f, &Stack[SP-1], label);