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

awk: when parsing TC_FUNCTION token, eat its opening '('

Browse Source 
...like we do for array references.

function                                             old     new   delta
parse_expr                                           938     948     +10
next_token                                           788     791      +3
parse_program                                        313     310      -3
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/1 up/down: 13/-3)              Total: 10 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2021-06-29 03:02:21 +02:00
parent cb6061a4e9
commit f414fb4411
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
editors/awk.c
View File

@ -241,7 +241,7 @@ typedef struct tsplitter_s {
#define TC_EOF (1 << 25) #define TC_EOF (1 << 25)
#define TC_VARIABLE (1 << 26) /* name */ #define TC_VARIABLE (1 << 26) /* name */
#define TC_ARRAY (1 << 27) /* name[ */ #define TC_ARRAY (1 << 27) /* name[ */
#define TC_FUNCTION (1 << 28) /* name( - but unlike TC_ARRAY, parser does not consume '(' */ #define TC_FUNCTION (1 << 28) /* name( */
#define TC_STRING (1 << 29) /* "..." */ #define TC_STRING (1 << 29) /* "..." */
#define TC_NUMBER (1 << 30) #define TC_NUMBER (1 << 30)
@ -959,6 +959,7 @@ static double getvar_i(var *v)
v->number = my_strtod(&s); v->number = my_strtod(&s);
debug_printf_eval("%f (s:'%s')\n", v->number, s); debug_printf_eval("%f (s:'%s')\n", v->number, s);
if (v->type & VF_USER) { if (v->type & VF_USER) {
//TODO: skip_spaces() also skips backslash+newline, is it intended here?
s = skip_spaces(s); s = skip_spaces(s);
if (*s != '\0') if (*s != '\0')
v->type &= ~VF_USER; v->type &= ~VF_USER;
@ -1103,7 +1104,7 @@ static uint32_t next_token(uint32_t expected)
#define save_tclass (G.next_token__save_tclass) #define save_tclass (G.next_token__save_tclass)
#define save_info (G.next_token__save_info) #define save_info (G.next_token__save_info)
char *p, *s; char *p;
const char *tl; const char *tl;
const uint32_t *ti; const uint32_t *ti;
uint32_t tc, last_token_class; uint32_t tc, last_token_class;
@ -1131,15 +1132,12 @@ static uint32_t next_token(uint32_t expected)
while (*p != '\n' && *p != '\0') while (*p != '\n' && *p != '\0')
p++; p++;
if (*p == '\n')
t_lineno++;
if (*p == '\0') { if (*p == '\0') {
tc = TC_EOF; tc = TC_EOF;
debug_printf_parse("%s: token found: TC_EOF\n", __func__); debug_printf_parse("%s: token found: TC_EOF\n", __func__);
} else if (*p == '\"') { } else if (*p == '\"') {
/* it's a string */ /* it's a string */
t_string = s = ++p; char *s = t_string = ++p;
while (*p != '\"') { while (*p != '\"') {
char *pp; char *pp;
if (*p == '\0' || *p == '\n') if (*p == '\0' || *p == '\n')
@ -1154,7 +1152,7 @@ static uint32_t next_token(uint32_t expected)
debug_printf_parse("%s: token found:'%s' TC_STRING\n", __func__, t_string); debug_printf_parse("%s: token found:'%s' TC_STRING\n", __func__, t_string);
} else if ((expected & TC_REGEXP) && *p == '/') { } else if ((expected & TC_REGEXP) && *p == '/') {
/* it's regexp */ /* it's regexp */
t_string = s = ++p; char *s = t_string = ++p;
while (*p != '/') { while (*p != '/') {
if (*p == '\0' || *p == '\n') if (*p == '\0' || *p == '\n')
syntax_error(EMSG_UNEXP_EOS); syntax_error(EMSG_UNEXP_EOS);
@ -1185,6 +1183,9 @@ static uint32_t next_token(uint32_t expected)
tc = TC_NUMBER; tc = TC_NUMBER;
debug_printf_parse("%s: token found:%f TC_NUMBER\n", __func__, t_double); debug_printf_parse("%s: token found:%f TC_NUMBER\n", __func__, t_double);
} else { } else {
if (*p == '\n')
t_lineno++;
/* search for something known */ /* search for something known */
tl = tokenlist; tl = tokenlist;
tc = 0x00000001; tc = 0x00000001;
@ -1230,14 +1231,14 @@ static uint32_t next_token(uint32_t expected)
if (!(expected & TC_VARIABLE) || (expected & TC_ARRAY)) if (!(expected & TC_VARIABLE) || (expected & TC_ARRAY))
p = skip_spaces(p); p = skip_spaces(p);
if (*p == '(') { if (*p == '(') {
p++;
tc = TC_FUNCTION; tc = TC_FUNCTION;
debug_printf_parse("%s: token found:'%s' TC_FUNCTION\n", __func__, t_string); debug_printf_parse("%s: token found:'%s' TC_FUNCTION\n", __func__, t_string);
} else { } else if (*p == '[') {
if (*p == '[') {
p++; p++;
tc = TC_ARRAY; tc = TC_ARRAY;
debug_printf_parse("%s: token found:'%s' TC_ARRAY\n", __func__, t_string); debug_printf_parse("%s: token found:'%s' TC_ARRAY\n", __func__, t_string);
} else } else {
debug_printf_parse("%s: token found:'%s' TC_VARIABLE\n", __func__, t_string); debug_printf_parse("%s: token found:'%s' TC_VARIABLE\n", __func__, t_string);
} }
} }
@ -1431,7 +1432,7 @@ static node *parse_expr(uint32_t term_tc)
debug_printf_parse("%s: TC_FUNCTION\n", __func__); debug_printf_parse("%s: TC_FUNCTION\n", __func__);
cn->info = OC_FUNC; cn->info = OC_FUNC;
cn->r.f = newfunc(t_string); cn->r.f = newfunc(t_string);
cn->l.n = parse_lrparen_list(); cn->l.n = parse_expr(TC_RPAREN);
break; break;
case TC_LPAREN: case TC_LPAREN:
@ -1682,7 +1683,6 @@ static void parse_program(char *p)
} else if (tclass & TC_FUNCDECL) { } else if (tclass & TC_FUNCDECL) {
debug_printf_parse("%s: TC_FUNCDECL\n", __func__); debug_printf_parse("%s: TC_FUNCDECL\n", __func__);
next_token(TC_FUNCTION); next_token(TC_FUNCTION);
g_pos++;
f = newfunc(t_string); f = newfunc(t_string);
f->body.first = NULL; f->body.first = NULL;
f->nargs = 0; f->nargs = 0;