refactor std ports

This commit is contained in:
Yuichi Nishiwaki 2014-01-13 00:02:58 +09:00
parent 0af0ecafb6
commit dbf73ecd7a
1 changed files with 10 additions and 4 deletions

View File

@ -156,7 +156,7 @@ pic_debug(pic_state *pic, pic_value obj)
} }
static pic_value static pic_value
make_port_from_fp(pic_state *pic, FILE *fp, short flags) port_new_from_fp(pic_state *pic, FILE *fp, short flags)
{ {
struct pic_port *port; struct pic_port *port;
@ -167,6 +167,12 @@ make_port_from_fp(pic_state *pic, FILE *fp, short flags)
return pic_obj_value(port); return pic_obj_value(port);
} }
static pic_value
port_new_stdio(pic_state *pic, FILE *fp, short dir)
{
return port_new_from_fp(pic, fp, dir | PIC_PORT_TEXT);
}
static pic_value static pic_value
pic_port_input_port_p(pic_state *pic) pic_port_input_port_p(pic_state *pic)
{ {
@ -339,9 +345,9 @@ pic_port_close_port(pic_state *pic)
void void
pic_init_port(pic_state *pic) pic_init_port(pic_state *pic)
{ {
pic_defvar(pic, "current-input-port", make_port_from_fp(pic, stdin, PIC_PORT_IN | PIC_PORT_TEXT)); pic_defvar(pic, "current-input-port", port_new_stdio(pic, stdin, PIC_PORT_IN));
pic_defvar(pic, "current-output-port", make_port_from_fp(pic, stdout, PIC_PORT_OUT | PIC_PORT_TEXT)); pic_defvar(pic, "current-output-port", port_new_stdio(pic, stdout, PIC_PORT_OUT));
pic_defvar(pic, "current-error-port", make_port_from_fp(pic, stderr, PIC_PORT_OUT | PIC_PORT_TEXT)); pic_defvar(pic, "current-error-port", port_new_stdio(pic, stderr, PIC_PORT_OUT));
pic_defun(pic, "input-port?", pic_port_input_port_p); pic_defun(pic, "input-port?", pic_port_input_port_p);
pic_defun(pic, "output-port?", pic_port_output_port_p); pic_defun(pic, "output-port?", pic_port_output_port_p);