mirrors/qmic
0
0
Fork 0
mirror of https://github.com/linux-msm/qmic.git synced 2024-11-23 09:44:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

parser: use standard I/O for input buffering

Browse Source 
Rather than maintaining an input buffer and details about its
current state--as well as a lookahead character--just let the
standard I/O library take care of those details.  A single character
of "lookahead" is guaranteed by the library, so this will be no
worse than the hand-done buffering, and will certainly be more
robust.

Signed-off-by: Alex Elder <elder@linaro.org>
Message-Id: <20211001232338.769309-14-elder@linaro.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Alex Elder 2021-10-01 18:23:17 -05:00 committed by Bjorn Andersson
parent c7c8e47f74
commit f80136eb08
1 changed files with 10 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
parser.c
View File

@ -41,8 +41,6 @@ struct token {
struct qmi_struct *qmi_struct;
};
static char lookahead;
static int yyline = 1;
static void yyerror(const char *fmt, ...)
@ -62,51 +60,28 @@ static void yyerror(const char *fmt, ...)
static char input()
{
static char input_buf[128];
static unsigned input_pos;
static unsigned input_len;
int ret;
char ch;
int ch;
if (lookahead) {
ch = lookahead;
lookahead = 0;
goto out;
}
if (input_pos < input_len) {
ch = input_buf[input_pos++];
goto out;
}
ret = read(0, input_buf, sizeof(input_buf));
if (ret <= 0) {
if (ret < 0)
yyerror("read error: %s", strerror(errno));
ch = fgetc(stdin);
if (ch < 0)
return 0; /* End of input */
}
input_pos = 0;
input_len = ret;
ch = input_buf[input_pos++];
if (!isascii(ch))
if (ch == '\n')
yyline++;
else if (!isascii(ch))
yyerror("invalid non-ASCII character");
else if (!ch)
yyerror("invalid NUL character");
out:
if (ch == '\n')
yyline++;
return ch;
return (char)ch;
}
static void unput(int ch)
{
assert(!lookahead);
lookahead = ch;
if (ch == '\n')
yyline--;
if (ungetc(ch, stdin) != ch)
yyerror("ungetc error");
}
struct symbol {