From fe30beadf1cb9ac0c613b950a4f7e8f00ac6a615 Mon Sep 17 00:00:00 2001 From: "Sunrim KIM (keen)" <3han5chou7@gmail.com> Date: Thu, 17 Jul 2014 21:30:54 +0900 Subject: [PATCH 1/2] Ignore shebang only when it's at the first line and allow reader directives at other places whlile ignores them for now --- src/read.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/src/read.c b/src/read.c index f8836e44..87ffe127 100644 --- a/src/read.c +++ b/src/read.c @@ -114,6 +114,35 @@ read_datum_comment(pic_state *pic, struct pic_port *port, char c) return pic_undef_value(); } +static pic_value +read_directive(pic_state *pic, struct pic_port *port, char c) +{ + c = next(port); + + if (c == 'n') { + if(expect(port, "o-fold-case")){ + /* :FIXME: set no-fold-case flag */ + } + else{ + goto abort; + } + } + else if (c == 'f') { + if(expect(port, "old-case")){ + /* :FIXME: set fold-case flag */ + } + else{ + goto abort; + } + } + else{ + abort: + pic_error(pic, "unknown directive"); + } + + return pic_undef_value(); +} + static pic_value read_quote(pic_state *pic, struct pic_port *port, char c) { @@ -541,7 +570,7 @@ read_dispatch(pic_state *pic, struct pic_port *port, char c) switch (c) { case '!': - return read_comment(pic, port, c); + return read_directive(pic, port, c); case '|': return read_block_comment(pic, port, c); case ';': @@ -675,6 +704,13 @@ pic_parse_file(pic_state *pic, FILE *file) port->flags = PIC_PORT_OUT | PIC_PORT_TEXT; port->status = PIC_PORT_OPEN; + if(xfgetc(port->file) == '#' && xfgetc(port->file) == '!'){ + while(xfgetc(port->file) != '\n'); + } + else{ + xfseek(port->file, 0, SEEK_SET); + } + return pic_parse(pic, port); } From bbeee8f10e8d93f97a9f4cf62e49356fe8a2814e Mon Sep 17 00:00:00 2001 From: "Sunrim KIM (keen)" <3han5chou7@gmail.com> Date: Fri, 18 Jul 2014 16:00:08 +0900 Subject: [PATCH 2/2] change directive reader to ignore shebang --- src/read.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/read.c b/src/read.c index 87ffe127..cd330165 100644 --- a/src/read.c +++ b/src/read.c @@ -117,6 +117,8 @@ read_datum_comment(pic_state *pic, struct pic_port *port, char c) static pic_value read_directive(pic_state *pic, struct pic_port *port, char c) { + UNUSED(pic); + c = next(port); if (c == 'n') { @@ -124,7 +126,8 @@ read_directive(pic_state *pic, struct pic_port *port, char c) /* :FIXME: set no-fold-case flag */ } else{ - goto abort; + xfseek(port->file, -1, SEEK_CUR); + goto shebang; } } else if (c == 'f') { @@ -132,12 +135,13 @@ read_directive(pic_state *pic, struct pic_port *port, char c) /* :FIXME: set fold-case flag */ } else{ - goto abort; + xfseek(port->file, -1, SEEK_CUR); + goto shebang; } } else{ - abort: - pic_error(pic, "unknown directive"); + shebang: + while(xfgetc(port->file) != '\n'); } return pic_undef_value(); @@ -704,13 +708,6 @@ pic_parse_file(pic_state *pic, FILE *file) port->flags = PIC_PORT_OUT | PIC_PORT_TEXT; port->status = PIC_PORT_OPEN; - if(xfgetc(port->file) == '#' && xfgetc(port->file) == '!'){ - while(xfgetc(port->file) != '\n'); - } - else{ - xfseek(port->file, 0, SEEK_SET); - } - return pic_parse(pic, port); }