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

awk: remove redundant check

Browse Source 
function                                             old     new   delta
next_token                                           785     784      -1
parse_program                                        337     328      -9
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-10)             Total: -10 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2021-06-29 01:03:42 +02:00
parent 5dbbd0a6f5
commit af0172369e
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
editors/awk.c
View File

@ -1093,8 +1093,9 @@ static void nvfree(var *v)
/* ------- awk program text parsing ------- */ /* ------- awk program text parsing ------- */
/* Parse next token pointed by global pos, place results into global ttt. /* Parse next token pointed by global pos, place results into global t_XYZ variables.
* If token isn't expected, give away. Return token class * If token isn't expected, print error message and die.
* Return token class (also store it in t_tclass).
*/ */
static uint32_t next_token(uint32_t expected) static uint32_t next_token(uint32_t expected)
{ {
@ -1248,33 +1249,35 @@ static uint32_t next_token(uint32_t expected)
goto readnext; goto readnext;
/* insert concatenation operator when needed */ /* insert concatenation operator when needed */
debug_printf_parse("%s: %x %x %x concat_inserted?\n", __func__, debug_printf_parse("%s: concat_inserted if all nonzero: %x %x %x %x\n", __func__,
(ltclass & TC_CONCAT1), (tc & TC_CONCAT2), (expected & TC_BINOP)); (ltclass & TC_CONCAT1), (tc & TC_CONCAT2), (expected & TC_BINOP),
!(ltclass == TC_LENGTH && tc == TC_SEQSTART));
if ((ltclass & TC_CONCAT1) && (tc & TC_CONCAT2) && (expected & TC_BINOP) if ((ltclass & TC_CONCAT1) && (tc & TC_CONCAT2) && (expected & TC_BINOP)
&& !(ltclass == TC_LENGTH && tc == TC_SEQSTART) /* but not for "length(..." */ && !(ltclass == TC_LENGTH && tc == TC_SEQSTART) /* but not for "length(..." */
) { ) {
concat_inserted = TRUE; concat_inserted = TRUE;
save_tclass = tc; save_tclass = tc;
save_info = t_info; save_info = t_info;
tc = TC_BINOP; tc = TC_BINOPX;
t_info = OC_CONCAT | SS | P(35); t_info = OC_CONCAT | SS | P(35);
} }
debug_printf_parse("%s: t_tclass=tc=%x\n", __func__, t_tclass);
t_tclass = tc; t_tclass = tc;
debug_printf_parse("%s: t_tclass=tc=%x\n", __func__, tc);
} }
ltclass = t_tclass;
/* Are we ready for this? */ /* Are we ready for this? */
if (!(ltclass & expected)) { if (!(t_tclass & expected)) {
syntax_error((ltclass & (TC_NEWLINE | TC_EOF)) ? syntax_error((ltclass & (TC_NEWLINE | TC_EOF)) ?
EMSG_UNEXP_EOS : EMSG_UNEXP_TOKEN); EMSG_UNEXP_EOS : EMSG_UNEXP_TOKEN);
} }
debug_printf_parse("%s: returning, t_double:%f ltclass:", __func__, t_double); debug_printf_parse("%s: returning, t_double:%f t_tclass:", __func__, t_double);
debug_parse_print_tc(ltclass); debug_parse_print_tc(t_tclass);
debug_printf_parse("\n"); debug_printf_parse("\n");
return ltclass;
ltclass = t_tclass;
return t_tclass;
#undef concat_inserted #undef concat_inserted
#undef save_tclass #undef save_tclass
#undef save_info #undef save_info
@ -1700,8 +1703,9 @@ static void parse_program(char *p)
/* 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_SEQTERM) & TC_SEQTERM) if (next_token(TC_COMMA | TC_SEQTERM) & TC_SEQTERM)
break; break;
if (t_tclass != TC_COMMA) //Impossible: next_token() above would error out and die
syntax_error(EMSG_UNEXP_TOKEN); // if (t_tclass != TC_COMMA)
// syntax_error(EMSG_UNEXP_TOKEN);
} }
seq = &f->body; seq = &f->body;
chain_group(); chain_group();