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

comment readers should return undef values to report continuablility to 

the parent function
This commit is contained in:
Yuichi Nishiwaki 2014-06-25 18:06:48 +09:00
parent 6eec3629e9
commit a90330d3d9
1 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/read.c
View File

@ -34,13 +34,7 @@ skip(struct pic_port *port, char c)
static char static char
next(struct pic_port *port) next(struct pic_port *port)
{ {
char c; return xfgetc(port->file);
c = xfgetc(port->file);
// printf("%c", c);
return c;
} }
static char static char
@ -56,11 +50,13 @@ peek(struct pic_port *port)
static pic_value static pic_value
read_comment(pic_state *pic, struct pic_port *port, char c) read_comment(pic_state *pic, struct pic_port *port, char c)
{ {
UNUSED(pic);
do { do {
c = next(port); c = next(port);
} while (! (c == EOF || c == '\n')); } while (! (c == EOF || c == '\n'));
return read(pic, port, c); return pic_undef_value();
} }
static pic_value static pic_value
@ -68,6 +64,7 @@ read_block_comment(pic_state *pic, struct pic_port *port, char c)
{ {
char x, y; char x, y;
UNUSED(pic);
UNUSED(c); UNUSED(c);
x = next(port); x = next(port);
@ -80,11 +77,18 @@ read_block_comment(pic_state *pic, struct pic_port *port, char c)
break; break;
} }
} }
if (y != EOF) {
y = next(port);
}
return read(pic, port, y); return pic_undef_value();
}
static pic_value
read_datum_comment(pic_state *pic, struct pic_port *port, char c)
{
UNUSED(c);
read(pic, port, next(port));
return pic_undef_value();
} }
static pic_value static pic_value
@ -115,16 +119,6 @@ read_comma(pic_state *pic, struct pic_port *port, char c)
} }
} }
static pic_value
read_datum_comment(pic_state *pic, struct pic_port *port, char c)
{
UNUSED(c);
read(pic, port, next(port));
return read(pic, port, next(port));
}
static pic_value static pic_value
read_symbol(pic_state *pic, struct pic_port *port, char c) read_symbol(pic_state *pic, struct pic_port *port, char c)
{ {
@ -491,7 +485,7 @@ read_dispatch(pic_state *pic, struct pic_port *port, char c)
} }
static pic_value static pic_value
read(pic_state *pic, struct pic_port *port, char c) read_nullable(pic_state *pic, struct pic_port *port, char c)
{ {
c = skip(port, c); c = skip(port, c);
@ -526,6 +520,28 @@ read(pic_state *pic, struct pic_port *port, char c)
} }
} }
static pic_value
read(pic_state *pic, struct pic_port *port, char c)
{
pic_value val;
retry:
c = skip(port, c);
if (c == EOF) {
return pic_eof_object();
}
val = read_nullable(pic, port, c);
if (pic_undef_p(val)) {
c = next(port);
goto retry;
}
return val;
}
pic_value pic_value
pic_read(pic_state *pic, struct pic_port *port) pic_read(pic_state *pic, struct pic_port *port)
{ {
@ -533,10 +549,6 @@ pic_read(pic_state *pic, struct pic_port *port)
c = next(port); c = next(port);
if (c == EOF) {
return pic_eof_object();
}
return read(pic, port, c); return read(pic, port, c);
} }