emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

awk: simplify parsing of function declaration

Browse Source 
function                                             old     new   delta
parse_program                                        328     313     -15

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2021-06-29 02:32:32 +02:00
parent 9782cb7774
commit 926420795b
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
editors/awk.c
View File

@ -769,7 +769,7 @@ static void hash_remove(xhash *hash, const char *name)
static char *skip_spaces(char *p) static char *skip_spaces(char *p)
{ {
while (1) { for (;;) {
if (*p == '\\' && p[1] == '\n') { if (*p == '\\' && p[1] == '\n') {
p++; p++;
t_lineno++; t_lineno++;
@ -1685,26 +1685,20 @@ static void parse_program(char *p)
f = newfunc(t_string); f = newfunc(t_string);
f->body.first = NULL; f->body.first = NULL;
f->nargs = 0; f->nargs = 0;
/* Match func arg list: a comma sep list of >= 0 args, and a close paren */ /* func arg list: comma sep list of args, and a close paren */
while (next_token(TC_VARIABLE | TC_RPAREN | TC_COMMA)) { for (;;) {
/* Either an empty arg list, or trailing comma from prev iter if (next_token(TC_VARIABLE | TC_RPAREN) == TC_RPAREN) {
* must be followed by an arg */ if (f->nargs == 0)
if (f->nargs == 0 && t_tclass == TC_RPAREN) break; /* func() is ok */
break; /* func(a,) is not ok */
/* TC_LPAREN/TC_COMMA must be followed by TC_VARIABLE */
if (t_tclass != TC_VARIABLE)
syntax_error(EMSG_UNEXP_TOKEN); syntax_error(EMSG_UNEXP_TOKEN);
}
v = findvar(ahash, t_string); v = findvar(ahash, t_string);
v->x.aidx = f->nargs++; v->x.aidx = f->nargs++;
/* Arg followed either by end of arg list or 1 comma */ /* Arg followed either by end of arg list or 1 comma */
if (next_token(TC_COMMA | TC_RPAREN) & TC_RPAREN) if (next_token(TC_COMMA | TC_RPAREN) == TC_RPAREN)
break; break;
//Impossible: next_token() above would error out and die /* it was a comma, we ate it */
// if (t_tclass != TC_COMMA)
// syntax_error(EMSG_UNEXP_TOKEN);
} }
seq = &f->body; seq = &f->body;
chain_group(); chain_group();