osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

dfilter: Improve error location for functions 

Underline the whole expression if the error is for the function.

Before:

    Filter: frame.number == abs(1, 2)
    dftest: Function abs can only accept 1 arguments.
    	frame.number == abs(1, 2)
    	                ^~~
After:

    Filter: frame.number == abs(1, 2)
    dftest: Function abs can only accept 1 arguments.
    	frame.number == abs(1, 2)
    	                ^~~~~~~~~
This commit is contained in:
João Valverde 2022-12-28 00:06:30 +00:00
parent bdb1616cf0
commit 95f705dd8b
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/dfilter/grammar.lemon
View File

@ -507,16 +507,24 @@ range_node_list(L) ::= range_node_list(P) COMMA RANGE_NODE(N).
}
/* A function can have one or more parameters */
function(F) ::= UNPARSED(U) LPAREN function_params(P) RPAREN.
function(F) ::= UNPARSED(U) LPAREN(L) function_params(P) RPAREN(R).
{
F = new_function(dfw, U);
sttype_function_set_params(F, P);
df_loc_t loc = stnode_merge_location(F, L, R, (stnode_t *)NULL);
stnode_set_location(F, loc);
stnode_free(L);
stnode_free(R);
}
/* A function can have zero parameters. */
function(F) ::= UNPARSED(U) LPAREN RPAREN.
function(F) ::= UNPARSED(U) LPAREN(L) RPAREN(R).
{
F = new_function(dfw, U);
df_loc_t loc = stnode_merge_location(F, L, R, (stnode_t *)NULL);
stnode_set_location(F, loc);
stnode_free(L);
stnode_free(R);
}
function_params(P) ::= arithmetic_expr(E).