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

refactor boolean readers

This commit is contained in:
Yuichi Nishiwaki 2014-08-12 10:59:49 +09:00
parent d78026ac05
commit e34b580182
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/read.c
View File

@ -336,31 +336,23 @@ read_plus(pic_state *pic, struct pic_port *port, int c)
} }
static pic_value static pic_value
read_boolean(pic_state *pic, struct pic_port *port, int c) read_true(pic_state *pic, struct pic_port *port, int c)
{ {
UNUSED(pic); UNUSED(pic);
UNUSED(port); UNUSED(port);
UNUSED(c);
if (! isdelim(peek(port))) { return pic_true_value();
if (c == 't') { }
if (! expect(port, "rue")) {
goto fail;
}
} else {
if (! expect(port, "alse")) {
goto fail;
}
}
}
if (c == 't') { static pic_value
return pic_true_value(); read_false(pic_state *pic, struct pic_port *port, int c)
} else { {
return pic_false_value(); UNUSED(pic);
} UNUSED(port);
UNUSED(c);
fail: return pic_false_value();
read_error(pic, "illegal character during reading boolean literal");
} }
static pic_value static pic_value
@ -777,7 +769,8 @@ DEFINE_READER(read_pair)
DEFINE_READER(read_directive) DEFINE_READER(read_directive)
DEFINE_READER(read_block_comment) DEFINE_READER(read_block_comment)
DEFINE_READER(read_datum_comment) DEFINE_READER(read_datum_comment)
DEFINE_READER(read_boolean) DEFINE_READER(read_true)
DEFINE_READER(read_false)
DEFINE_READER(read_char) DEFINE_READER(read_char)
DEFINE_READER(read_vector) DEFINE_READER(read_vector)
DEFINE_READER(read_unsigned_blob) DEFINE_READER(read_unsigned_blob)
@ -809,8 +802,10 @@ pic_init_reader(pic_state *pic)
pic_define_reader(pic, "#!", pic_read_directive); pic_define_reader(pic, "#!", pic_read_directive);
pic_define_reader(pic, "#|", pic_read_block_comment); pic_define_reader(pic, "#|", pic_read_block_comment);
pic_define_reader(pic, "#;", pic_read_datum_comment); pic_define_reader(pic, "#;", pic_read_datum_comment);
pic_define_reader(pic, "#t", pic_read_boolean); pic_define_reader(pic, "#t", pic_read_true);
pic_define_reader(pic, "#f", pic_read_boolean); pic_define_reader(pic, "#true", pic_read_true);
pic_define_reader(pic, "#f", pic_read_false);
pic_define_reader(pic, "#false", pic_read_false);
pic_define_reader(pic, "#\\", pic_read_char); pic_define_reader(pic, "#\\", pic_read_char);
pic_define_reader(pic, "#(", pic_read_vector); pic_define_reader(pic, "#(", pic_read_vector);
pic_define_reader(pic, "#u", pic_read_unsigned_blob); pic_define_reader(pic, "#u", pic_read_unsigned_blob);