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

s/read_safe/read_value/g

This commit is contained in:
Yuichi Nishiwaki 2016-06-19 18:20:40 +09:00
parent d49a0cdd16
commit 831057d881
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
extlib/benz/read.c
View File

@ -25,7 +25,7 @@ typedef pic_value (*pic_reader_t)(pic_state *, xFILE *file, int c, struct reader
static pic_reader_t reader_table[256]; static pic_reader_t reader_table[256];
static pic_reader_t reader_dispatch[256]; static pic_reader_t reader_dispatch[256];
static pic_value read_safe(pic_state *pic, xFILE *file, int c, struct reader_control *p); static pic_value read_value(pic_state *pic, xFILE *file, int c, struct reader_control *p);
static pic_value read_nullable(pic_state *pic, xFILE *file, int c, struct reader_control *p); static pic_value read_nullable(pic_state *pic, xFILE *file, int c, struct reader_control *p);
PIC_NORETURN static void PIC_NORETURN static void
@ -123,7 +123,7 @@ read_block_comment(pic_state *pic, xFILE *file, int PIC_UNUSED(c), struct reader
static pic_value static pic_value
read_datum_comment(pic_state *pic, xFILE *file, int PIC_UNUSED(c), struct reader_control *p) read_datum_comment(pic_state *pic, xFILE *file, int PIC_UNUSED(c), struct reader_control *p)
{ {
read_safe(pic, file, next(pic, file), p); read_value(pic, file, next(pic, file), p);
return pic_invalid_value(pic); return pic_invalid_value(pic);
} }
@ -152,13 +152,13 @@ read_directive(pic_state *pic, xFILE *file, int c, struct reader_control *p)
static pic_value static pic_value
read_quote(pic_state *pic, xFILE *file, int PIC_UNUSED(c), struct reader_control *p) read_quote(pic_state *pic, xFILE *file, int PIC_UNUSED(c), struct reader_control *p)
{ {
return pic_list(pic, 2, pic_intern_lit(pic, "quote"), read_safe(pic, file, next(pic, file), p)); return pic_list(pic, 2, pic_intern_lit(pic, "quote"), read_value(pic, file, next(pic, file), p));
} }
static pic_value static pic_value
read_quasiquote(pic_state *pic, xFILE *file, int PIC_UNUSED(c), struct reader_control *p) read_quasiquote(pic_state *pic, xFILE *file, int PIC_UNUSED(c), struct reader_control *p)
{ {
return pic_list(pic, 2, pic_intern_lit(pic, "quasiquote"), read_safe(pic, file, next(pic, file), p)); return pic_list(pic, 2, pic_intern_lit(pic, "quasiquote"), read_value(pic, file, next(pic, file), p));
} }
static pic_value static pic_value
@ -172,19 +172,19 @@ read_unquote(pic_state *pic, xFILE *file, int PIC_UNUSED(c), struct reader_contr
} else { } else {
tag = pic_intern_lit(pic, "unquote"); tag = pic_intern_lit(pic, "unquote");
} }
return pic_list(pic, 2, tag, read_safe(pic, file, next(pic, file), p)); return pic_list(pic, 2, tag, read_value(pic, file, next(pic, file), p));
} }
static pic_value static pic_value
read_syntax_quote(pic_state *pic, xFILE *file, int PIC_UNUSED(c), struct reader_control *p) read_syntax_quote(pic_state *pic, xFILE *file, int PIC_UNUSED(c), struct reader_control *p)
{ {
return pic_list(pic, 2, pic_intern_lit(pic, "syntax-quote"), read_safe(pic, file, next(pic, file), p)); return pic_list(pic, 2, pic_intern_lit(pic, "syntax-quote"), read_value(pic, file, next(pic, file), p));
} }
static pic_value static pic_value
read_syntax_quasiquote(pic_state *pic, xFILE *file, int PIC_UNUSED(c), struct reader_control *p) read_syntax_quasiquote(pic_state *pic, xFILE *file, int PIC_UNUSED(c), struct reader_control *p)
{ {
return pic_list(pic, 2, pic_intern_lit(pic, "syntax-quasiquote"), read_safe(pic, file, next(pic, file), p)); return pic_list(pic, 2, pic_intern_lit(pic, "syntax-quasiquote"), read_value(pic, file, next(pic, file), p));
} }
static pic_value static pic_value
@ -198,7 +198,7 @@ read_syntax_unquote(pic_state *pic, xFILE *file, int PIC_UNUSED(c), struct reade
} else { } else {
tag = pic_intern_lit(pic, "syntax-unquote"); tag = pic_intern_lit(pic, "syntax-unquote");
} }
return pic_list(pic, 2, tag, read_safe(pic, file, next(pic, file), p)); return pic_list(pic, 2, tag, read_value(pic, file, next(pic, file), p));
} }
static pic_value static pic_value
@ -474,7 +474,7 @@ read_pair(pic_state *pic, xFILE *file, int c, struct reader_control *p)
return pic_nil_value(pic); return pic_nil_value(pic);
} }
if (c == '.' && isdelim(peek(pic, file))) { if (c == '.' && isdelim(peek(pic, file))) {
cdr = read_safe(pic, file, next(pic, file), p); cdr = read_value(pic, file, next(pic, file), p);
closing: closing:
if ((c = skip(pic, file, ' ')) != tCLOSE) { if ((c = skip(pic, file, ' ')) != tCLOSE) {
@ -503,7 +503,7 @@ read_vector(pic_state *pic, xFILE *file, int c, struct reader_control *p)
pic_value list, it, elem, vec; pic_value list, it, elem, vec;
int i = 0; int i = 0;
list = read_safe(pic, file, c, p); list = read_value(pic, file, c, p);
vec = pic_make_vec(pic, pic_length(pic, list), NULL); vec = pic_make_vec(pic, pic_length(pic, list), NULL);
@ -530,7 +530,7 @@ read_label_set(pic_state *pic, xFILE *file, int i, struct reader_control *p)
kh_val(h, it) = val = pic_cons(pic, pic_undef_value(pic), pic_undef_value(pic)); kh_val(h, it) = val = pic_cons(pic, pic_undef_value(pic), pic_undef_value(pic));
tmp = read_safe(pic, file, c, p); tmp = read_value(pic, file, c, p);
pic_pair_ptr(pic, val)->car = pic_car(pic, tmp); pic_pair_ptr(pic, val)->car = pic_car(pic, tmp);
pic_pair_ptr(pic, val)->cdr = pic_cdr(pic, tmp); pic_pair_ptr(pic, val)->cdr = pic_cdr(pic, tmp);
@ -551,7 +551,7 @@ read_label_set(pic_state *pic, xFILE *file, int i, struct reader_control *p)
kh_val(h, it) = val = pic_make_vec(pic, 0, NULL); kh_val(h, it) = val = pic_make_vec(pic, 0, NULL);
tmp = read_safe(pic, file, c, p); tmp = read_value(pic, file, c, p);
PIC_SWAP(pic_value *, pic_vec_ptr(pic, tmp)->data, pic_vec_ptr(pic, val)->data); PIC_SWAP(pic_value *, pic_vec_ptr(pic, tmp)->data, pic_vec_ptr(pic, val)->data);
PIC_SWAP(int, pic_vec_ptr(pic, tmp)->len, pic_vec_ptr(pic, val)->len); PIC_SWAP(int, pic_vec_ptr(pic, tmp)->len, pic_vec_ptr(pic, val)->len);
@ -562,7 +562,7 @@ read_label_set(pic_state *pic, xFILE *file, int i, struct reader_control *p)
} }
default: default:
{ {
kh_val(h, it) = val = read_safe(pic, file, c, p); kh_val(h, it) = val = read_value(pic, file, c, p);
return val; return val;
} }
@ -640,7 +640,7 @@ read_nullable(pic_state *pic, xFILE *file, int c, struct reader_control *p)
} }
static pic_value static pic_value
read_safe(pic_state *pic, xFILE *file, int c, struct reader_control *p) read_value(pic_state *pic, xFILE *file, int c, struct reader_control *p)
{ {
pic_value val; pic_value val;