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

awk: fix parsing of expressions such as "v (a)"

Browse Source 
function                                             old     new   delta
next_token                                           812     825     +13

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2021-06-29 12:16:36 +02:00
parent 686287b5da
commit 6872c193a9
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
editors/awk.c
View File

@ -1231,11 +1231,24 @@ static uint32_t next_token(uint32_t expected)
while (isalnum_(*p)) while (isalnum_(*p))
p++; p++;
end_of_name = p; end_of_name = p;
tc = TC_VARIABLE;
/* also consume whitespace between functionname and bracket */ if (last_token_class == TC_FUNCDECL)
if (!(expected & TC_VARIABLE) || (expected & TC_ARRAY)) /* eat space in "function FUNC (...) {...}" declaration */
//TODO: why if variable can be here (but not array ref), skipping is not allowed? Example where it matters?
p = skip_spaces(p); p = skip_spaces(p);
else if (expected & TC_ARRAY) {
/* eat space between array name and [ */
char *s = skip_spaces(p);
if (*s == '[') /* array ref, not just a name? */
p = s;
}
/* else: do NOT consume whitespace after variable name!
* gawk allows definition "function FUNC (p) {...}" - note space,
* but disallows the call "FUNC (p)" because it isn't one -
* expression "v (a)" should NOT be parsed as TC_FUNCTION:
* it is a valid concatenation if "v" is a variable,
* not a function name (and type of name is not known at parse time).
*/
if (*p == '(') { if (*p == '(') {
p++; p++;
tc = TC_FUNCTION; tc = TC_FUNCTION;
@ -1245,6 +1258,7 @@ static uint32_t next_token(uint32_t expected)
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 {
tc = TC_VARIABLE;
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);
if (end_of_name == p) { if (end_of_name == p) {
/* there is no space for trailing NUL in t_string! /* there is no space for trailing NUL in t_string!

11
testsuite/awk.tests
View File

@ -71,6 +71,17 @@ testing "awk properly handles undefined function" \
"L1\n\nawk: cmd. line:5: Call to undefined function\n" \ "L1\n\nawk: cmd. line:5: Call to undefined function\n" \
"" "" "" ""
prg='
BEGIN {
v=1
a=2
print v (a)
}'
testing "'v (a)' is not a function call, it is a concatenation" \
"awk '$prg' 2>&1" \
"12\n" \
"" ""
optional DESKTOP optional DESKTOP
testing "awk hex const 1" "awk '{ print or(0xffffffff,1) }'" "4294967295\n" "" "\n" testing "awk hex const 1" "awk '{ print or(0xffffffff,1) }'" "4294967295\n" "" "\n"